[FFmpeg-cvslog] Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
Michael Niedermayer
git at videolan.org
Sat Oct 18 23:47:52 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 23:39:56 2014 +0200| [fa040c224703a51d8a07ec33354ab47d275c0493] | committer: Michael Niedermayer
Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
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=fa040c224703a51d8a07ec33354ab47d275c0493
---
More information about the ffmpeg-cvslog
mailing list