[FFmpeg-cvslog] Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'

Michael Niedermayer git at videolan.org
Sun May 18 23:22:41 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 22:27:27 2014 +0200| [5771efde87c17e1ecda4db32437d16d108c61be2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5771efde87c17e1ecda4db32437d16d108c61be2
---





More information about the ffmpeg-cvslog mailing list