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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 30 20:50:50 2014 +0200| [0a6d39791165e46c53c34793261378ef38442272] | committer: Michael Niedermayer

Merge commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417' into release/1.1

* commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417':
  mpegenc: limit the maximum muxrate

Conflicts:
	libavformat/mpegenc.c

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

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