Define FLAC_MIN_FRAME_SIZE and use it in the FLAC decoder.

Patch by Michael Chinen [mchinen at gmail]

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

diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index 7bcc1a1a9dccb7bd82c197311ffae483a4cd6e4d..fcd80996dce344741582e0369856d1c9d82076c2 100644 (file)
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -34,6 +34,7 @@
 #define FLAC_MAX_CHANNELS       8
 #define FLAC_MIN_BLOCKSIZE     16
 #define FLAC_MAX_BLOCKSIZE  65535
+#define FLAC_MIN_FRAME_SIZE    11
 
 enum {
     FLAC_CHMODE_INDEPENDENT =  0,

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 71a2c58ea6101a783529bc8b0b5a2d20c0458430..18ea0acd9aaff888f243b162d5f4bfcdf2891b4d 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -566,7 +566,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
     /* check that there is at least the smallest decodable amount of data.
        this amount corresponds to the smallest valid FLAC frame possible.
        FF F8 69 02 00 00 9A 00 00 34 46 */
-    if (buf_size < 11)
+    if (buf_size < FLAC_MIN_FRAME_SIZE)
         return buf_size;
 
     /* check for inline header */