generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h263: more strictly forbid frame size changes with frame-mt.

Browse Source 
Prevents crashes because the old check was incomplete.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 2d22d4307d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 7fe4c8cb76)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Ronald S. Bultje
2012-03-29 12:24:10 -07:00
committed by Reinhard Tartler
parent 26ac878cc2
commit 3fc967f6c7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/h263dec.c
View File

@@ -426,6 +426,13 @@ retry:
if (ret < 0){ if (ret < 0){
av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
return -1; return -1;
} else if ((s->width != avctx->coded_width ||
s->height != avctx->coded_height ||
(s->width + 15) >> 4 != s->mb_width ||
(s->height + 15) >> 4 != s->mb_height) &&
(HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))) {
av_log_missing_feature(s->avctx, "Width/height/bit depth/chroma idc changing with threads is", 0);
return AVERROR_PATCHWELCOME; // width / height changed during parallelized decoding
} }
avctx->has_b_frames= !s->low_delay; avctx->has_b_frames= !s->low_delay;
@@ -567,11 +574,6 @@ retry:
/* H.263 could change picture size any time */ /* H.263 could change picture size any time */
ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat
if (HAVE_THREADS && (s->avctx->active_thread_type&FF_THREAD_FRAME)) {
av_log_missing_feature(s->avctx, "Width/height/bit depth/chroma idc changing with threads is", 0);
return -1; // width / height changed during parallelized decoding
}
s->parse_context.buffer=0; s->parse_context.buffer=0;
MPV_common_end(s); MPV_common_end(s);
s->parse_context= pc; s->parse_context= pc;