From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 16 Jan 2015 11:34:47 +0000 (+0100)
Subject: Merge commit '89df3fd49e9992441f680326902b4912d79f514f'
X-Git-Tag: android-x86-6.0-r1~898
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a0aa3eaafc79cfd15452745ad9f54207f6461899;p=android-x86%2Fexternal-ffmpeg.git

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>
---

a0aa3eaafc79cfd15452745ad9f54207f6461899