generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "avfilter/vf_noise: dont corrupt the picture outside width x height"

Browse Source 
This reverts commit 51dab60c7b.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707
This commit is contained in:
Michael Niedermayer 2013-09-13 11:24:10 +02:00
parent ad96482d67
commit 53102fa2f0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_noise.c
View File

@ -57,7 +57,6 @@ typedef struct {
const AVClass *class; const AVClass *class;
int nb_planes; int nb_planes;
int linesize[4]; int linesize[4];
int bytewidth[4];
int height[4]; int height[4];
FilterParams all; FilterParams all;
FilterParams param[4]; FilterParams param[4];
@ -197,9 +196,6 @@ static int config_input(AVFilterLink *inlink)
n->height[1] = n->height[2] = FF_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); n->height[1] = n->height[2] = FF_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
n->height[0] = n->height[3] = inlink->h; n->height[0] = n->height[3] = inlink->h;
n->bytewidth [1] = n->bytewidth [2] = FF_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w) * ((desc->comp[0].depth_minus1 + 1) / 8);
n->bytewidth [0] = n->bytewidth [3] = inlink->w * ((desc->comp[0].depth_minus1 + 1) / 8);
return 0; return 0;
} }
@ -381,7 +377,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
noise(td->out->data[plane] + start * td->out->linesize[plane], noise(td->out->data[plane] + start * td->out->linesize[plane],
td->in->data[plane] + start * td->in->linesize[plane], td->in->data[plane] + start * td->in->linesize[plane],
td->out->linesize[plane], td->in->linesize[plane], td->out->linesize[plane], td->in->linesize[plane],
s->bytewidth[plane], start, end, s, plane); s->linesize[plane], start, end, s, plane);
} }
return 0; return 0;
} }