Merge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:34:58 +0000 (16:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:34:58 +0000 (16:34 +0200)
commit2ce46a959c20ee72ad276e4b02bd50b522e1362a
tree34d81dc165698c520409b284233935cb8fe49413
parent8ca0d74d5945339c70539d363d9132470731c8da
parent9f7119b7fe003e94d72e81f3aa922568c2827dce
Merge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1

* commit '9f7119b7fe003e94d72e81f3aa922568c2827dce':
  movenc: allow override of "writing application" tag

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