virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

fix decoding with quant matrixes which contain elements <16

Browse Source 
Originally committed as revision 3069 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-04-25 19:03:35 +00:00
parent 49f3806dd8
commit 3c0da30c01
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h263.c
View File

@ -4722,6 +4722,8 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
if (cache&0x80000000) { if (cache&0x80000000) {
if (cache&0x40000000) { if (cache&0x40000000) {
int ulevel;
/* third escape */ /* third escape */
SKIP_CACHE(re, &s->gb, 2); SKIP_CACHE(re, &s->gb, 2);
last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
@ -4747,10 +4749,16 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
SKIP_COUNTER(re, &s->gb, 1+12+1); SKIP_COUNTER(re, &s->gb, 1+12+1);
} }
if(level*s->qscale>1024 || level*s->qscale<-1024){ if(s->mpeg_quant){
if(intra) ulevel= level*s->qscale*s->intra_matrix[scan_table[1]];
else ulevel= level*s->qscale*s->inter_matrix[scan_table[0]];
}else
ulevel= level*s->qscale*16;
if(ulevel>1030*16 || ulevel<-1030*16){
av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale);
return -1; return -1;
} }
#if 0 #if 0
if(s->error_resilience >= FF_ER_COMPLIANT){ if(s->error_resilience >= FF_ER_COMPLIANT){
const int abs_level= ABS(level); const int abs_level= ABS(level);