Commit a0aa3eaa authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '89df3fd4'

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

Not merged, this change is incorrect for FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bb0344dc 89df3fd4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment