diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 22:02:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 22:02:22 +0100 |
| commit | c16896f52551116aa3dda7b60854f0b044913105 (patch) | |
| tree | 48f3a2e646ace61b3e62c3d748c638f4e414d9f0 /libavcodec | |
| parent | c2ad22ff9934eb9324ad8be98f0f5790e4947859 (diff) | |
| parent | c01ccccbb13f464e74bb8498a8c573a66c430ca0 (diff) | |
| download | ffmpeg-c16896f52551116aa3dda7b60854f0b044913105.tar.gz | |
Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'
* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
ituh263dec: use macro instead of #if
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ituh263dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 4a07ac2af1..bf9bd3488b 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -435,8 +435,7 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block, } } else if (s->mb_intra) { /* DC coef */ - if(s->codec_id == AV_CODEC_ID_RV10){ -#if CONFIG_RV10_DECODER + if (CONFIG_RV10_DECODER && s->codec_id == AV_CODEC_ID_RV10) { if (s->rv10_version == 3 && s->pict_type == AV_PICTURE_TYPE_I) { int component, diff; component = (n <= 3 ? 0 : n - 4 + 1); @@ -456,7 +455,6 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block, if (level == 255) level = 128; } -#endif }else{ level = get_bits(&s->gb, 8); if((level&0x7F) == 0){ |