diff options
Diffstat (limited to 'contrib/ffmpeg/A01-encoding-tool-tag.patch')
-rw-r--r-- | contrib/ffmpeg/A01-encoding-tool-tag.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/contrib/ffmpeg/A01-encoding-tool-tag.patch b/contrib/ffmpeg/A01-encoding-tool-tag.patch deleted file mode 100644 index 8a9301150..000000000 --- a/contrib/ffmpeg/A01-encoding-tool-tag.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c -index cc645a5..3ab3139 100644 ---- a/libavformat/matroskaenc.c -+++ b/libavformat/matroskaenc.c -@@ -805,7 +805,8 @@ 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")) -+ if (av_strcasecmp(t->key, "title") && -+ av_strcasecmp(t->key, "encoding_tool")) - mkv_write_simpletag(s->pb, t); - - end_ebml_master(s->pb, tag); -@@ -965,7 +966,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); - } - -diff --git a/libavformat/movenc.c b/libavformat/movenc.c -index 43a1647..5bc0ca3 100644 ---- a/libavformat/movenc.c -+++ b/libavformat/movenc.c -@@ -1858,7 +1858,8 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, - mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1); - mov_write_string_metadata(s, pb, "\251alb", "album" , 1); - mov_write_string_metadata(s, pb, "\251day", "date" , 1); -- mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); -+ if (!mov_write_string_metadata(s, pb, "\251too", "encoding_tool", 1)) -+ mov_write_string_tag(pb, "\251too", LIBAVFORMAT_IDENT, 0, 1); - mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1); - mov_write_string_metadata(s, pb, "\251gen", "genre" , 1); - mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1); |