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>

...

This commit is contained in:

Michael Niedermayer 2014-02-27 10:34:31 +01:00

parent 64bb64f704 291e49d4e7

commit 33a2b45c2e

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