From ccba8aaff2ef5649495ae48bc5c90bd8ff32e6f3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 14 Nov 2015 13:04:54 +0100 Subject: [PATCH] avcodec/avrndec: Use the AVFrame format instead of the context Fixes out of array read Fixes: 20dd01398dee0f6d83d7e5410a2ae8eb/signal_sigsegv_39eeb1f_4001_62efbdf1c60748dabf1ec310b59525fd.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/avrndec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index 5e40d664dc..695c4912f8 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -113,7 +113,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int shift = p->height - avctx->height; int subsample_h, subsample_v; - av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &subsample_h, &subsample_v); + av_pix_fmt_get_chroma_sub_sample(p->format, &subsample_h, &subsample_v); p->data[0] += p->linesize[0] * shift; if (p->data[2]) {