git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a36d903
)
lavfi/cropdetect: use standard options parsing.
author
Clément Bœsch
<ubitux@gmail.com>
Sun, 24 Mar 2013 07:57:56 +0000
(08:57 +0100)
committer
Clément Bœsch
<ubitux@gmail.com>
Sun, 24 Mar 2013 11:26:24 +0000
(12:26 +0100)
libavfilter/vf_cropdetect.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_cropdetect.c
b/libavfilter/vf_cropdetect.c
index
3dd4de7
..
7c0af73
100644
(file)
--- a/
libavfilter/vf_cropdetect.c
+++ b/
libavfilter/vf_cropdetect.c
@@
-98,28
+98,14
@@
static int checkline(void *ctx, const unsigned char *src, int stride, int len, i
static av_cold int init(AVFilterContext *ctx, const char *args)
{
CropDetectContext *cd = ctx->priv;
static av_cold int init(AVFilterContext *ctx, const char *args)
{
CropDetectContext *cd = ctx->priv;
- static const char *shorthand[] = { "limit", "round", "reset_count", NULL };
- int ret;
cd->frame_nb = -2;
cd->frame_nb = -2;
- cd->class = &cropdetect_class;
- av_opt_set_defaults(cd);
-
- if ((ret = av_opt_set_from_string(cd, args, shorthand, "=", ":")) < 0)
- return ret;
-
av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
cd->limit, cd->round, cd->reset_count);
return 0;
}
av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
cd->limit, cd->round, cd->reset_count);
return 0;
}
-static av_cold void uninit(AVFilterContext *ctx)
-{
- CropDetectContext *cd = ctx->priv;
- av_opt_free(cd);
-}
-
static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
@@
-234,15
+220,17
@@
static const AVFilterPad avfilter_vf_cropdetect_outputs[] = {
{ NULL }
};
{ NULL }
};
+static const char *const shorthand[] = { "limit", "round", "reset_count", NULL };
+
AVFilter avfilter_vf_cropdetect = {
.name = "cropdetect",
.description = NULL_IF_CONFIG_SMALL("Auto-detect crop size."),
.priv_size = sizeof(CropDetectContext),
.init = init,
AVFilter avfilter_vf_cropdetect = {
.name = "cropdetect",
.description = NULL_IF_CONFIG_SMALL("Auto-detect crop size."),
.priv_size = sizeof(CropDetectContext),
.init = init,
- .uninit = uninit,
.query_formats = query_formats,
.inputs = avfilter_vf_cropdetect_inputs,
.outputs = avfilter_vf_cropdetect_outputs,
.priv_class = &cropdetect_class,
.query_formats = query_formats,
.inputs = avfilter_vf_cropdetect_inputs,
.outputs = avfilter_vf_cropdetect_outputs,
.priv_class = &cropdetect_class,
+ .shorthand = shorthand,
};
};