[FFmpeg-cvslog] Merge commit '89df3fd49e9992441f680326902b4912d79f514f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 16 12:34:47 2015 +0100| [a0aa3eaafc79cfd15452745ad9f54207f6461899] | committer: Michael Niedermayer

Merge commit '89df3fd49e9992441f680326902b4912d79f514f'

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

Not merged, this change is incorrect for FFmpeg

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

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