diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-17 15:57:51 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-17 15:57:51 +0000 |
| commit | ade5b91ddade9abaf9eb1063559985341ee9ca2d (patch) | |
| tree | 9f86bd5e7dc9f14746bf1496523f956dc5c670fe /libavformat | |
| parent | 9a180390b9982713afa1b90934b588478b58a451 (diff) | |
Use av_match_ext() rather than the deprecated match_ext(), fix
warnings.
Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 | ||||
| -rw-r--r-- | libavformat/nsvdec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3375ab9ddf..9273458a67 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 9c215cd58f..13f7374ae4 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; |