[FFmpeg-cvslog] Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'

Michael Niedermayer git at videolan.org
Fri Jan 17 15:29:57 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 15:23:11 2014 +0100| [5049b6a1fe52f549bad6721f162b4ec2d9d0a357] | committer: Michael Niedermayer

Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'

* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
  mp3enc: add an option for disabling the Xing frame.

Conflicts:
	doc/muxers.texi
	libavformat/mp3enc.c

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

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





More information about the ffmpeg-cvslog mailing list