virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'

Browse Source 
* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
  ituh263dec: use macro instead of #if

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-29 22:02:03 +01:00
commit c16896f525
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ituh263dec.c
View File

@ -435,8 +435,7 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block,
} }
} else if (s->mb_intra) { } else if (s->mb_intra) {
/* DC coef */ /* DC coef */
if(s->codec_id == AV_CODEC_ID_RV10){ if (CONFIG_RV10_DECODER && s->codec_id == AV_CODEC_ID_RV10) {
#if CONFIG_RV10_DECODER
if (s->rv10_version == 3 && s->pict_type == AV_PICTURE_TYPE_I) { if (s->rv10_version == 3 && s->pict_type == AV_PICTURE_TYPE_I) {
int component, diff; int component, diff;
component = (n <= 3 ? 0 : n - 4 + 1); component = (n <= 3 ? 0 : n - 4 + 1);
@ -456,7 +455,6 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block,
if (level == 255) if (level == 255)
level = 128; level = 128;
} }
#endif
}else{ }else{
level = get_bits(&s->gb, 8); level = get_bits(&s->gb, 8);
if((level&0x7F) == 0){ if((level&0x7F) == 0){