# HG changeset patch # User diego # Date 1227542901 0 # Node ID 2f35f9781c31f1215be82a0856084e699eff584a # Parent 5f399949a6a6b695ece4d0395f6a2e72c09961cd Move #defines that are mostly used in h264.c out of h264data.h and into h264.h. diff -r 5f399949a6a6 -r 2f35f9781c31 h264.h --- a/h264.h Mon Nov 24 15:53:16 2008 +0000 +++ b/h264.h Mon Nov 24 16:08:21 2008 +0000 @@ -92,6 +92,11 @@ #define EXTENDED_SAR 255 +#define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16 bit +#define MB_TYPE_8x8DCT 0x01000000 +#define IS_REF0(a) ((a) & MB_TYPE_REF0) +#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) + /* NAL unit types */ enum { NAL_SLICE=1, diff -r 5f399949a6a6 -r 2f35f9781c31 h264data.h --- a/h264data.h Mon Nov 24 15:53:16 2008 +0000 +++ b/h264data.h Mon Nov 24 16:08:21 2008 +0000 @@ -32,6 +32,7 @@ #include #include "libavutil/rational.h" #include "mpegvideo.h" +#include "h264.h" static const AVRational pixel_aspect[17]={ @@ -362,12 +363,6 @@ 6+3*8, 6+5*8, 7+3*8, 7+7*8, }; -#define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16bit -#define MB_TYPE_8x8DCT 0x01000000 -#define IS_REF0(a) ((a)&MB_TYPE_REF0) -#define IS_8x8DCT(a) ((a)&MB_TYPE_8x8DCT) - - typedef struct IMbInfo{ uint16_t type; uint8_t pred_mode;