projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aad3429
)
mp3on4: copy MPADSPContext from first context to all contexts.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 25 Sep 2011 16:16:34 +0000
(12:16 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 21 Oct 2011 16:29:51 +0000
(12:29 -0400)
Fixes segfault when decoding multi-channel MP3onMP4 files.
libavcodec/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegaudiodec.c
b/libavcodec/mpegaudiodec.c
index
2af05ed
..
5d15d25
100644
(file)
--- 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;