Merge commit '89df3fd4'

* commit '89df3fd4':
  swscale: fix warning about incompatible function pointer type

Not merged, this change is incorrect for FFmpeg
Merged-by: NMichael Niedermayer <michaelni@gmx.at>