virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Vastly improved mm_probe function, passes probetest.

Browse Source 
Originally committed as revision 19851 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-09-15 09:21:29 +00:00
parent 97e078087b
commit 5837e4ca33
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mm.c
View File

@ -58,10 +58,22 @@ typedef struct {
static int mm_probe(AVProbeData *p) static int mm_probe(AVProbeData *p)
{ {
int len, type, fps, w, h;
if (p->buf_size < MM_HEADER_LEN_AV + MM_PREAMBLE_SIZE)
return 0;
/* the first chunk is always the header */ /* the first chunk is always the header */
if (AV_RL16(&p->buf[0]) != MM_TYPE_HEADER) if (AV_RL16(&p->buf[0]) != MM_TYPE_HEADER)
return 0; return 0;
if (AV_RL32(&p->buf[2]) != MM_HEADER_LEN_V && AV_RL32(&p->buf[2]) != MM_HEADER_LEN_AV) len = AV_RL32(&p->buf[2]);
if (len != MM_HEADER_LEN_V && len != MM_HEADER_LEN_AV)
return 0;
fps = AV_RL16(&p->buf[8]);
w = AV_RL16(&p->buf[12]);
h = AV_RL16(&p->buf[14]);
if (!fps || fps > 60 || !w || w > 2048 || !h || h > 2048)
return 0;
type = AV_RL16(&p->buf[len]);
if (!type || type > 0x31)
return 0; return 0;
/* only return half certainty since this check is a bit sketchy */ /* only return half certainty since this check is a bit sketchy */