diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-06 13:29:37 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-12 12:45:39 +0200 |
| commit | 59ee9f78b0cc4fb84ae606fa317d8102ad32a627 (patch) | |
| tree | 253bd434e8b7416d62d8d5f16f1f443cf05c7bd4 /libavfilter/vf_overlay.c | |
| parent | 50ba57e0ce63d9904269ea0728936a0c79f8bfb5 (diff) | |
lavfi: do not use av_pix_fmt_descriptors directly.
Diffstat (limited to 'libavfilter/vf_overlay.c')
| -rw-r--r-- | libavfilter/vf_overlay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index e8ff834dbb..8fb44e30d3 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -113,7 +113,7 @@ static int query_formats(AVFilterContext *ctx) static int config_input_main(AVFilterLink *inlink) { OverlayContext *over = inlink->dst->priv; - const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format); av_image_fill_max_pixsteps(over->max_plane_step, NULL, pix_desc); over->hsub = pix_desc->log2_chroma_w; @@ -158,10 +158,10 @@ static int config_input_overlay(AVFilterLink *inlink) av_log(ctx, AV_LOG_VERBOSE, "main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n", ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h, - av_pix_fmt_descriptors[ctx->inputs[MAIN]->format].name, + av_get_pix_fmt_name(ctx->inputs[MAIN]->format), over->x, over->y, ctx->inputs[OVERLAY]->w, ctx->inputs[OVERLAY]->h, - av_pix_fmt_descriptors[ctx->inputs[OVERLAY]->format].name); + av_get_pix_fmt_name(ctx->inputs[OVERLAY]->format)); if (over->x < 0 || over->y < 0 || over->x + var_values[VAR_OVERLAY_W] > var_values[VAR_MAIN_W] || |