From 1125606a1f8bdcabbdd9107831d20e86f0dfeeae Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 17 Jun 2012 19:50:58 +0200 Subject: [PATCH] vp3dec: fix null ptr derefernce. Fixes ticket1403 Signed-off-by: Michael Niedermayer --- libavcodec/vp3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 923ddfb7ac..81f6b8925c 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1667,7 +1667,7 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->width = FFALIGN(avctx->width, 16); s->height = FFALIGN(avctx->height, 16); - if (avctx->pix_fmt == PIX_FMT_NONE) + if (avctx->codec_id != CODEC_ID_THEORA) avctx->pix_fmt = PIX_FMT_YUV420P; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; if(avctx->idct_algo==FF_IDCT_AUTO) @@ -2315,6 +2315,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) int header_len[3]; int i; + avctx->pix_fmt = PIX_FMT_YUV420P; + s->theora = 1; if (!avctx->extradata_size)