summaryrefslogtreecommitdiff
path: root/libavcodec/h264data.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-11-24 16:08:21 +0000
committerDiego Biurrun <diego@biurrun.de>2008-11-24 16:08:21 +0000
commitce9ff9cc52199739ca6c163f3397c3f3bd9baa75 (patch)
tree022e703bdbca8e1c78663de7ceba92133dae4663 /libavcodec/h264data.h
parentee2a957fbd64678cb5f27552fe47968cf44be8fd (diff)
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
Diffstat (limited to 'libavcodec/h264data.h')
-rw-r--r--libavcodec/h264data.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 069116b182..decdd932ef 100644
--- 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;