videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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
This commit is contained in:
Michael Chinen 2010-12-07 14:58:34 +00:00 committed by Justin Ruggles
parent 60a684939a
commit a4151444bd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/flac.h
View File

@ -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,

2
libavcodec/flacdec.c
View File

@ -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 */