virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avcodec/ttaenc: Reallocate packet if its too small

Browse Source 
Fixes assertion failure
Fixes Ticket5394

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 005c61c6b8982f977e415aa69d2d2b42e6b7f3f2)

Conflicts:

	libavcodec/ttaenc.c
This commit is contained in:
Michael Niedermayer 2016-04-26 19:17:19 +02:00
parent 3f69797e9b
commit d94d786bf0
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/ttaenc.c
View File

@ -114,9 +114,12 @@ static int tta_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
{ {
TTAEncContext *s = avctx->priv_data; TTAEncContext *s = avctx->priv_data;
PutBitContext pb; PutBitContext pb;
int ret, i, out_bytes, cur_chan = 0, res = 0, samples = 0; int ret, i, out_bytes, cur_chan, res, samples;
int64_t pkt_size = frame->nb_samples * 2LL * avctx->channels * s->bps;
if ((ret = ff_alloc_packet2(avctx, avpkt, frame->nb_samples * 2 * avctx->channels * s->bps)) < 0) pkt_alloc:
cur_chan = 0, res = 0, samples = 0;
if ((ret = ff_alloc_packet2(avctx, avpkt, pkt_size)) < 0)
return ret; return ret;
init_put_bits(&pb, avpkt->data, avpkt->size); init_put_bits(&pb, avpkt->data, avpkt->size);
@ -174,6 +177,14 @@ static int tta_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
rice->k1++; rice->k1++;
unary = 1 + (outval >> k); unary = 1 + (outval >> k);
if (unary + 100LL > put_bits_left(&pb)) {
if (pkt_size < INT_MAX/2) {
pkt_size *= 2;
av_packet_unref(avpkt);
goto pkt_alloc;
} else
return AVERROR(ENOMEM);
}
do { do {
if (unary > 31) { if (unary > 31) {
put_bits(&pb, 31, 0x7FFFFFFF); put_bits(&pb, 31, 0x7FFFFFFF);