summaryrefslogtreecommitdiff
path: root/libavcodec/libshine.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-05-24 15:44:31 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-05-25 16:08:08 +0200
commite48a9ac9af5f6e652735aa44a86420b5e7258895 (patch)
tree46bdd80a316dc1716e0ed4bf25b33bc566317d51 /libavcodec/libshine.c
parentc50904fd7899e37516324e711b3b8edfe7214da8 (diff)
downloadffmpeg-e48a9ac9af5f6e652735aa44a86420b5e7258895.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>
Diffstat (limited to 'libavcodec/libshine.c')
-rw-r--r--libavcodec/libshine.c2
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)