[FFmpeg-cvslog] smush: improve probing

Paul B Mahol git at videolan.org
Sun Nov 4 17:54:31 CET 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Nov  4 16:40:21 2012 +0000| [c4dd4f19f335c531ccc0afacc596b54ef2d2359e] | committer: Paul B Mahol

smush: improve probing

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4dd4f19f335c531ccc0afacc596b54ef2d2359e
---

 libavformat/smush.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/smush.c b/libavformat/smush.c
index b164c75..19ac5d9 100644
--- a/libavformat/smush.c
+++ b/libavformat/smush.c
@@ -32,8 +32,10 @@ typedef struct {
 
 static int smush_read_probe(AVProbeData *p)
 {
-    if ((AV_RL32(p->buf) == MKTAG('S', 'A', 'N', 'M') ||
-         AV_RL32(p->buf) == MKTAG('A', 'N', 'I', 'M'))) {
+    if (((AV_RL32(p->buf) == MKTAG('S', 'A', 'N', 'M') &&
+          AV_RL32(p->buf + 8) == MKTAG('S', 'H', 'D', 'R')) ||
+         (AV_RL32(p->buf) == MKTAG('A', 'N', 'I', 'M') &&
+          AV_RL32(p->buf + 8) == MKTAG('A', 'H', 'D', 'R')))) {
         return AVPROBE_SCORE_MAX;
     }
 



More information about the ffmpeg-cvslog mailing list