h263dec: Restore w/h values to a consistent state if a change is rejected.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 01:17:48 +0000 (03:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Mar 2012 01:17:48 +0000 (03:17 +0200)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c

index 9fd79b9..74d9050 100644 (file)
@@ -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
         }