[FFmpeg-cvslog] Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'
Michael Niedermayer
git at videolan.org
Tue Jan 21 21:54:13 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 21:45:24 2014 +0100| [797d807869f0b960a1fbd11258c644c02a1ba2ac] | committer: Michael Niedermayer
Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'
* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
swscale: fix stride used in planarToNv12Wrapper()
Conflicts:
libswscale/swscale_unscaled.c
See: 94d7ca2b58af13c379d90aad595e82448743abc7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=797d807869f0b960a1fbd11258c644c02a1ba2ac
---
More information about the ffmpeg-cvslog
mailing list