[FFmpeg-cvslog] h263dec: Check for width/height changes on frame skips too.

Michael Niedermayer git at videolan.org
Thu Apr 19 15:07:03 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 19 14:37:35 2012 +0200| [c90b8a74802f36a0594c4867185e18d3dbd4023b] | committer: Michael Niedermayer

h263dec: Check for width/height changes on frame skips too.

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=c90b8a74802f36a0594c4867185e18d3dbd4023b
---

 libavcodec/h263dec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index ac0303d..34b76d3 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -438,7 +438,7 @@ retry:
         ret = ff_h263_decode_picture_header(s);
     }
 
-    if (ret < 0) {
+    if (ret < 0 || ret==FRAME_SKIPPED) {
         if (   s->width  != avctx->coded_width
             || s->height != avctx->coded_height) {
                 av_log(s->avctx, AV_LOG_WARNING, "Reverting picture dimensions change due to header decoding failure\n");



More information about the ffmpeg-cvslog mailing list