diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 16:43:03 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:35:28 +0300 |
commit | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch) | |
tree | 866bd99edecd778aee4cd8eb5f34977d0c82a27d /libavfilter/vf_yadif.c | |
parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) |
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_yadif.c')
-rw-r--r-- | libavfilter/vf_yadif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index b32f38b57a..7451832b10 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_start = (td->h * jobnr ) / nb_jobs; int slice_end = (td->h * (jobnr+1)) / nb_jobs; @@ -486,7 +486,7 @@ static int config_props(AVFilterLink *link) } 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 { |