aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-03-26 00:00:43 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-03-26 00:00:43 +0000
commited186431994c98cd7db0aa9b0d92b2493a5e9872 (patch)
treebf5007d5aafb71ff7ff319580f8fe056d15d8cbf /libavcodec
parent0cb7f8a26094c533b7dbe25897198953b6660f15 (diff)
downloadffmpeg-ed186431994c98cd7db0aa9b0d92b2493a5e9872.tar.gz
properly set *data_size when returning >= 0 values in shorten_decode_frame()
Original thread: Date: Sat, 24 Mar 2007 04:04:53 +0100 Subject: [Ffmpeg-devel] Shorten file playback broken in SVN trunk Originally committed as revision 8523 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/shorten.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 5aea1e18ba..efb48b51dd 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -294,6 +294,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
if(buf_size < s->max_framesize){
//dprintf(avctx, "wanna more data ... %d\n", buf_size);
+ *data_size = 0;
return input_buf_size;
}
}
@@ -471,6 +472,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
s->blocksize = get_uint(s, av_log2(s->blocksize));
break;
case FN_QUIT:
+ *data_size = 0;
return buf_size;
break;
default: