Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:22:20 +0000 (03:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:22:20 +0000 (03:22 +0100)
commit802e5fc8f811fb0e1f23d3e12841d3134d67202e
tree65e9b0550047155ed3a1e0069b8c7f0953ceb5a9
parentfc567ac49e17151f00f31b59030cd10f952612ef
parent1e9db41e2a2166be5671b088ef4ad06a40af459f
Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'

* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
libavformat/movenc.c

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