Commit 57570052 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '20c38c9c'

* commit '20c38c9c':
  swscale: fix some undefined signed left shifts

Conflicts:
	libswscale/swscale_unscaled.c

See: 7a32ab5eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 28875c41 20c38c9c
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