Commit 1125606a authored by Michael Niedermayer's avatar Michael Niedermayer

vp3dec: fix null ptr derefernce.

Fixes ticket1403
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5015c37b
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment