Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:41:55 +0000 (01:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:41:55 +0000 (01:41 +0100)
commit4cb6814160d074df5d7cbb5b4a2059e7757bbaa6
treef69561c415ffb2f5d376c0c90d9cbcfb47e414b2
parentb39e8950243746b88065aade3859acc167bd0bb0
parent0092c1dd8dac2d9e185b58503b447a0d3fb5230d
Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
  matroskaenc: allow override of "writing application" tag

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c