Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 20:27:27 +0000 (22:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 20:29:27 +0000 (22:29 +0200)
commit5771efde87c17e1ecda4db32437d16d108c61be2
treeb4600c7b2ab783c78159e015bf1643fbbcf9436d
parentbbee02ed9c186c1bb1fc0c3bcf79e78af978ae6a
parent0ba5299a805e9ccaef1a757381fc2ada4d54b8a1
Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'

* commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

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