Merge commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:03:30 +0000 (11:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:03:30 +0000 (11:03 +0100)
commit66030e8133d1e874c255c767f12d9afc84273218
tree95b9efe3a25ac275f31ed86f10d6af1264f9df6e
parent46f8d838b37cf9180ebad352efd7cc76382cd093
parentdaa5a988e2ec8275ad8b724ea68f78306c271ae7
Merge commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7' into release/2.2

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

Conflicts:
libavformat/matroskaenc.c

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