[SCM] libav/experimental: Use av_match_ext() rather than the deprecated match_ext(), fix warnings.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:57:52 UTC 2013
The following commit has been merged in the experimental branch:
commit ade5b91ddade9abaf9eb1063559985341ee9ca2d
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sun Jan 17 15:57:51 2010 +0000
Use av_match_ext() rather than the deprecated match_ext(), fix
warnings.
Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3375ab9..9273458 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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");
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 9c215cd..13f7374 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list