summaryrefslogtreecommitdiff
path: root/libavcodec/flacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-26 03:29:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-26 04:11:08 +0100
commite5c01ccdf5a9a330d4c51a9b9ea721fd8f1fb70b (patch)
tree32860deafd19a9bbf74c214b563590f77f549e62 /libavcodec/flacdec.c
parent2ad38c6e02cc19fa6e7d5e33b8c4f68264f8ae66 (diff)
avcodec/flacdec: Call ff_flacdsp_init() unconditionally
Fixes out of array access Fixes: signal_sigsegv_324b135_3398_cov_246853371_short.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdec.c')
-rw-r--r--libavcodec/flacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 9b1e4280b6..cda44ba43f 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -472,10 +472,10 @@ static int decode_frame(FLACContext *s)
ret = allocate_buffers(s);
if (ret < 0)
return ret;
- ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->channels, s->bps);
s->got_streaminfo = 1;
dump_headers(s->avctx, (FLACStreaminfo *)s);
}
+ ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->channels, s->bps);
// dump_headers(s->avctx, (FLACStreaminfo *)s);