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_cavlc.c | |
| 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_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 b66ce9a0b1..b18c54eed1 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -708,7 +708,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); } @@ -716,7 +716,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); } |