[FFmpeg-cvslog] Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 02:16:05 2014 +0200| [6c019f05ed5333037e192e8c84d047321fc3629a] | committer: Michael Niedermayer

Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h

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

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