diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
| commit | e168b508163d7dc05176d81e6b5ea73ac23eb38b (patch) | |
| tree | d6fc72152fcc1e94a4b101380bdf62a28432d564 /libavcodec/h264.h | |
| parent | 137df692fc28710aa1a21856b1f5b9e157896fef (diff) | |
| parent | da6be8fcec16a94d8084bda8bb8a0a411a96bcf7 (diff) | |
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
h264: add a parameter to the MB_FIELD macro.
h264: add a parameter to the MB_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index c36cf70821..d73e3765d0 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -61,8 +61,8 @@ #define MAX_SLICES 16 #ifdef ALLOW_INTERLACE -#define MB_MBAFF h->mb_mbaff -#define MB_FIELD h->mb_field_decoding_flag +#define MB_MBAFF(h) h->mb_mbaff +#define MB_FIELD(h) h->mb_field_decoding_flag #define FRAME_MBAFF h->mb_aff_frame #define FIELD_PICTURE (h->picture_structure != PICT_FRAME) #define LEFT_MBS 2 @@ -70,8 +70,8 @@ #define LBOT 1 #define LEFT(i) (i) #else -#define MB_MBAFF 0 -#define MB_FIELD 0 +#define MB_MBAFF(h) 0 +#define MB_FIELD(h) 0 #define FRAME_MBAFF 0 #define FIELD_PICTURE 0 #undef IS_INTERLACED |