Merge commit '3ac0638d573fc483ba6be3444858b26711c5d67d' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Sep 2014 12:27:39 +0000 (14:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Sep 2014 12:27:55 +0000 (14:27 +0200)
commit1a642b72172da93b376f27240f19c981eb310507
tree0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21
parent58b5b062b84b09dfa49bf84497eb530da3918abf
parent3ac0638d573fc483ba6be3444858b26711c5d67d
Merge commit '3ac0638d573fc483ba6be3444858b26711c5d67d' into release/2.2

* commit '3ac0638d573fc483ba6be3444858b26711c5d67d':
  mpegenc: limit the maximum muxrate

Conflicts:
libavformat/mpegenc.c

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