virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft

Browse Source
This commit is contained in:
Anton Khirnov 2012-06-17 12:36:52 +02:00
parent a5e8c41c28
commit 8d900aa4d0
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avfiltergraph.c
View File

@ -42,9 +42,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph)); AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));
if (!ret) if (!ret)
return NULL; return NULL;
#if FF_API_GRAPH_AVCLASS
ret->av_class = &filtergraph_class; ret->av_class = &filtergraph_class;
#endif
return ret; return ret;
} }

2
libavfilter/avfiltergraph.h
View File

@ -26,9 +26,7 @@
#include "libavutil/log.h" #include "libavutil/log.h"
typedef struct AVFilterGraph { typedef struct AVFilterGraph {
#if FF_API_GRAPH_AVCLASS
const AVClass *av_class; const AVClass *av_class;
#endif
unsigned filter_count; unsigned filter_count;
AVFilterContext **filters; AVFilterContext **filters;

19
libavfilter/graphparser.c
View File

@ -350,12 +350,6 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
return pad; return pad;
} }
#if FF_API_GRAPH_AVCLASS
#define log_ctx graph
#else
#define log_ctx NULL
#endif
static int parse_sws_flags(const char **buf, AVFilterGraph *graph) static int parse_sws_flags(const char **buf, AVFilterGraph *graph)
{ {
char *p = strchr(*buf, ';'); char *p = strchr(*buf, ';');
@ -364,7 +358,7 @@ static int parse_sws_flags(const char **buf, AVFilterGraph *graph)
return 0; return 0;
if (!p) { if (!p) {
av_log(log_ctx, AV_LOG_ERROR, "sws_flags not terminated with ';'.\n"); av_log(graph, AV_LOG_ERROR, "sws_flags not terminated with ';'.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -397,18 +391,18 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
AVFilterContext *filter; AVFilterContext *filter;
filters += strspn(filters, WHITESPACES); filters += strspn(filters, WHITESPACES);
if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, graph)) < 0)
goto fail; goto fail;
if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) if ((ret = parse_filter(&filter, &filters, graph, index, graph)) < 0)
goto fail; goto fail;
if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, graph)) < 0)
goto fail; goto fail;
if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
log_ctx)) < 0) graph)) < 0)
goto fail; goto fail;
filters += strspn(filters, WHITESPACES); filters += strspn(filters, WHITESPACES);
@ -420,7 +414,7 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
} while (chr == ',' || chr == ';'); } while (chr == ',' || chr == ';');
if (chr) { if (chr) {
av_log(log_ctx, AV_LOG_ERROR, av_log(graph, AV_LOG_ERROR,
"Unable to parse graph description substring: \"%s\"\n", "Unable to parse graph description substring: \"%s\"\n",
filters - 1); filters - 1);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
@ -446,7 +440,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
return ret; return ret;
} }
#undef log_ctx
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *open_inputs, AVFilterInOut *open_inputs,

3
libavfilter/version.h
View File

@ -44,9 +44,6 @@
* Those FF_API_* defines are not part of public API. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * They may change, break or disappear at any time.
*/ */
#ifndef FF_API_GRAPH_AVCLASS
#define FF_API_GRAPH_AVCLASS (LIBAVFILTER_VERSION_MAJOR > 2)
#endif
#ifndef FF_API_SAMPLERATE64 #ifndef FF_API_SAMPLERATE64
#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3) #define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3)
#endif #endif