[FFmpeg-cvslog] h263dec: Restore w/h values to a consistent state if a change is rejected.

Michael Niedermayer git at videolan.org
Wed Mar 28 04:07:02 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 28 03:17:48 2012 +0200| [4a619fcae99c7fc8cae7070c7859243c40cdb4bc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a619fcae99c7fc8cae7070c7859243c40cdb4bc
---

 libavcodec/h263dec.c |    2 ++
 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
         }
 



More information about the ffmpeg-cvslog mailing list