summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLimin Wang <lance.lmwang@gmail.com>2021-06-11 18:41:55 +0800
committerKarthick J <kjeyapal@akamai.com>2021-06-14 21:11:24 +0530
commitf21626b67b157e5ae117d3e8ef0326776da42077 (patch)
treef2a09afa70e60836eb3e179fb3cf392923408fd5
parent115aa7cea38161765ef0602f255aa56d17c4bbee (diff)
avformat/dashenc: use av_match_ext()
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
-rw-r--r--libavformat/dashenc.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 8a626c15a4..b7622bc09d 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -330,16 +330,6 @@ static int init_segment_types(AVFormatContext *s)
return 0;
}
-static int check_file_extension(const char *filename, const char *extension) {
- char *dot;
- if (!filename || !extension)
- return -1;
- dot = strrchr(filename, '.');
- if (dot && !strcmp(dot + 1, extension))
- return 0;
- return -1;
-}
-
static void set_vp9_codec_str(AVFormatContext *s, AVCodecParameters *par,
AVRational *frame_rate, char *str, int size) {
VPCC vpcc;
@@ -1530,9 +1520,9 @@ static int dash_init(AVFormatContext *s)
}
if (os->segment_type == SEGMENT_TYPE_WEBM) {
- if ((!c->single_file && check_file_extension(os->init_seg_name, os->format_name) != 0) ||
- (!c->single_file && check_file_extension(os->media_seg_name, os->format_name) != 0) ||
- (c->single_file && check_file_extension(os->single_file_name, os->format_name) != 0)) {
+ if ((!c->single_file && !av_match_ext(os->init_seg_name, os->format_name)) ||
+ (!c->single_file && !av_match_ext(os->media_seg_name, os->format_name)) ||
+ ( c->single_file && !av_match_ext(os->single_file_name, os->format_name))) {
av_log(s, AV_LOG_WARNING,
"One or many segment file names doesn't end with .webm. "
"Override -init_seg_name and/or -media_seg_name and/or "