Commit 127aee4c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '75bbaf24'

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

Conflicts:
	libavformat/mpegenc.c

See: 28d35dbeMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9e8ab36f 75bbaf24
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment