virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/wavpackenc: Headers are per channel

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2016-01-11 18:32:32 +01:00
parent d755045e78
commit d0fd9bec1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wavpackenc.c
View File

@ -2878,7 +2878,7 @@ static int wavpack_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
buf_size = s->block_samples * avctx->channels * 8 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) if ((ret = ff_alloc_packet2(avctx, avpkt, buf_size)) < 0)
return ret; return ret;
buf = avpkt->data; buf = avpkt->data;