ffmpeg | branch: release/2.4 | Michael Niedermayer <mich...@niedermayer.cc> |
Mon Jan 11 18:32:32 2016 +0100| [60bc36193ee858e444ed659ef694cbf585f04b10] |
committer: Michael Niedermayer
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 <mich...@niedermayer.cc>
(cherry picked from commit 26757b0279b4b93c6066c2151d4d3dbd2ec266bf)
Conflicts:
libavcodec/wavpackenc.c
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60bc36193ee858e444ed659ef694cbf585f04b10
---
libavcodec/wavpackenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c
index 63971c6..ecc4a2e 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;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
