From aa13b573b462e4ce88814f28fd9d2659ddc04eb7 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Fri, 1 Jan 2010 23:56:09 +0000
Subject: [PATCH] Use av_match_ext() in place of the deprecated match_ext()
function.
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffserver.c | 10 +++++-----
libavformat/utils.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index e545c060ed4..bbe65b438d0 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1340,20 +1340,20 @@ static int http_parse_request(HTTPContext *c)
}
redir_type = REDIR_NONE;
- if (match_ext(filename, "asx")) {
+ if (av_match_ext(filename, "asx")) {
redir_type = REDIR_ASX;
filename[strlen(filename)-1] = 'f';
- } else if (match_ext(filename, "asf") &&
+ } else if (av_match_ext(filename, "asf") &&
(!useragent || strncasecmp(useragent, "NSPlayer", 8) != 0)) {
/* if this isn't WMP or lookalike, return the redirector file */
redir_type = REDIR_ASF;
- } else if (match_ext(filename, "rpm,ram")) {
+ } else if (av_match_ext(filename, "rpm,ram")) {
redir_type = REDIR_RAM;
strcpy(filename + strlen(filename)-2, "m");
- } else if (match_ext(filename, "rtsp")) {
+ } else if (av_match_ext(filename, "rtsp")) {
redir_type = REDIR_RTSP;
compute_real_filename(filename, sizeof(filename) - 1);
- } else if (match_ext(filename, "sdp")) {
+ } else if (av_match_ext(filename, "sdp")) {
redir_type = REDIR_SDP;
compute_real_filename(filename, sizeof(filename) - 1);
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 316986cfdef..fe857905044 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -222,7 +222,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
score += 10;
if (filename && fmt->extensions &&
- match_ext(filename, fmt->extensions)) {
+ av_match_ext(filename, fmt->extensions)) {
score += 5;
}
if (score > score_max) {
@@ -325,7 +325,7 @@ static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int
if (fmt1->read_probe) {
score = fmt1->read_probe(pd);
} else if (fmt1->extensions) {
- if (match_ext(pd->filename, fmt1->extensions)) {
+ if (av_match_ext(pd->filename, fmt1->extensions)) {
score = 50;
}
}
--
GitLab