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:39 +0100 |
| commit | 7bece9b22f75289d84ac71c1c7b79851274e723e (patch) | |
| tree | 515298bca7e013b81b9625b1e680842c996d8c12 /libavcodec/h264.h | |
| parent | da6be8fcec16a94d8084bda8bb8a0a411a96bcf7 (diff) | |
| download | ffmpeg-7bece9b22f75289d84ac71c1c7b79851274e723e.tar.gz | |
h264: add a parameter to the FRAME_MBAFF 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 9d2a1c5756..077202dd9d 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -61,7 +61,7 @@ #ifdef ALLOW_INTERLACE #define MB_MBAFF(h) h->mb_mbaff #define MB_FIELD(h) h->mb_field_decoding_flag -#define FRAME_MBAFF h->mb_aff_frame +#define FRAME_MBAFF(h) h->mb_aff_frame #define FIELD_PICTURE (h->picture_structure != PICT_FRAME) #define LEFT_MBS 2 #define LTOP 0 @@ -70,7 +70,7 @@ #else #define MB_MBAFF(h) 0 #define MB_FIELD(h) 0 -#define FRAME_MBAFF 0 +#define FRAME_MBAFF(h) 0 #define FIELD_PICTURE 0 #undef IS_INTERLACED #define IS_INTERLACED(mb_type) 0 @@ -79,7 +79,7 @@ #define LBOT 0 #define LEFT(i) 0 #endif -#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE) +#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF(h) || FIELD_PICTURE) #ifndef CABAC #define CABAC h->pps.cabac |