[FFmpeg-cvslog] lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Stefano Sabatini git at videolan.org
Sat Jun 11 12:24:45 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Jun 11 11:41:49 2011 +0200| [d468ed032169c8007ed24cb2adfbee3a842eb742] | committer: Stefano Sabatini

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Require "void *" rather than "AVClass *" for the log context type.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d468ed032169c8007ed24cb2adfbee3a842eb742
---

 libavfilter/avfilter.h      |    2 +-
 libavfilter/avfiltergraph.c |    2 +-
 libavfilter/avfiltergraph.h |    4 ++--
 libavfilter/graphparser.c   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 4f5ed36..64d76cc 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -27,7 +27,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  2
 #define LIBAVFILTER_VERSION_MINOR 15
-#define LIBAVFILTER_VERSION_MICRO  0
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index d19fc59..60d529b 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -229,7 +229,7 @@ int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
     return 0;
 }
 
-int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx)
+int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx)
 {
     int ret;
 
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 8013b46..23a7c51 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -76,7 +76,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
  * @param log_ctx context used for logging
  * @return 0 in case of success, a negative AVERROR code otherwise
  */
-int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
+int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
 
 /**
  * Free a graph, destroy its links, and set *graph to NULL.
@@ -118,6 +118,6 @@ typedef struct AVFilterInOut {
  */
 int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
                          AVFilterInOut *inputs, AVFilterInOut *outputs,
-                         AVClass *log_ctx);
+                         void *log_ctx);
 
 #endif /* AVFILTER_AVFILTERGRAPH_H */
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 4f11529..b7a2232 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -329,7 +329,7 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
 
 int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
                          AVFilterInOut *open_inputs,
-                         AVFilterInOut *open_outputs, AVClass *log_ctx)
+                         AVFilterInOut *open_outputs, void *log_ctx)
 {
     int index = 0, ret;
     char chr = 0;



More information about the ffmpeg-cvslog mailing list