diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 12:34:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-16 12:51:10 +0100 |
commit | a0aa3eaafc79cfd15452745ad9f54207f6461899 (patch) | |
tree | 4ead2cbf8387db5a0433d67b531cd44c62446fbd /COPYING.LGPLv2.1 | |
parent | bb0344dc5582829253cc300a94fab29fb1f63f40 (diff) | |
parent | 89df3fd49e9992441f680326902b4912d79f514f (diff) | |
download | ffmpeg-a0aa3eaafc79cfd15452745ad9f54207f6461899.tar.gz |
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>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions