[FFmpeg-cvslog] Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 11:57:15 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:48:10 2014 +0100| [3faebed6fa29dc3e5846bbb248a7aaf602e14f6e] | committer: Michael Niedermayer

Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2

* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c':
  movenc: write hvcC tag for HEVC.

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list