aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-19 14:37:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-19 14:37:35 +0200
commitc90b8a74802f36a0594c4867185e18d3dbd4023b (patch)
treea5035f1e17a2973db181891922ca55ca2840c70e
parent903ccf71b757cd30ce8e2378fd8ba87664e78449 (diff)
downloadffmpeg-c90b8a74802f36a0594c4867185e18d3dbd4023b.tar.gz
h263dec: Check for width/height changes on frame skips too.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h263dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index ac0303de7b..34b76d32ee 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");