[FFmpeg-cvslog] Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4

Michael Niedermayer git at videolan.org
Sun Jan 18 01:01:04 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:51:06 2015 +0100| [a299d93928aed2a88569911a7df803c3cd2d9fb0] | committer: Michael Niedermayer

Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4

* commit '27487944eff721ef8e310db1a2a52329d9377f71':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
	libswscale/rgb2rgb_template.c

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

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





More information about the ffmpeg-cvslog mailing list