diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 14:09:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 14:09:23 +0100 |
| commit | d998a6ddeef987bbd82fad474b02cddc681a7c6a (patch) | |
| tree | ee0fc3701bb2a7dfa30d428ca02a10bb1fcfaa5b /libavcodec/h264.c | |
| parent | 21270cffaeab2f67a613907516b2b0cd6c9eacf4 (diff) | |
| download | ffmpeg-d998a6ddeef987bbd82fad474b02cddc681a7c6a.tar.gz | |
h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 321fac6d3e..b47e682d5d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1816,7 +1816,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty idct_dc_add(ptr, h->mb + (i*16+p*256 << pixel_shift), linesize); else idct_add (ptr, h->mb + (i*16+p*256 << pixel_shift), linesize); - }else + }else if(CONFIG_SVQ3_DECODER) ff_svq3_add_idct_c(ptr, h->mb + i*16+p*256, linesize, qscale, 0); } } @@ -1836,7 +1836,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty dctcoef_set(h->mb+(p*256 << pixel_shift), pixel_shift, dc_mapping[i], dctcoef_get(h->mb_luma_dc[p], pixel_shift, i)); } } - }else + }else if(CONFIG_SVQ3_DECODER) ff_svq3_luma_dc_dequant_idct_c(h->mb+p*256, h->mb_luma_dc[p], qscale); } } @@ -1880,7 +1880,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type, } } } - }else{ + }else if(CONFIG_SVQ3_DECODER) { for(i=0; i<16; i++){ if(h->non_zero_count_cache[ scan8[i+p*16] ] || h->mb[i*16+p*256]){ //FIXME benchmark weird rule, & below uint8_t * const ptr= dest_y + block_offset[i]; |