[FFmpeg-devel] [PATCH] lavfi: do not pass opaque field to init functions

Stefano Sabatini stefasab at gmail.com
Fri Jul 6 01:22:26 CEST 2012


Fix signature mismatch warnings.
---
 libavfilter/avf_showwaves.c   |    2 +-
 libavfilter/vf_thumbnail.c    |    2 +-
 libavfilter/vf_tile.c         |    2 +-
 libavfilter/vf_tinterlace.c   |    2 +-
 libavfilter/vsrc_cellauto.c   |    2 +-
 libavfilter/vsrc_life.c       |    2 +-
 libavfilter/vsrc_mandelbrot.c |    2 +-
 libavfilter/vsrc_mptestsrc.c  |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index f6fa454..f0ebbf3 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -57,7 +57,7 @@ static const AVOption showwaves_options[] = {
 
 AVFILTER_DEFINE_CLASS(showwaves);
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     ShowWavesContext *showwaves = ctx->priv;
     int err;
diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c
index 45238b6..02354f2 100644
--- a/libavfilter/vf_thumbnail.c
+++ b/libavfilter/vf_thumbnail.c
@@ -43,7 +43,7 @@ typedef struct {
     struct thumb_frame *frames; ///< the n_frames frames
 } ThumbContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     ThumbContext *thumb = ctx->priv;
 
diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c
index 83ee45d..8ed7333 100644
--- a/libavfilter/vf_tile.c
+++ b/libavfilter/vf_tile.c
@@ -39,7 +39,7 @@ typedef struct {
 
 #define REASONABLE_SIZE 1024
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     TileContext *tile = ctx->priv;
     int r;
diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index b0d04eb..28bedf5 100644
--- a/libavfilter/vf_tinterlace.c
+++ b/libavfilter/vf_tinterlace.c
@@ -80,7 +80,7 @@ static int query_formats(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     TInterlaceContext *tinterlace = ctx->priv;
     int i;
diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c
index 1fd43ee..e064c2c 100644
--- a/libavfilter/vsrc_cellauto.c
+++ b/libavfilter/vsrc_cellauto.c
@@ -158,7 +158,7 @@ static int init_pattern_from_file(AVFilterContext *ctx)
     return init_pattern_from_string(ctx);
 }
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     CellAutoContext *cellauto = ctx->priv;
     AVRational frame_rate;
diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index dd35f2c..7a62f63 100644
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -219,7 +219,7 @@ static int init_pattern_from_file(AVFilterContext *ctx)
     return 0;
 }
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     LifeContext *life = ctx->priv;
     AVRational frame_rate;
diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c
index 7bf64d9..2a8efa0 100644
--- a/libavfilter/vsrc_mandelbrot.c
+++ b/libavfilter/vsrc_mandelbrot.c
@@ -108,7 +108,7 @@ static const AVOption mandelbrot_options[] = {
 
 AVFILTER_DEFINE_CLASS(mandelbrot);
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     MBContext *mb = ctx->priv;
     AVRational rate_q;
diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c
index c0b9e43..fd33acf 100644
--- a/libavfilter/vsrc_mptestsrc.c
+++ b/libavfilter/vsrc_mptestsrc.c
@@ -256,7 +256,7 @@ static void ring2_test(uint8_t *dst, int dst_linesize, int off)
     }
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     MPTestContext *test = ctx->priv;
     AVRational frame_rate_q;
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list