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)
commitf0ce3854fda36fd67b59421aec939f32a4910515
tree3e5a19c2f8e3176eddfe278e9a50d7733b83d788
parentcd88d89493d3988c990d815e9b2a9b8c3a5f6743
parentbc6461c2861b7d482a037d3b3e2b44ad48805fa0
Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'

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