summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-25 12:16:34 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-21 12:29:51 -0400
commitcb72230dfadb28651e036d717dc12d33b18a6893 (patch)
tree22e270a9cba122c326e3a1e2c079419a471c2484 /libavcodec
parentaad3429d4e34b74e4eb0b37b17f32804e217cf02 (diff)
mp3on4: copy MPADSPContext from first context to all contexts.
Fixes segfault when decoding multi-channel MP3onMP4 files.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegaudiodec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 2af05edc87..5d15d25e48 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1959,6 +1959,7 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
s->mp3decctx[i] = av_mallocz(sizeof(MPADecodeContext));
s->mp3decctx[i]->adu_mode = 1;
s->mp3decctx[i]->avctx = avctx;
+ s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
}
return 0;