Merge commit '60c4660b'
* commit '60c4660b': swscale: fix an implementation-defined unsigned-to-signed conversion Conflicts: libswscale/swscale_unscaled.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment