virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'

Browse Source 
* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

See: ef627bf9ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-21 21:55:20 +01:00
commit 53feab7a4e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/rgb2rgb.c
View File

@ -84,8 +84,8 @@ void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
int width, int height, int src1Stride, int width, int height, int src1Stride,
int src2Stride, int dstStride); int src2Stride, int dstStride);
void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
int width, int height, int srcStride, int width, int height, int srcStride,
int dst1Stride, int dst2Stride); int dst1Stride, int dst2Stride);
void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2, void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
uint8_t *dst1, uint8_t *dst2, uint8_t *dst1, uint8_t *dst2,
int width, int height, int width, int height,

2
libswscale/rgb2rgb_template.c
View File

@ -705,7 +705,7 @@ static void deinterleaveBytes_c(const uint8_t *src, uint8_t *dst1, uint8_t *dst2
dst1[w] = src[2 * w + 0]; dst1[w] = src[2 * w + 0];
dst2[w] = src[2 * w + 1]; dst2[w] = src[2 * w + 1];
} }
src += srcStride; src += srcStride;
dst1 += dst1Stride; dst1 += dst1Stride;
dst2 += dst2Stride; dst2 += dst2Stride;
} }