---
libavfilter/avfiltergraph.c | 2 --
libavfilter/avfiltergraph.h | 2 --
libavfilter/graphparser.c | 19 ++++++-------------
libavfilter/version.h | 3 ---
4 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 95e0a21..b9f0164 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -42,9 +42,7 @@ AVFilterGraph *avfilter_graph_alloc(void)
AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));
if (!ret)
return NULL;
-#if FF_API_GRAPH_AVCLASS
ret->av_class = &filtergraph_class;
-#endif
return ret;
}
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 0d600b9..7c4672d 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -26,9 +26,7 @@
#include "libavutil/log.h"
typedef struct AVFilterGraph {
-#if FF_API_GRAPH_AVCLASS
const AVClass *av_class;
-#endif
unsigned filter_count;
AVFilterContext **filters;
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 5f77084..4915529 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -350,12 +350,6 @@ static int parse_outputs(const char **buf, AVFilterInOut
**curr_inputs,
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)
{
char *p = strchr(*buf, ';');
@@ -364,7 +358,7 @@ static int parse_sws_flags(const char **buf, AVFilterGraph
*graph)
return 0;
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);
}
@@ -397,18 +391,18 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const
char *filters,
AVFilterContext *filter;
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;
- if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0)
+ if ((ret = parse_filter(&filter, &filters, graph, index, graph)) < 0)
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;
if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs,
&open_outputs,
- log_ctx)) < 0)
+ graph)) < 0)
goto fail;
filters += strspn(filters, WHITESPACES);
@@ -420,7 +414,7 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char
*filters,
} while (chr == ',' || chr == ';');
if (chr) {
- av_log(log_ctx, AV_LOG_ERROR,
+ av_log(graph, AV_LOG_ERROR,
"Unable to parse graph description substring: \"%s\"\n",
filters - 1);
ret = AVERROR(EINVAL);
@@ -446,7 +440,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char
*filters,
return ret;
}
-#undef log_ctx
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *open_inputs,
diff --git a/libavfilter/version.h b/libavfilter/version.h
index b8f2749..38b61fd 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -44,9 +44,6 @@
* Those FF_API_* defines are not part of public API.
* 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
#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
--
1.7.10
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
