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:30 +0100 |
| commit | 82313eaa34b02cf1a4b6f55c1b73549ec8d056f0 (patch) | |
| tree | 070d0cb6db9995fb97bb5bc66ee4ad4ffe033a44 /libavcodec/h264_cabac.c | |
| parent | 48d0fd2d62a476e1db9298163f1fc0abae26cc67 (diff) | |
| download | ffmpeg-82313eaa34b02cf1a4b6f55c1b73549ec8d056f0.tar.gz | |
h264: add a parameter to the MB_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 12eb2c7b22..5d793ad2b2 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -2088,7 +2088,7 @@ decode_intra_mb: for( i = 0; i < 4; i++ ) { if(IS_DIRECT(h->sub_mb_type[i])) continue; if(IS_DIR(h->sub_mb_type[i], 0, list)){ - int rc = h->ref_count[list] << MB_MBAFF; + int rc = h->ref_count[list] << MB_MBAFF(h); if (rc > 1) { ref[list][i] = decode_cabac_mb_ref( h, list, 4*i ); if (ref[list][i] >= (unsigned) rc) { @@ -2174,7 +2174,7 @@ decode_intra_mb: if(IS_16X16(mb_type)){ for(list=0; list<h->list_count; list++){ if(IS_DIR(mb_type, 0, list)){ - int ref, rc = h->ref_count[list] << MB_MBAFF; + int ref, rc = h->ref_count[list] << MB_MBAFF(h); if (rc > 1) { ref= decode_cabac_mb_ref(h, list, 0); if (ref >= (unsigned) rc) { @@ -2202,7 +2202,7 @@ decode_intra_mb: for(list=0; list<h->list_count; list++){ for(i=0; i<2; i++){ if(IS_DIR(mb_type, i, list)){ - int ref, rc = h->ref_count[list] << MB_MBAFF; + int ref, rc = h->ref_count[list] << MB_MBAFF(h); if (rc > 1) { ref= decode_cabac_mb_ref( h, list, 8*i ); if (ref >= (unsigned) rc) { @@ -2237,7 +2237,7 @@ decode_intra_mb: for(list=0; list<h->list_count; list++){ for(i=0; i<2; i++){ if(IS_DIR(mb_type, i, list)){ //FIXME optimize - int ref, rc = h->ref_count[list] << MB_MBAFF; + int ref, rc = h->ref_count[list] << MB_MBAFF(h); if (rc > 1) { ref= decode_cabac_mb_ref( h, list, 4*i ); if (ref >= (unsigned) rc) { |