Revision 3fb8e77a

View differences:

libavfilter/avfilter.h
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, \
libavfilter/avfiltergraph.c
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 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
libavfilter/avfiltergraph.h
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.

Also available in: Unified diff