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

Trivial merge