Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  af_compand: add a dependency on strtok_r

Conflicts:
	configure

Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/56/merge

Michael Niedermayer 11 years ago

parent 64bb64f704 291e49d4e7

commit 33a2b45c2e

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