Browse Source

lavfi/f_select: Cosmetics, move a function.

Silences a warning when only aselect was enabled:
libavfilter/f_select.c:421:12: warning: 'query_formats' defined but not used
tags/n4.2
Carl Eugen Hoyos 6 years ago
parent
commit
02b6d1dd63
1 changed files with 23 additions and 23 deletions
  1. +23
    -23
      libavfilter/f_select.c

+ 23
- 23
libavfilter/f_select.c View File

@@ -418,29 +418,6 @@ static av_cold void uninit(AVFilterContext *ctx)
}
}

static int query_formats(AVFilterContext *ctx)
{
SelectContext *select = ctx->priv;

if (!select->do_scene_detect) {
return ff_default_query_formats(ctx);
} else {
int ret;
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);

if (!fmts_list)
return AVERROR(ENOMEM);
ret = ff_set_common_formats(ctx, fmts_list);
if (ret < 0)
return ret;
}
return 0;
}

#if CONFIG_ASELECT_FILTER

DEFINE_OPTIONS(aselect, AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM);
@@ -486,6 +463,29 @@ AVFilter ff_af_aselect = {

#if CONFIG_SELECT_FILTER

static int query_formats(AVFilterContext *ctx)
{
SelectContext *select = ctx->priv;

if (!select->do_scene_detect) {
return ff_default_query_formats(ctx);
} else {
int ret;
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);

if (!fmts_list)
return AVERROR(ENOMEM);
ret = ff_set_common_formats(ctx, fmts_list);
if (ret < 0)
return ret;
}
return 0;
}

DEFINE_OPTIONS(select, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM);
AVFILTER_DEFINE_CLASS(select);



Loading…
Cancel
Save