Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-30 05:32:36 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-30 06:25:00 +0300
commita814f1d364ba912adf61adef158168c5f7604e93 (patch)
tree926f0d2eeb1474d4a87f9c75556ec67574c64d2f /libavcodec/vp3.c
parent891dc8f87536ac2ec695c70d081345224524ad99 (diff)
avcodec/vp3: always set pix_fmt in theora_decode_header()
Fixes assertion failure Fixes: d0bb0662da342ec65f8f2a081222e6b9/signal_sigabrt_7ffff6ae7cc9_5471_82964f0a9ac2f4d3d59390c15473f6f7.ogg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/vp3.c')
-rw-r--r--libavcodec/vp3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 1d4c575bd3..46c83aa636 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2328,7 +2328,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
return AVERROR_INVALIDDATA;
}
skip_bits(gb, 3); /* reserved */
- }
+ } else
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)