[SCM] libav/wheezy-security: matroskaenc: allow override of "writing application" tag

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit 330c18032464a4e1f3da907e54db2e69a6fbfcda
Author: John Stebbins <stebbins at jetheaddev.com>
Date:   Mon Mar 3 20:20:14 2014 +0000

    matroskaenc: allow override of "writing application" tag
    
    Signed-off-by: Tim Walker <tdskywalker at gmail.com>
    
    CC: libav-stable at libav.org
    (cherry picked from commit 0092c1dd8dac2d9e185b58503b447a0d3fb5230d)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e93dd65..8666baf 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -766,7 +766,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);
@@ -926,7 +927,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);
     }
 

-- 
Libav/FFmpeg packaging