diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:12:12 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:12:12 +0200 |
| commit | 4064d688e7f24b360a29b927a34db55d4170e34d (patch) | |
| tree | 15db727414852ada8ebf78cd5ff7ed0564e42c34 /libavformat/matroskaenc.c | |
| parent | f83ead7691ad331e9eb0fcb0d26408db940d48b2 (diff) | |
| parent | f56a08559334b7eb6b3fedbc0cc741887f6067ae (diff) | |
| download | ffmpeg-4064d688e7f24b360a29b927a34db55d4170e34d.tar.gz | |
Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'
* commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae':
matroskaenc: Don't write a track language tag
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c5822678c6..1fb39fe10b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1210,7 +1210,9 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme 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, "encoding_tool")) { + av_strcasecmp(t->key, "encoding_tool") && + (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID || + av_strcasecmp(t->key, "language"))) { ret = mkv_write_simpletag(s->pb, t); if (ret < 0) return ret; |