Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Feb 2014 09:34:31 +0000 (10:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Feb 2014 09:34:31 +0000 (10:34 +0100)
commit33a2b45c2e180c94fa7277d73f9e9595e6617e56
tree6a0615486c03e639bf0651b6111d0d26b2da9bbf
parent64bb64f704f751c50f8474e85eb84a6326b44b50
parent291e49d4e7db4b982621d7a25e258f898cfc3217
Merge remote-tracking branch 'qatar/master'

* 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>