diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 03:17:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 03:17:48 +0200 |
commit | 4a619fcae99c7fc8cae7070c7859243c40cdb4bc (patch) | |
tree | b514b9d3dd5b4f83ea1a39f696a24da616a1b9d9 /libavcodec/h263dec.c | |
parent | 3c6397404b942cb73f5d0d8d3f02c73d58e3000c (diff) | |
download | ffmpeg-4a619fcae99c7fc8cae7070c7859243c40cdb4bc.tar.gz |
h263dec: Restore w/h values to a consistent state if a change is rejected.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 9fd79b9e60..74d9050907 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -587,6 +587,8 @@ retry: 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); + s->width = avctx->coded_width; + s->height= avctx->coded_height; return -1; // width / height changed during parallelized decoding } |