[FFmpeg-cvslog] Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
Michael Niedermayer
git at videolan.org
Tue Jan 21 22:00:54 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 21:55:20 2014 +0100| [53feab7a4e99f53fec74f8e8c83f7cc76481eb9a] | committer: Michael Niedermayer
Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
swscale: add nv12/nv21->yuv420 converter
Conflicts:
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c
See: ef627bf9ecddfa888d4c6e4fd633852798c3b4a9
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53feab7a4e99f53fec74f8e8c83f7cc76481eb9a
---
More information about the ffmpeg-cvslog
mailing list