diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-05-24 15:44:31 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-07-30 18:53:15 +0200 |
| commit | 18189ebab3cfb2f2fe8ff53a404557bc5f7a12c6 (patch) | |
| tree | e023d15ea15bda6ac31cce6f9bae7b8671927190 | |
| parent | 74a88a509c6e60bec20cb74291b69b9d5dff0a0d (diff) | |
| download | ffmpeg-18189ebab3cfb2f2fe8ff53a404557bc5f7a12c6.tar.gz | |
libshine: fix support for shine 3.0
shine_encode_buffer expects written to be an int pointer, while the
previous shine_encode_frame expected it to be a long pointer.
Thus encoding with libshine currently always fails with
"internal buffer too small", because a negative return value of
shine_encode_buffer is interpreted as a very large long value.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit e48a9ac9af5f6e652735aa44a86420b5e7258895)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavcodec/libshine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 48333bb3c7..27c1a5f43f 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -71,7 +71,7 @@ static int libshine_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, SHINEContext *s = avctx->priv_data; MPADecodeHeader hdr; unsigned char *data; - long written; + int written; int ret, len; if (frame) |