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 use of uninitalized variable in choose_rct_params()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-10 02:53:04 +01:00
parent 2836ef688b
commit 2bdda9a15c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/ffv1enc.c
View File

@ -1018,6 +1018,7 @@ static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int b, g, r; int b, g, r;
int ab, ag, ar;
if (lbd) { if (lbd) {
unsigned v = *((uint32_t*)(src[0] + x*4 + stride[0]*y)); unsigned v = *((uint32_t*)(src[0] + x*4 + stride[0]*y));
b = v & 0xFF; b = v & 0xFF;
@ -1029,10 +1030,10 @@ static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride
r = *((uint16_t*)(src[2] + x*2 + stride[2]*y)); r = *((uint16_t*)(src[2] + x*2 + stride[2]*y));
} }
ar = r - lastr;
ag = g - lastg;
ab = b - lastb;
if (x && y) { if (x && y) {
int ar = r - lastr;
int ag = g - lastg;
int ab = b - lastb;
int bg = ag - sample[0][x]; int bg = ag - sample[0][x];
int bb = ab - sample[1][x]; int bb = ab - sample[1][x];
int br = ar - sample[2][x]; int br = ar - sample[2][x];
@ -1044,10 +1045,10 @@ static void choose_rct_params(FFV1Context *fs, uint8_t *src[3], const int stride
stat[1] += FFABS(bg + ((br+bb)>>2)); stat[1] += FFABS(bg + ((br+bb)>>2));
stat[2] += FFABS(bg + ((br+bb)>>1)); stat[2] += FFABS(bg + ((br+bb)>>1));
sample[0][x] = ag;
sample[1][x] = ab;
sample[2][x] = ar;
} }
sample[0][x] = ag;
sample[1][x] = ab;
sample[2][x] = ar;
lastr = r; lastr = r;
lastg = g; lastg = g;