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_cabac.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_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2d3717bec2..258e9ee7e6 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1323,7 +1323,7 @@ static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) { int mba_xy, mbb_xy; int ctx = 0; - if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches? + if (FRAME_MBAFF(h)) { //FIXME merge with the stuff in fill_caches? int mb_xy = mb_x + (mb_y&~1)*h->mb_stride; mba_xy = mb_xy - 1; if( (mb_y&1) @@ -1886,13 +1886,13 @@ int ff_h264_decode_mb_cabac(H264Context *h) { if( h->slice_type_nos != AV_PICTURE_TYPE_I ) { int skip; /* a skipped mb needs the aff flag from the following mb */ - if( FRAME_MBAFF && (h->mb_y&1)==1 && h->prev_mb_skipped ) + if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && h->prev_mb_skipped) skip = h->next_mb_skipped; else skip = decode_cabac_mb_skip( h, h->mb_x, h->mb_y ); /* read skip flags */ if( skip ) { - if( FRAME_MBAFF && (h->mb_y&1)==0 ){ + if (FRAME_MBAFF(h) && (h->mb_y & 1) == 0) { h->cur_pic.mb_type[mb_xy] = MB_TYPE_SKIP; h->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 ); if(!h->next_mb_skipped) @@ -1909,7 +1909,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) { } } - if(FRAME_MBAFF){ + if (FRAME_MBAFF(h)) { if( (h->mb_y&1) == 0 ) h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |