[FFmpeg-cvslog] Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 12:00:10 2014 +0200| [127aee4ccb5e36916157e621f8bba5133f94cb75] | committer: Michael Niedermayer

Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
  mpegenc: limit the maximum muxrate

Conflicts:
	libavformat/mpegenc.c

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

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