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_cavlc.c | |
| 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_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 7d074adcf6..d1dcb2ca51 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -709,7 +709,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){ h->mb_skip_run= get_ue_golomb(&h->gb); if (h->mb_skip_run--) { - if(FRAME_MBAFF && (h->mb_y&1) == 0){ + if(FRAME_MBAFF(h) && (h->mb_y&1) == 0){ if(h->mb_skip_run==0) h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb); } @@ -717,7 +717,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){ return 0; } } - if(FRAME_MBAFF){ + if (FRAME_MBAFF(h)) { if( (h->mb_y&1) == 0 ) h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb); } |