fix issue 616 on roundup : decoding of short flac files

Originally committed as revision 15177 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 60b35a3..4028507 100644 (file)
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -614,7 +614,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
     *data_size=0;
 
     if(s->max_framesize == 0){
-        s->max_framesize= 65536; // should hopefully be enough for the first header
+        s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header
         s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
     }