diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2015-02-26 10:17:01 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:47:05 +0100 |
| commit | c681f86a324d6181c31006edb300356af47e91cd (patch) | |
| tree | 9a89be2db73422d2754b32f91bcbd98676beb2cf /libavcodec/nellymoserenc.c | |
| parent | 1979bfecc78034426bf39442cfbd8a3c8c35e6ae (diff) | |
| download | ffmpeg-c681f86a324d6181c31006edb300356af47e91cd.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
Conflicts:
libavcodec/faxcompr.c
libavcodec/s302menc.c
Conflicts:
libavcodec/adpcmenc.c
Conflicts:
libavcodec/adpcmenc.c
libavcodec/proresenc.c
Diffstat (limited to 'libavcodec/nellymoserenc.c')
| -rw-r--r-- | libavcodec/nellymoserenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 1d35cda9a1..f32b5b2f10 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -287,7 +287,7 @@ static void encode_block(NellyMoserEncodeContext *s, unsigned char *output, int apply_mdct(s); - init_put_bits(&pb, output, output_size * 8); + init_put_bits(&pb, output, output_size); i = 0; for (band = 0; band < NELLY_BANDS; band++) { |