[FFmpeg-cvslog] Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 01:26:49 2014 +0200| [28875c418886e1576b657882ee2b969de85041a0] | committer: Michael Niedermayer

Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28875c418886e1576b657882ee2b969de85041a0
---