virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

Replace all remaining occurances of step/depth_minus1 and offset_plus1

Browse Source
This commit is contained in:
Hendrik Leppkes
2015-09-08 17:10:48 +02:00
parent 151aa2ebff
commit 5d8e836d0e
42 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/vf_histogram.c
+9 -9
View File
@@ -177,25 +177,25 @@ static int query_formats(AVFilterContext *ctx)
avff = ctx->inputs[0]->in_formats;
desc = av_pix_fmt_desc_get(avff->formats[0]);
rgb = desc->flags & AV_PIX_FMT_FLAG_RGB;
bits = desc->comp[0].depth_minus1;
bits = desc->comp[0].depth;
for (i = 1; i < avff->nb_formats; i++) {
desc = av_pix_fmt_desc_get(avff->formats[i]);
if ((rgb != (desc->flags & AV_PIX_FMT_FLAG_RGB)) ||
(bits != desc->comp[0].depth_minus1))
(bits != desc->comp[0].depth))
return AVERROR(EAGAIN);
}
if (rgb && bits == 7)
if (rgb && bits == 8)
out_pix_fmts = levels_out_rgb8_pix_fmts;
else if (rgb && bits == 8)
out_pix_fmts = levels_out_rgb9_pix_fmts;
else if (rgb && bits == 9)
out_pix_fmts = levels_out_rgb9_pix_fmts;
else if (rgb && bits == 10)
out_pix_fmts = levels_out_rgb10_pix_fmts;
else if (bits == 7)
out_pix_fmts = levels_out_yuv8_pix_fmts;
else if (bits == 8)
out_pix_fmts = levels_out_yuv8_pix_fmts;
else if (bits == 9)
out_pix_fmts = levels_out_yuv9_pix_fmts;
else // if (bits == 9)
else // if (bits == 10)
out_pix_fmts = levels_out_yuv10_pix_fmts;
ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats);
@@ -227,7 +227,7 @@ static int config_input(AVFilterLink *inlink)
h->desc = av_pix_fmt_desc_get(inlink->format);
h->ncomp = h->desc->nb_components;
h->histogram_size = 1 << (h->desc->comp[0].depth_minus1 + 1);
h->histogram_size = 1 << h->desc->comp[0].depth;
h->mult = h->histogram_size / 256;
switch (inlink->format) {