[FFmpeg-cvslog] r20283 - trunk/libavformat/mtv.c

[reynaldo]

Author: reynaldo
Date: Sun Oct 18 20:02:12 2009
New Revision: 20283

Log:
Smarten mtv's probe a bit. Check for non zero
on bpp and width|height header fields. This
change is among the ones suggested by Vitor
Sessak in his '[FFmpeg-devel] [PATCH] Improve
MTV probe' thread.

Modified:
   trunk/libavformat/mtv.c

Modified: trunk/libavformat/mtv.c
==============================================================================
--- trunk/libavformat/mtv.c	Sun Oct 18 18:33:14 2009	(r20282)
+++ trunk/libavformat/mtv.c	Sun Oct 18 20:02:12 2009	(r20283)
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define MTV_ASUBCHUNK_DATA_SIZE 500
@@ -56,6 +57,10 @@ static int mtv_probe(AVProbeData *p)
     if(*(p->buf) != 'A' || *(p->buf+1) != 'M' || *(p->buf+2) != 'V')
         return 0;
 
+    /* Check for nonzero in bpp and (width|height) header fields */
+    if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
+        return 0;
+
     return AVPROBE_SCORE_MAX;
 }