RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0' 

* 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
parent c2ad22ff99 c01ccccbb1
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) {
/* 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){