diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
commit | 5d8e836d0ec3bcaabf5bc2020210a1bc61975922 (patch) | |
tree | 8ff87745055d571431ded709218556357b18341c /libavfilter/vf_psnr.c | |
parent | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (diff) |
Replace all remaining occurances of step/depth_minus1 and offset_plus1
Diffstat (limited to 'libavfilter/vf_psnr.c')
-rw-r--r-- | libavfilter/vf_psnr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 3c1dc81a7a..a01b2c12ce 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -251,10 +251,10 @@ static int config_input_ref(AVFilterLink *inlink) return AVERROR(EINVAL); } - s->max[0] = (1 << (desc->comp[0].depth_minus1 + 1)) - 1; - s->max[1] = (1 << (desc->comp[1].depth_minus1 + 1)) - 1; - s->max[2] = (1 << (desc->comp[2].depth_minus1 + 1)) - 1; - s->max[3] = (1 << (desc->comp[3].depth_minus1 + 1)) - 1; + s->max[0] = (1 << desc->comp[0].depth) - 1; + s->max[1] = (1 << desc->comp[1].depth) - 1; + s->max[2] = (1 << desc->comp[2].depth) - 1; + s->max[3] = (1 << desc->comp[3].depth) - 1; s->is_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; s->comps[0] = s->is_rgb ? 'r' : 'y' ; @@ -274,9 +274,9 @@ static int config_input_ref(AVFilterLink *inlink) s->average_max += s->max[j] * s->planeweight[j]; } - s->dsp.sse_line = desc->comp[0].depth_minus1 > 7 ? sse_line_16bit : sse_line_8bit; + s->dsp.sse_line = desc->comp[0].depth > 8 ? sse_line_16bit : sse_line_8bit; if (ARCH_X86) - ff_psnr_init_x86(&s->dsp, desc->comp[0].depth_minus1 + 1); + ff_psnr_init_x86(&s->dsp, desc->comp[0].depth); return 0; } |