diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-03-09 20:37:11 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-03-21 10:20:44 +0100 |
commit | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (patch) | |
tree | c40ae79017ac633146cf66f76fb25a6e5a1234f6 /libavcodec/h264.h | |
parent | 7bece9b22f75289d84ac71c1c7b79851274e723e (diff) | |
download | ffmpeg-7fa00653a550c0d24b3951c0f9fed6350ecf5ce4.tar.gz |
h264: add a parameter to the FIELD_PICTURE macro.
This way it does not look like a constant.
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 077202dd9d..66708c04c6 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -62,7 +62,7 @@ #define MB_MBAFF(h) h->mb_mbaff #define MB_FIELD(h) h->mb_field_decoding_flag #define FRAME_MBAFF(h) h->mb_aff_frame -#define FIELD_PICTURE (h->picture_structure != PICT_FRAME) +#define FIELD_PICTURE(h) (h->picture_structure != PICT_FRAME) #define LEFT_MBS 2 #define LTOP 0 #define LBOT 1 @@ -71,7 +71,7 @@ #define MB_MBAFF(h) 0 #define MB_FIELD(h) 0 #define FRAME_MBAFF(h) 0 -#define FIELD_PICTURE 0 +#define FIELD_PICTURE(h) 0 #undef IS_INTERLACED #define IS_INTERLACED(mb_type) 0 #define LEFT_MBS 1 @@ -79,7 +79,7 @@ #define LBOT 0 #define LEFT(i) 0 #endif -#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF(h) || FIELD_PICTURE) +#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF(h) || FIELD_PICTURE(h)) #ifndef CABAC #define CABAC h->pps.cabac |