diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:45:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:45:24 +0100 |
| commit | 797d807869f0b960a1fbd11258c644c02a1ba2ac (patch) | |
| tree | 538cd37136623c1aa4b3255fddfcb609bf93f66a | |
| parent | 8a77baae6e793e0e02077cee6b75dd0c35372a40 (diff) | |
| parent | eb01a25fe1452740a7f3ae2cbaff356a5c6e7806 (diff) | |
| download | ffmpeg-797d807869f0b960a1fbd11258c644c02a1ba2ac.tar.gz | |
Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'
* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
swscale: fix stride used in planarToNv12Wrapper()
Conflicts:
libswscale/swscale_unscaled.c
See: 94d7ca2b58af13c379d90aad595e82448743abc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions