Browse code

Add a log context to avfilter_graph_config_links().

Originally committed as revision 21121 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini authored on 2010/01/10 22:39:56
Showing 3 changed files
... ...
@@ -25,8 +25,8 @@
25 25
 #include "libavutil/avutil.h"
26 26
 
27 27
 #define LIBAVFILTER_VERSION_MAJOR  1
28
-#define LIBAVFILTER_VERSION_MINOR 14
29
-#define LIBAVFILTER_VERSION_MICRO  1
28
+#define LIBAVFILTER_VERSION_MINOR 15
29
+#define LIBAVFILTER_VERSION_MICRO  0
30 30
 
31 31
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
32 32
                                                LIBAVFILTER_VERSION_MINOR, \
... ...
@@ -105,7 +105,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
105 105
     return NULL;
106 106
 }
107 107
 
108
-static int query_formats(AVFilterGraph *graph)
108
+static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
109 109
 {
110 110
     int i, j;
111 111
     int scaler_count = 0;
... ...
@@ -186,10 +186,10 @@ static void pick_formats(AVFilterGraph *graph)
186 186
     }
187 187
 }
188 188
 
189
-int avfilter_graph_config_formats(AVFilterGraph *graph)
189
+int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
190 190
 {
191 191
     /* find supported formats from sub-filters, and merge along links */
192
-    if(query_formats(graph))
192
+    if(query_formats(graph, log_ctx))
193 193
         return -1;
194 194
 
195 195
     /* Once everything is merged, it's possible that we'll still have
... ...
@@ -66,7 +66,7 @@ int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
66 66
 /**
67 67
  * Configures the formats of all the links in the graph.
68 68
  */
69
-int avfilter_graph_config_formats(AVFilterGraph *graphctx);
69
+int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx);
70 70
 
71 71
 /**
72 72
  * Frees a graph and destroys its links.