mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
swscale: fix stride used in planarToNv12Wrapper()
Conflicts:
libswscale/swscale_unscaled.c
See: 94d7ca2b58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/54/head
commit
797d807869