* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Showing the changes to libavfilter (2 of 18 files). Show all
Unified · Split
| @@ -269,7 +269,7 @@ static int config_input(AVFilterLink *inlink) · 268 unmodified lines | |||
| 269 | 269 | ||
| 270 | s->hsub = desc->log2_chroma_w; | 270 | s->hsub = desc->log2_chroma_w; |
| 271 | s->vsub = desc->log2_chroma_h; | 271 | s->vsub = desc->log2_chroma_h; |
| 272 | s->depth = desc->comp[0].depth_minus1+1; | 272 | s->depth = desc->comp[0].depth; |
| 273 | 273 | ||
| 274 | s->line = av_malloc_array(inlink->w, sizeof(*s->line)); | 274 | s->line = av_malloc_array(inlink->w, sizeof(*s->line)); |
| 275 | if (!s->line) | 275 | if (!s->line) |
| @@ -186,7 +186,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 185 unmodified lines | |||
| 186 | YADIFContext *s = ctx->priv; | 186 | YADIFContext *s = ctx->priv; |
| 187 | ThreadData *td = arg; | 187 | ThreadData *td = arg; |
| 188 | int refs = s->cur->linesize[td->plane]; | 188 | int refs = s->cur->linesize[td->plane]; |
| 189 | int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8; | 189 | int df = (s->csp->comp[td->plane].depth + 7) / 8; |
| 190 | int pix_3 = 3 * df; | 190 | int pix_3 = 3 * df; |
| 191 | int slice_start = (td->h * jobnr ) / nb_jobs; | 191 | int slice_start = (td->h * jobnr ) / nb_jobs; |
| 192 | int slice_end = (td->h * (jobnr+1)) / nb_jobs; | 192 | int slice_end = (td->h * (jobnr+1)) / nb_jobs; |
| @@ -486,7 +486,7 @@ static int config_props(AVFilterLink *link) · 293 unmodified lines | |||
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | s->csp = av_pix_fmt_desc_get(link->format); | 488 | s->csp = av_pix_fmt_desc_get(link->format); |
| 489 | if (s->csp->comp[0].depth_minus1 / 8 == 1) { | 489 | if (s->csp->comp[0].depth > 8) { |
| 490 | s->filter_line = filter_line_c_16bit; | 490 | s->filter_line = filter_line_c_16bit; |
| 491 | s->filter_edges = filter_edges_16bit; | 491 | s->filter_edges = filter_edges_16bit; |
| 492 | } else { | 492 | } else { |