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

avcodec/ffv1enc: Fix incompatible pointer type warning

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-06 22:05:13 +01:00
parent 3b3782d74e
commit 9198397115
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/ffv1enc.c
View File

@ -1017,7 +1017,7 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs)
} }
} }
static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride[3], int w, int h) static void choose_rct_params(FFV1Context *fs, const uint8_t *src[3], const int stride[3], int w, int h)
{ {
#define NB_Y_COEFF 15 #define NB_Y_COEFF 15
static const int rct_y_coeff[15][2] = { static const int rct_y_coeff[15][2] = {
@ -1053,14 +1053,14 @@ static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride
int b, g, r; int b, g, r;
int ab, ag, ar; int ab, ag, ar;
if (lbd) { if (lbd) {
unsigned v = *((uint32_t*)(src[0] + x*4 + stride[0]*y)); unsigned v = *((const uint32_t*)(src[0] + x*4 + stride[0]*y));
b = v & 0xFF; b = v & 0xFF;
g = (v >> 8) & 0xFF; g = (v >> 8) & 0xFF;
r = (v >> 16) & 0xFF; r = (v >> 16) & 0xFF;
} else { } else {
b = *((uint16_t*)(src[0] + x*2 + stride[0]*y)); b = *((const uint16_t*)(src[0] + x*2 + stride[0]*y));
g = *((uint16_t*)(src[1] + x*2 + stride[1]*y)); g = *((const uint16_t*)(src[1] + x*2 + stride[1]*y));
r = *((uint16_t*)(src[2] + x*2 + stride[2]*y)); r = *((const uint16_t*)(src[2] + x*2 + stride[2]*y));
} }
ar = r - lastr; ar = r - lastr;