aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-13 22:11:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-13 22:31:54 +0200
commitc112e36d41da5eb25af3230e2365737759e75375 (patch)
tree01a47d2f5f6abdfd6436b8553fea63853146e260
parentfa125c5e82fce4f82b36076d44421c1ded255409 (diff)
downloadffmpeg-c112e36d41da5eb25af3230e2365737759e75375.tar.gz
flacdec: Fix used AVCodecContext
Fixes out of array writes with multiple threads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/flacdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 2d3e4b3f70..a0c950bdde 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -498,6 +498,7 @@ static int flac_decode_frame(AVCodecContext *avctx, void *data,
int ret;
*got_frame_ptr = 0;
+ s->avctx = avctx;
if (s->max_framesize == 0) {
s->max_framesize =