summaryrefslogtreecommitdiffstats
path: root/libavcodec/h263dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-28 03:17:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-28 03:17:48 +0200
commit4a619fcae99c7fc8cae7070c7859243c40cdb4bc (patch)
treeb514b9d3dd5b4f83ea1a39f696a24da616a1b9d9 /libavcodec/h263dec.c
parent3c6397404b942cb73f5d0d8d3f02c73d58e3000c (diff)
downloadffmpeg-streaming-4a619fcae99c7fc8cae7070c7859243c40cdb4bc.zip
ffmpeg-streaming-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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9fd79b9..74d9050 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
}
OpenPOWER on IntegriCloud