[FFmpeg-cvslog] r21121 - in trunk/libavfilter: avfilter.h avfiltergraph.c avfiltergraph.h

[stefano]

Author: stefano
Date: Sun Jan 10 14:39:56 2010
New Revision: 21121

Log:
Add a log context to avfilter_graph_config_links().

Modified:
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/avfiltergraph.c
   trunk/libavfilter/avfiltergraph.h

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Sun Jan 10 11:40:45 2010	(r21120)
+++ trunk/libavfilter/avfilter.h	Sun Jan 10 14:39:56 2010	(r21121)
@@ -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, \

Modified: trunk/libavfilter/avfiltergraph.c
==============================================================================
--- trunk/libavfilter/avfiltergraph.c	Sun Jan 10 11:40:45 2010	(r21120)
+++ trunk/libavfilter/avfiltergraph.c	Sun Jan 10 14:39:56 2010	(r21121)
@@ -105,7 +105,7 @@ AVFilterContext *avfilter_graph_get_filt
     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 *
     }
 }
 
-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

Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h	Sun Jan 10 11:40:45 2010	(r21120)
+++ trunk/libavfilter/avfiltergraph.h	Sun Jan 10 14:39:56 2010	(r21121)
@@ -66,7 +66,7 @@ int avfilter_graph_config_links(AVFilter
 /**
  * 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.