[FFmpeg-cvslog] Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

Michael Niedermayer git at videolan.org
Fri Jan 10 02:50:21 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 10 02:32:12 2014 +0100| [3b8299c1e1c72fdd4284d88e7d426bd35689acd3] | committer: Michael Niedermayer

Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558':
  flac muxer: add option to disable writing the global header

Conflicts:
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list