diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-11 18:32:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 17:23:55 +0100 |
| commit | 60956a9dc86228f37197f3ffe35f2d9ceb105ed0 (patch) | |
| tree | d9d8a5417277869c4aadaa5ca6c47fee2239457f | |
| parent | 526b5facc59e5d45aac5b3832a04b3af28f038b0 (diff) | |
| download | ffmpeg-60956a9dc86228f37197f3ffe35f2d9ceb105ed0.tar.gz | |
avcodec/wavpackenc: Headers are per channel
Fixes: 1b8b83a53bfa751f01b1daa65a4758db/signal_sigabrt_7ffff6ae7cb7_7488_403f71d1a2565b598d01b6cb110fac8f.aiff
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 26757b0279b4b93c6066c2151d4d3dbd2ec266bf)
Conflicts:
libavcodec/wavpackenc.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/wavpackenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index c1749505e7..aee4b79304 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2882,7 +2882,7 @@ static int wavpack_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } buf_size = s->block_samples * avctx->channels * 8 - + 200 /* for headers */; + + 200 * avctx->channels /* for headers */; if ((ret = ff_alloc_packet2(avctx, avpkt, buf_size)) < 0) return ret; buf = avpkt->data; |