Browse Source

Add a log context to avfilter_graph_config_links().

Originally committed as revision 21121 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Stefano Sabatini 15 years ago
parent
commit
3fb8e77a8d
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      libavfilter/avfilter.h
  2. +3
    -3
      libavfilter/avfiltergraph.c
  3. +1
    -1
      libavfilter/avfiltergraph.h

+ 2
- 2
libavfilter/avfilter.h View File

@@ -25,8 +25,8 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"


#define LIBAVFILTER_VERSION_MAJOR 1 #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, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \


+ 3
- 3
libavfilter/avfiltergraph.c View File

@@ -105,7 +105,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
return NULL; return NULL;
} }


static int query_formats(AVFilterGraph *graph)
static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
{ {
int i, j; int i, j;
int scaler_count = 0; 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 */ /* find supported formats from sub-filters, and merge along links */
if(query_formats(graph))
if(query_formats(graph, log_ctx))
return -1; return -1;


/* Once everything is merged, it's possible that we'll still have /* Once everything is merged, it's possible that we'll still have


+ 1
- 1
libavfilter/avfiltergraph.h View File

@@ -66,7 +66,7 @@ int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
/** /**
* Configures the formats of all the links in the graph. * 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. * Frees a graph and destroys its links.


Loading…
Cancel
Save