Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2016-09-06 05:42:24 +0300
committerRodger Combs <rodger.combs@gmail.com>2016-09-07 01:25:36 +0300
commit6ede4e93ca0468dc1645677ad540f575c941ff7a (patch)
treef178fae385ecfd270ada7030b681aeb1bc6fd02f /libavformat
parent86910b15c9ee2d5c377b137ec653c044572f94ff (diff)
lavf/matroskaenc: move skipped metadata keys to separate function
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskaenc.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2a2877fd68..decb66de75 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1308,6 +1308,16 @@ static int mkv_write_tag_targets(AVFormatContext *s,
return 0;
}
+static int mkv_check_tag_name(const char *name, unsigned int elementid)
+{
+ return av_strcasecmp(name, "title") &&
+ av_strcasecmp(name, "stereo_mode") &&
+ av_strcasecmp(name, "creation_time") &&
+ av_strcasecmp(name, "encoding_tool") &&
+ (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID ||
+ av_strcasecmp(name, "language"));
+}
+
static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid,
unsigned int uid, ebml_master *tags)
{
@@ -1320,12 +1330,7 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme
return ret;
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) {
- if (av_strcasecmp(t->key, "title") &&
- av_strcasecmp(t->key, "stereo_mode") &&
- av_strcasecmp(t->key, "creation_time") &&
- av_strcasecmp(t->key, "encoding_tool") &&
- (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID ||
- av_strcasecmp(t->key, "language"))) {
+ if (mkv_check_tag_name(t->key, elementid)) {
ret = mkv_write_simpletag(s->pb, t);
if (ret < 0)
return ret;