ffmpeg | branch: release/2.5 | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Sun May 24 15:44:31 2015 +0200| [18189ebab3cfb2f2fe8ff53a404557bc5f7a12c6] | committer: Andreas Cadhalpun
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 <michae...@gmx.at> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> (cherry picked from commit e48a9ac9af5f6e652735aa44a86420b5e7258895) Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18189ebab3cfb2f2fe8ff53a404557bc5f7a12c6 --- libavcodec/libshine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 48333bb..27c1a5f 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
