[FFmpeg-cvslog] r15927 - in trunk/libavcodec: h264.h h264data.h

[diego]

Author: diego
Date: Mon Nov 24 17:08:21 2008
New Revision: 15927

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


Modified:
   trunk/libavcodec/h264.h
   trunk/libavcodec/h264data.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	(original)
+++ trunk/libavcodec/h264.h	Mon Nov 24 17:08:21 2008
@@ -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,

Modified: trunk/libavcodec/h264data.h
==============================================================================
--- trunk/libavcodec/h264data.h	(original)
+++ trunk/libavcodec/h264data.h	Mon Nov 24 17:08:21 2008
@@ -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
  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;