RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_delogo: use the name 's' for the pointer to the private context 

This is shorter and consistent across filters.
This commit is contained in:
Anton Khirnov 2013-03-18 20:44:36 +01:00
parent e16e23d70e
commit ba09675f44
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/vf_delogo.c
View File

@ -175,11 +175,11 @@ static int query_formats(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx)
{
DelogoContext *delogo = ctx->priv;
DelogoContext *s = ctx->priv;
#define CHECK_UNSET_OPT(opt) \
if (delogo->opt == -1) { \
av_log(delogo, AV_LOG_ERROR, "Option %s was not set.\n", #opt); \
if (s->opt == -1) { \
av_log(s, AV_LOG_ERROR, "Option %s was not set.\n", #opt); \
return AVERROR(EINVAL); \
}
CHECK_UNSET_OPT(x);
@ -187,23 +187,23 @@ static av_cold int init(AVFilterContext *ctx)
CHECK_UNSET_OPT(w);
CHECK_UNSET_OPT(h);
if (delogo->show)
delogo->band = 4;
if (s->show)
s->band = 4;
av_log(ctx, AV_LOG_DEBUG, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
delogo->x, delogo->y, delogo->w, delogo->h, delogo->band, delogo->show);
s->x, s->y, s->w, s->h, s->band, s->show);
delogo->w += delogo->band*2;
delogo->h += delogo->band*2;
delogo->x -= delogo->band;
delogo->y -= delogo->band;
s->w += s->band*2;
s->h += s->band*2;
s->x -= s->band;
s->y -= s->band;
return 0;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{
DelogoContext *delogo = inlink->dst->priv;
DelogoContext *s = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0];
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
AVFrame *out;
@ -234,10 +234,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
apply_delogo(out->data[plane], out->linesize[plane],
in ->data[plane], in ->linesize[plane],
inlink->w>>hsub, inlink->h>>vsub,
delogo->x>>hsub, delogo->y>>vsub,
delogo->w>>hsub, delogo->h>>vsub,
delogo->band>>FFMIN(hsub, vsub),
delogo->show, direct);
s->x>>hsub, s->y>>vsub,
s->w>>hsub, s->h>>vsub,
s->band>>FFMIN(hsub, vsub),
s->show, direct);
}
if (!direct)