[FFmpeg-cvslog] Merge commit 'ce424e57d629072652935501b439c1a6310c2089' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 21 04:22:30 2014 +0100| [7a6907fcc33498e7b323f87e29c7e223304c1141] | committer: Michael Niedermayer

Merge commit 'ce424e57d629072652935501b439c1a6310c2089' into release/1.1

* commit 'ce424e57d629072652935501b439c1a6310c2089':
  mp3enc: fix a triggerable assert

Conflicts:
	libavformat/mp3enc.c

Changed code is not in FFmpeg

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

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