Michael Niedermayer 5771efde87 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>

2014-05-18 22:29:27 +02:00

5.7 KiB

Raw Blame History

View Raw