Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:18:25 +0000 (13:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:18:25 +0000 (13:18 +0100)
* commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
configure
libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge