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)
commit9827f3db88c0dbcca3070dbd88af131dbcc7e84c
tree1681fe1064388270b24908828e35958cc81abce1
parent4cb6814160d074df5d7cbb5b4a2059e7757bbaa6
parent565e0c6d866ce08d4b06427456d3d1f4fd856e9c
Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'

* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

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