[FFmpeg-cvslog] Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'

Michael Niedermayer git at videolan.org
Sun Apr 13 01:41:15 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 01:39:31 2014 +0200| [57570052e244d12900caf6f65bb3dcca12817245] | committer: Michael Niedermayer

Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'

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

Conflicts:
	libswscale/swscale_unscaled.c

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

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





More information about the ffmpeg-cvslog mailing list