[SCM] libav/experimental: Slightly improve probe for ea format by checking that it is possible to guess whether the file is little- or big-endian.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:21 UTC 2013


The following commit has been merged in the experimental branch:
commit 892d7e78ef12404db31adf440c30df73bb4890e5
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Thu Sep 17 18:07:27 2009 +0000

    Slightly improve probe for ea format by checking that it is possible to
    guess whether the file is little- or big-endian.
    
    Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 9f82e62..13f6f21 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -389,9 +389,13 @@ static int ea_probe(AVProbeData *p)
     case MPCh_TAG:
     case MVhd_TAG:
     case MVIh_TAG:
-        return AVPROBE_SCORE_MAX;
+        break;
+    default:
+        return 0;
     }
-    return 0;
+    if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff)
+        return 0;
+    return AVPROBE_SCORE_MAX;
 }
 
 static int ea_read_header(AVFormatContext *s,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list