virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi: remove old graph parser API with different semantics

Browse Source 
This API hasn't been active since the last bump already.
This commit is contained in:
Hendrik Leppkes
2015-09-05 18:34:17 +02:00
parent c43bd08f8b
commit 3433228795
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/avfilter.h
View File

@@ -937,7 +937,6 @@ AVFilterInOut *avfilter_inout_alloc(void);
*/ */
void avfilter_inout_free(AVFilterInOut **inout); void avfilter_inout_free(AVFilterInOut **inout);
#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
/** /**
* Add a graph described by a string to a graph. * Add a graph described by a string to a graph.
* *
@@ -959,26 +958,6 @@ void avfilter_inout_free(AVFilterInOut **inout);
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *inputs, AVFilterInOut *outputs, AVFilterInOut *inputs, AVFilterInOut *outputs,
void *log_ctx); void *log_ctx);
#else
/**
* Add a graph described by a string to a graph.
*
* @param graph the filter graph where to link the parsed graph context
* @param filters string to be parsed
* @param inputs pointer to a linked list to the inputs of the graph, may be NULL.
* If non-NULL, *inputs is updated to contain the list of open inputs
* after the parsing, should be freed with avfilter_inout_free().
* @param outputs pointer to a linked list to the outputs of the graph, may be NULL.
* If non-NULL, *outputs is updated to contain the list of open outputs
* after the parsing, should be freed with avfilter_inout_free().
* @return non negative on success, a negative AVERROR code on error
* @deprecated Use avfilter_graph_parse_ptr() instead.
*/
attribute_deprecated
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut **inputs, AVFilterInOut **outputs,
void *log_ctx);
#endif
/** /**
* Add a graph described by a string to a graph. * Add a graph described by a string to a graph.

8
libavfilter/graphparser.c
View File

@@ -456,7 +456,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
return ret; return ret;
} }
#if HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *open_inputs, AVFilterInOut *open_inputs,
AVFilterInOut *open_outputs, void *log_ctx) AVFilterInOut *open_outputs, void *log_ctx)
@@ -518,13 +517,6 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
avfilter_inout_free(&open_inputs); avfilter_inout_free(&open_inputs);
avfilter_inout_free(&open_outputs); avfilter_inout_free(&open_outputs);
return ret; return ret;
#else
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut **inputs, AVFilterInOut **outputs,
void *log_ctx)
{
return avfilter_graph_parse_ptr(graph, filters, inputs, outputs, log_ctx);
#endif
} }
int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters, int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters,

3
libavfilter/version.h
View File

@@ -64,9 +64,6 @@
#ifndef FF_API_OLD_FILTER_REGISTER #ifndef FF_API_OLD_FILTER_REGISTER
#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7)
#endif #endif
#ifndef FF_API_OLD_GRAPH_PARSE
#define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5)
#endif
#ifndef FF_API_NOCONST_GET_NAME #ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
#endif #endif