aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-07-13 21:51:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-07-13 21:51:29 +0000
commit4c453ddbbccf3cdd611107e33bd21c9c76c94561 (patch)
tree4045ec83a248f78b27b564caa2148d10db452656 /libavcodec/flac.c
parent4a8361f848945b79eac601d04ca05d1125609c74 (diff)
downloadffmpeg-4c453ddbbccf3cdd611107e33bd21c9c76c94561.tar.gz
Make our flac decoder decode all the data at EOF.
Fixes issue524 Originally committed as revision 14223 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flac.c')
-rw-r--r--libavcodec/flac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index baf47b1382..446ccb949b 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -624,7 +624,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
buf_size += s->bitstream_size;
s->bitstream_size= buf_size;
- if(buf_size < s->max_framesize){
+ if(buf_size < s->max_framesize && input_buf_size){
// printf("wanna more data ...\n");
return input_buf_size;
}
@@ -773,6 +773,7 @@ AVCodec flac_decoder = {
NULL,
flac_decode_close,
flac_decode_frame,
+ CODEC_CAP_DELAY,
.flush= flac_flush,
.long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
};