Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:00:10 +0000 (12:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:00:10 +0000 (12:00 +0200)
commit127aee4ccb5e36916157e621f8bba5133f94cb75
tree10a72fce600d5e3f58e44cbc8eef1c6b71940618
parent9e8ab36f5419149bbaedd88fe0e25507d66a3c93
parent75bbaf2493a71ee66eaabe3c21fadd84d07888de
Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

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

Conflicts:
libavformat/mpegenc.c

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