diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:55:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:55:20 +0100 |
| commit | 53feab7a4e99f53fec74f8e8c83f7cc76481eb9a (patch) | |
| tree | 4db8795d526eb242cc5e4160e372a6ae0424949a | |
| parent | 797d807869f0b960a1fbd11258c644c02a1ba2ac (diff) | |
| parent | 9047491f8bcd87673eed55fb310647a03b0981e9 (diff) | |
| download | ffmpeg-53feab7a4e99f53fec74f8e8c83f7cc76481eb9a.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libswscale/rgb2rgb.c | 4 | ||||
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index cf877fbae0..5b1fcf73ca 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -84,8 +84,8 @@ void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst, int width, int height, int src1Stride, int src2Stride, int dstStride); void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, - int width, int height, int srcStride, - int dst1Stride, int dst2Stride); + int width, int height, int srcStride, + int dst1Stride, int dst2Stride); void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst1, uint8_t *dst2, int width, int height, diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 56e735f6ca..121f4ef2e5 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -705,7 +705,7 @@ static void deinterleaveBytes_c(const uint8_t *src, uint8_t *dst1, uint8_t *dst2 dst1[w] = src[2 * w + 0]; dst2[w] = src[2 * w + 1]; } - src += srcStride; + src += srcStride; dst1 += dst1Stride; dst2 += dst2Stride; } |