[FFmpeg-cvslog] lavfi/overlay: use standard options parsing.
Clément Bœsch
git at videolan.org
Sun Mar 24 12:33:31 CET 2013
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Mar 24 09:10:42 2013 +0100| [e62587bc5e72fd77a0463c16b55ccefd2982eb6f] | committer: Clément Bœsch
lavfi/overlay: use standard options parsing.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e62587bc5e72fd77a0463c16b55ccefd2982eb6f
---
libavfilter/vf_overlay.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index e7d213c..5787141 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -119,15 +119,6 @@ AVFILTER_DEFINE_CLASS(overlay);
static av_cold int init(AVFilterContext *ctx, const char *args)
{
OverlayContext *over = ctx->priv;
- static const char *shorthand[] = { "x", "y", NULL };
- int ret;
-
- over->class = &overlay_class;
- av_opt_set_defaults(over);
-
- ret = av_opt_set_from_string(over, args, shorthand, "=", ":");
- if (ret < 0)
- return ret;
if (over->allow_packed_rgb) {
av_log(ctx, AV_LOG_WARNING,
@@ -141,8 +132,6 @@ static av_cold void uninit(AVFilterContext *ctx)
{
OverlayContext *over = ctx->priv;
- av_opt_free(over);
-
av_frame_free(&over->overpicref);
ff_bufqueue_discard_all(&over->queue_main);
ff_bufqueue_discard_all(&over->queue_over);
@@ -660,6 +649,8 @@ static const AVFilterPad avfilter_vf_overlay_outputs[] = {
{ NULL }
};
+static const char *const shorthand[] = { "x", "y", NULL };
+
AVFilter avfilter_vf_overlay = {
.name = "overlay",
.description = NULL_IF_CONFIG_SMALL("Overlay a video source on top of the input."),
@@ -674,4 +665,5 @@ AVFilter avfilter_vf_overlay = {
.inputs = avfilter_vf_overlay_inputs,
.outputs = avfilter_vf_overlay_outputs,
.priv_class = &overlay_class,
+ .shorthand = shorthand,
};
More information about the ffmpeg-cvslog
mailing list