[FFmpeg-cvslog] Merge commit '3ac0638d573fc483ba6be3444858b26711c5d67d' into release/2.2

Michael Niedermayer git at videolan.org
Sat Sep 20 14:34:31 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 20 14:27:39 2014 +0200| [1a642b72172da93b376f27240f19c981eb310507] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list