From 3fb8e77a8dff489026448af0245d4db43fb0b868 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 10 Jan 2010 13:39:56 +0000
Subject: [PATCH] Add a log context to avfilter_graph_config_links().

Originally committed as revision 21121 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavfilter/avfilter.h      | 4 ++--
 libavfilter/avfiltergraph.c | 6 +++---
 libavfilter/avfiltergraph.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index ddf13c3bad..8f12d7d1d5 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -25,8 +25,8 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR 14
-#define LIBAVFILTER_VERSION_MICRO  1
+#define LIBAVFILTER_VERSION_MINOR 15
+#define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 269d566d5f..73e5f1476f 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -105,7 +105,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
     return NULL;
 }
 
-static int query_formats(AVFilterGraph *graph)
+static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
 {
     int i, j;
     int scaler_count = 0;
@@ -186,10 +186,10 @@ static void pick_formats(AVFilterGraph *graph)
     }
 }
 
-int avfilter_graph_config_formats(AVFilterGraph *graph)
+int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
 {
     /* find supported formats from sub-filters, and merge along links */
-    if(query_formats(graph))
+    if(query_formats(graph, log_ctx))
         return -1;
 
     /* Once everything is merged, it's possible that we'll still have
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index c78d53f0a3..df71ef8543 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -66,7 +66,7 @@ int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
 /**
  * Configures the formats of all the links in the graph.
  */
-int avfilter_graph_config_formats(AVFilterGraph *graphctx);
+int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx);
 
 /**
  * Frees a graph and destroys its links.