Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

Browse Source

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

Conflicts:
	libavformat/mpegenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-08-27 12:00:10 +02:00

parent 9e8ab36f54 75bbaf2493

commit 127aee4ccb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available