diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-30 03:32:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 02:51:27 +0100 |
| commit | aab65146afd83240087523636fa761724b0e9670 (patch) | |
| tree | cd4659a752542ed94ccdadad9e01de61f6e1f1e8 | |
| parent | 8cd3def81d11c20052a0044d59c67da3e1a1a5c8 (diff) | |
| download | ffmpeg-aab65146afd83240087523636fa761724b0e9670.tar.gz | |
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>
(cherry picked from commit a814f1d364ba912adf61adef158168c5f7604e93)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 59cd7251bc..f8865c8678 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2323,7 +2323,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) |