Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.

Originally committed as revision 15927 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index f7ea19e..5599af9 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -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 --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 069116b..decdd93 100644 (file)
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -32,6 +32,7 @@
 #include <stdint.h>
 #include "libavutil/rational.h"
 #include "mpegvideo.h"
+#include "h264.h"
 
 
 static const AVRational pixel_aspect[17]={
@@ -362,12 +363,6 @@ static const uint8_t field_scan8x8_cavlc[64]={
  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;