Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:50:11 +0000 (01:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:50:17 +0000 (01:50 +0100)
* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

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

Simple merge