[FFmpeg-cvslog] r19898 - trunk/libavformat/siff.c

[reimar]

Author: reimar
Date: Thu Sep 17 20:09:20 2009
New Revision: 19898

Log:
Improve SIFF probe by also checking the first tag is one of the expected.

Modified:
   trunk/libavformat/siff.c

Modified: trunk/libavformat/siff.c
==============================================================================
--- trunk/libavformat/siff.c	Thu Sep 17 20:08:07 2009	(r19897)
+++ trunk/libavformat/siff.c	Thu Sep 17 20:09:20 2009	(r19898)
@@ -60,11 +60,12 @@ typedef struct SIFFContext{
 
 static int siff_probe(AVProbeData *p)
 {
+    uint32_t tag = AV_RL32(p->buf + 8);
     /* check file header */
-    if (AV_RL32(p->buf) == TAG_SIFF)
-        return AVPROBE_SCORE_MAX;
-    else
+    if (AV_RL32(p->buf) != TAG_SIFF ||
+        (tag != TAG_VBV1 && tag != TAG_SOUN))
         return 0;
+    return AVPROBE_SCORE_MAX;
 }
 
 static int create_audio_stream(AVFormatContext *s, SIFFContext *c)