summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-11-23 08:24:41 +0000
committerAnton Khirnov <wyskas@gmail.com>2010-11-23 08:24:41 +0000
commiteaa4542b64daeba4881c8893bb90f7a579222f13 (patch)
tree8258b9dfaded88c3fb8c15243835d8b9016b70dc
parentbcb5d217baee81bd6b789d8a151c4a3cb4dd1826 (diff)
downloadffmpeg-streaming-eaa4542b64daeba4881c8893bb90f7a579222f13.zip
ffmpeg-streaming-eaa4542b64daeba4881c8893bb90f7a579222f13.tar.gz
matroskaenc: don't duplicate title information
Title is already written into special fields designated for it -- per-segment Title, per-chapter ChapString and per-stream Name (yay for consistent naming). Therefore, don't duplicate it in Tags. Originally committed as revision 25813 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroskaenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 1430228..dc08c18 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -32,6 +32,7 @@
#include "libavutil/lfg.h"
#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
+#include <strings.h>
typedef struct ebml_master {
int64_t pos; ///< absolute offset in the file where the master's elements start
@@ -742,7 +743,8 @@ static int mkv_write_tag(AVFormatContext *s, AVMetadata *m, unsigned int element
end_ebml_master(s->pb, targets);
while ((t = av_metadata_get(m, "", t, AV_METADATA_IGNORE_SUFFIX)))
- mkv_write_simpletag(s->pb, t);
+ if (strcasecmp(t->key, "title"))
+ mkv_write_simpletag(s->pb, t);
end_ebml_master(s->pb, tag);
return 0;
OpenPOWER on IntegriCloud