Merge commit '89df3fd49e9992441f680326902b4912d79f514f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 11:34:47 +0000 (12:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Jan 2015 11:51:10 +0000 (12:51 +0100)
commita0aa3eaafc79cfd15452745ad9f54207f6461899
tree4ead2cbf8387db5a0433d67b531cd44c62446fbd
parentbb0344dc5582829253cc300a94fab29fb1f63f40
parent89df3fd49e9992441f680326902b4912d79f514f
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@gmx.at>