Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 12:38:29 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 13:24:22 +0000 (15:24 +0200)
commit558ce3e5b74c37546c66a26e4e03733d4f09ed76
treed1d50c8ceb7a34309a7dc01bca27bfc93cc00879
parent2516b393d4dda849851cc44ccb610bd87cec1798
parent8a994b7406b3ab24a6444037da9d1659f3125a01
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@gmx.at>
libavfilter/vf_fade.c
libavfilter/vf_yadif.c