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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 14:38:29 2013 +0200| [558ce3e5b74c37546c66a26e4e03733d4f09ed76] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_fade: support slice threading
  vf_yadif: support slice threading

Conflicts:
	libavfilter/vf_fade.c
	libavfilter/vf_yadif.c

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

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