Use av_match_ext() rather than the deprecated match_ext(), fix
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 17 Jan 2010 15:57:51 +0000 (15:57 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 17 Jan 2010 15:57:51 +0000 (15:57 +0000)
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/movenc.c
libavformat/nsvdec.c

index 3375ab9..9273458 100644 (file)
@@ -647,7 +647,7 @@ static int ipod_get_codec_tag(AVFormatContext *s, MOVTrack *track)
          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");
 
index 9c215cd..13f7374 100644 (file)
@@ -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;