OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb0344d 89df3fd)
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)
* 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>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help