diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2015-02-26 10:17:01 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 14:27:23 +0100 |
| commit | 265ad094a8cbf071f24a32370a7ed3e2e7539e5a (patch) | |
| tree | 7287538288a0e888a68af585ab1d92566d58167a /libavcodec/adpcmenc.c | |
| parent | b9d09fb8c9998a533289c2fd9db8792570c9ff8f (diff) | |
| download | ffmpeg-265ad094a8cbf071f24a32370a7ed3e2e7539e5a.tar.gz | |
Fix buffer_size argument to init_put_bits() in multiple encoders.
Several encoders were multiplying the buffer size by 8, in order to get
a bit size. However, the buffer_size argument is for the byte size of
the buffer. We had experienced crashes encoding prores (Anatoliy) at
size 4096x4096.
(cherry picked from commit 50833c9f7b4e1922197a8955669f8ab3589c8cef)
Conflicts:
libavcodec/proresenc_kostya.c
Diffstat (limited to 'libavcodec/adpcmenc.c')
| -rw-r--r-- | libavcodec/adpcmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index da149a3962..e0737e221f 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -541,7 +541,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, case AV_CODEC_ID_ADPCM_IMA_QT: { PutBitContext pb; - init_put_bits(&pb, dst, pkt_size * 8); + init_put_bits(&pb, dst, pkt_size); for (ch = 0; ch < avctx->channels; ch++) { ADPCMChannelStatus *status = &c->status[ch]; @@ -571,7 +571,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, case AV_CODEC_ID_ADPCM_SWF: { PutBitContext pb; - init_put_bits(&pb, dst, pkt_size * 8); + init_put_bits(&pb, dst, pkt_size); n = frame->nb_samples - 1; |