[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 27 10:34:31 2014 +0100| [33a2b45c2e180c94fa7277d73f9e9595e6617e56] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33a2b45c2e180c94fa7277d73f9e9595e6617e56
---