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>

pull/88/head

Michael Niedermayer 11 years ago

parent 9e8ab36f54 75bbaf2493

commit 127aee4ccb

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available