[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/10' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 23:39:42 2014 +0100| [1af235f6b3449dee85c81d7a89f03c5c491224f6] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/10' into release/2.2

* qatar/release/10:
  ituh263: reject b-frame with pp_time = 0
  af_compand: replace strtok_r() with av_get_token()
  latm: Always reconfigure if no extradata was set previously
  af_compand: add a dependency on strtok_r
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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