diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:41:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:41:55 +0100 |
| commit | 4cb6814160d074df5d7cbb5b4a2059e7757bbaa6 (patch) | |
| tree | f69561c415ffb2f5d376c0c90d9cbcfb47e414b2 /libavformat | |
| parent | b39e8950243746b88065aade3859acc167bd0bb0 (diff) | |
| parent | 0092c1dd8dac2d9e185b58503b447a0d3fb5230d (diff) | |
| download | ffmpeg-4cb6814160d074df5d7cbb5b4a2059e7757bbaa6.tar.gz | |
Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'
* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
matroskaenc: allow override of "writing application" tag
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 16a7f187f9..50f4dfa51c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -942,7 +942,9 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme end_ebml_master(s->pb, targets); while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) - if (av_strcasecmp(t->key, "title") && av_strcasecmp(t->key, "stereo_mode")) + if (av_strcasecmp(t->key, "title") && + av_strcasecmp(t->key, "stereo_mode") && + av_strcasecmp(t->key, "encoding_tool")) mkv_write_simpletag(s->pb, t); end_ebml_master(s->pb, tag); @@ -1147,7 +1149,10 @@ static int mkv_write_header(AVFormatContext *s) segment_uid[i] = av_lfg_get(&lfg); put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); - put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); + if ((tag = av_dict_get(s->metadata, "encoding_tool", NULL, 0))) + put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, tag->value); + else + put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); } else { const char *ident = "Lavf"; |