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

avcodec/mpeg4videodec: fix mcbpc error messages 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-06 05:34:00 +02:00
parent 2baf1c8c60
commit 141a84688f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpeg4videodec.c
View File

@ -614,7 +614,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx)
cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
if (cbpc < 0) { if (cbpc < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); "mcbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
} while (cbpc == 8); } while (cbpc == 8);
@ -686,7 +686,7 @@ try_again:
cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
if (cbpc < 0) { if (cbpc < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); "mcbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
if (cbpc == 20) if (cbpc == 20)
@ -1333,7 +1333,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64])
cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
if (cbpc < 0) { if (cbpc < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"cbpc damaged at %d %d\n", s->mb_x, s->mb_y); "mcbpc damaged at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
} while (cbpc == 20); } while (cbpc == 20);