[FFmpeg-soc] [soc]: r5164 - in concat: libavformat/m3u.c libavformat/pls.c libavformat/xspf.c upstreamrev

[gkovacs]

Author: gkovacs
Date: Mon Aug 17 16:39:55 2009
New Revision: 5164

Log:
assume that buf is non-null when probing formats

Modified:
   concat/libavformat/m3u.c
   concat/libavformat/pls.c
   concat/libavformat/xspf.c
   concat/upstreamrev

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Mon Aug 17 16:31:03 2009	(r5163)
+++ concat/libavformat/m3u.c	Mon Aug 17 16:39:55 2009	(r5164)
@@ -34,14 +34,8 @@ static const AVCodecTag codec_m3u_tags[]
 
 static int m3u_probe(AVProbeData *p)
 {
-    if (p->buf != 0) {
-        if (!strncmp(p->buf, "#EXTM3U", 7))
-            return AVPROBE_SCORE_MAX;
-        else
-            return 0;
-    }
-    if (match_ext(p->filename, "m3u"))
-        return AVPROBE_SCORE_MAX/2;
+    if (!strncmp(p->buf, "#EXTM3U", 7))
+        return AVPROBE_SCORE_MAX;
     else
         return 0;
 }

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Mon Aug 17 16:31:03 2009	(r5163)
+++ concat/libavformat/pls.c	Mon Aug 17 16:39:55 2009	(r5164)
@@ -34,14 +34,8 @@ static const AVCodecTag codec_pls_tags[]
 
 static int pls_probe(AVProbeData *p)
 {
-    if (p->buf != 0) {
-        if (!strncmp(p->buf, "[playli", 7))
-            return AVPROBE_SCORE_MAX;
-        else
-            return 0;
-    }
-    if (match_ext(p->filename, "pls"))
-        return AVPROBE_SCORE_MAX/2;
+    if (!strncmp(p->buf, "[playli", 7))
+        return AVPROBE_SCORE_MAX;
     else
         return 0;
 }

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Mon Aug 17 16:31:03 2009	(r5163)
+++ concat/libavformat/xspf.c	Mon Aug 17 16:39:55 2009	(r5164)
@@ -34,14 +34,8 @@ static const AVCodecTag codec_xspf_tags[
 
 static int xspf_probe(AVProbeData *p)
 {
-    if (p->buf != 0) {
-        if (!strncmp(p->buf, "<?xml", 5))
-            return AVPROBE_SCORE_MAX;
-        else
-            return 0;
-    }
-    if (match_ext(p->filename, "xspf"))
-        return AVPROBE_SCORE_MAX/2;
+    if (!strncmp(p->buf, "<?xml", 5))
+        return AVPROBE_SCORE_MAX;
     else
         return 0;
 }

Modified: concat/upstreamrev
==============================================================================
--- concat/upstreamrev	Mon Aug 17 16:31:03 2009	(r5163)
+++ concat/upstreamrev	Mon Aug 17 16:39:55 2009	(r5164)
@@ -1,13 +1,13 @@
 ffmpeg:
-svn: 19635
-git: 184d37aca1e2eb2cd2438a77b7fb33a5cefee62b
-committer: ramiro
-commitdate: Thu, 13 Aug 2009 18:47:13 +0000
-commitlog: Introduce av_clip_uint16().
+svn: 19666
+git: 753d52cbd2428454b531965be08d924c761c4cc0
+committer: mru
+commitdate: Mon, 17 Aug 2009 02:23:53 +0000
+commitlog: AVR32: optimised mathops.h
 
 libswscale:
-svn: 19635
-git: 7462c6875cb7429cdc33496b4f8b5a9653899374
+svn: 19666
+git: bb5f66040578ce22cca08e3605333a39ed048e0c
 committer: ramiro
-commitdate: Thu, 13 Aug 2009 19:03:14 +0000
-commitlog: Indent.
+commitdate: Mon, 17 Aug 2009 02:06:00 +0000
+commitlog: swscale-example: Make selection of dstW, dstH, and flags more clear.