[FFmpeg-cvslog] r21263 - in trunk/libavformat: movenc.c nsvdec.c

stefano subversion
Sun Jan 17 16:57:51 CET 2010


Author: stefano
Date: Sun Jan 17 16:57:51 2010
New Revision: 21263

Log:
Use av_match_ext() rather than the deprecated match_ext(), fix
warnings.

Modified:
   trunk/libavformat/movenc.c
   trunk/libavformat/nsvdec.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Sun Jan 17 15:17:03 2010	(r21262)
+++ trunk/libavformat/movenc.c	Sun Jan 17 16:57:51 2010	(r21263)
@@ -647,7 +647,7 @@ static int ipod_get_codec_tag(AVFormatCo
          tag == MKTAG('t','e','x','t'))))
         tag = ff_codec_get_tag(codec_ipod_tags, track->enc->codec_id);
 
-    if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v"))
+    if (!av_match_ext(s->filename, "m4a") && !av_match_ext(s->filename, "m4v"))
         av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "
                "Quicktime/Ipod might not play the file\n");
 

Modified: trunk/libavformat/nsvdec.c
==============================================================================
--- trunk/libavformat/nsvdec.c	Sun Jan 17 15:17:03 2010	(r21262)
+++ trunk/libavformat/nsvdec.c	Sun Jan 17 16:57:51 2010	(r21263)
@@ -764,7 +764,7 @@ static int nsv_probe(AVProbeData *p)
             return AVPROBE_SCORE_MAX-20;
     }
     /* so we'll have more luck on extension... */
-    if (match_ext(p->filename, "nsv"))
+    if (av_match_ext(p->filename, "nsv"))
         return AVPROBE_SCORE_MAX/2;
     /* FIXME: add mime-type check */
     return 0;



More information about the ffmpeg-cvslog mailing list