summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <[email protected]>2015-06-26 00:27:54 +0200
committerAndreas Cadhalpun <[email protected]>2015-11-26 01:38:17 +0100
commit554dffb35f7902b9b607aa9c541ec4ea1a142102 (patch)
tree8571de489941489311faee1208ea9ae48ef364a1
parent6e288d527428af7851a173e8cc6e0e30bf9359ca (diff)
mpegaudiodec: copy AVFloatDSPContext from first context to all contexts
This fixes a segfault when decoding multi-channel MP3onMP4 files. This is similar to commit cb72230d for MPADSPContext. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]> (cherry picked from commit 151dbe4579601a81662b4b366d0e10df3c00027a) Signed-off-by: Andreas Cadhalpun <[email protected]>
-rw-r--r--libavcodec/mpegaudiodec_template.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index f3a335c52a..2708c1a2ae 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -1880,6 +1880,7 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx)
s->mp3decctx[i]->adu_mode = 1;
s->mp3decctx[i]->avctx = avctx;
s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
+ s->mp3decctx[i]->fdsp = s->mp3decctx[0]->fdsp;
}
return 0;