diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-03 13:44:14 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-07 12:37:47 +0200 |
| commit | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (patch) | |
| tree | b8bedf84f2777a5a46ab1c73668ff76da22ba54b /libavfilter | |
| parent | 6b3ef7f080293956b2e5212b83135c6b051212e9 (diff) | |
| download | ffmpeg-2268db2cd052674fde55c7d48b7a5098ce89b4ba.tar.gz | |
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
The new fields can be accessed directly and are more intelligible.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_hqdn3d.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_yadif.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 7f47a56a0b..d8b1f3901e 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -269,7 +269,7 @@ static int config_input(AVFilterLink *inlink) s->hsub = desc->log2_chroma_w; s->vsub = desc->log2_chroma_h; - s->depth = desc->comp[0].depth_minus1+1; + s->depth = desc->comp[0].depth; s->line = av_malloc(inlink->w * sizeof(*s->line)); if (!s->line) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 53c567cb96..574eac4a03 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -186,7 +186,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) YADIFContext *s = ctx->priv; ThreadData *td = arg; int refs = s->cur->linesize[td->plane]; - int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8; + int df = (s->csp->comp[td->plane].depth + 7) / 8; int pix_3 = 3 * df; int slice_h = td->h / nb_jobs; int slice_start = jobnr * slice_h; @@ -463,7 +463,7 @@ static int config_props(AVFilterLink *link) link->h = link->src->inputs[0]->h; s->csp = av_pix_fmt_desc_get(link->format); - if (s->csp->comp[0].depth_minus1 / 8 == 1) { + if (s->csp->comp[0].depth > 8) { s->filter_line = filter_line_c_16bit; s->filter_edges = filter_edges_16bit; } else { |