diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
| commit | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (patch) | |
| tree | e37df66f9571e2753a827c23ba8c075a8af5d323 /libavcodec/h264.h | |
| parent | e168b508163d7dc05176d81e6b5ea73ac23eb38b (diff) | |
| parent | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (diff) | |
| download | ffmpeg-bf4d0f8328c8f64611ca44a6ffdc30ca4f028249.tar.gz | |
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d73e3765d0..8d674aa072 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -63,8 +63,8 @@ #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 FIELD_PICTURE (h->picture_structure != PICT_FRAME) +#define FRAME_MBAFF(h) h->mb_aff_frame +#define FIELD_PICTURE(h) (h->picture_structure != PICT_FRAME) #define LEFT_MBS 2 #define LTOP 0 #define LBOT 1 @@ -72,8 +72,8 @@ #else #define MB_MBAFF(h) 0 #define MB_FIELD(h) 0 -#define FRAME_MBAFF 0 -#define FIELD_PICTURE 0 +#define FRAME_MBAFF(h) 0 +#define FIELD_PICTURE(h) 0 #undef IS_INTERLACED #define IS_INTERLACED(mb_type) 0 #define LEFT_MBS 1 @@ -81,7 +81,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(h)) #ifndef CABAC #define CABAC h->pps.cabac |