Merge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:18:16 +0000 (02:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:18:16 +0000 (02:18 +0200)
* commit '330c18032464a4e1f3da907e54db2e69a6fbfcda':
  matroskaenc: allow override of "writing application" tag
  avfilter: Add missing emms_c when needed
  mpeg12: check scantable indices in all decode_block functions

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12.c
libavfilter/vf_gradfun.c
libavformat/matroskaenc.c

Simple merge
Simple merge
@@@ -776,7 -766,8 +776,9 @@@ static int mkv_write_tag(AVFormatContex
      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);