[FFmpeg-cvslog] Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 28 00:35:35 2014 +0100| [86b532898d8a2dbd9ddd303434bd8a5a395b15a7] | committer: Michael Niedermayer

Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4

* commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554':
  mp3enc: fix a triggerable assert

Conflicts:
	libavformat/mp3enc.c

No change as the faulty assert is not in FFmpeg

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

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