From caeb0c30272a42c34b7f80acea90fa14cf98ec20 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Wed, 12 Jan 2011 21:23:16 +0000
Subject: [PATCH] Make avfilter_graph_free() do nothing if graph is NULL.
Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavfilter/avfilter.h | 2 +-
libavfilter/avfiltergraph.c | 2 ++
libavfilter/avfiltergraph.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 597e7a71d0b..a3c51e0b49e 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -28,7 +28,7 @@
#define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 73
-#define LIBAVFILTER_VERSION_MICRO 0
+#define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index cad601be1ef..a62fe2f79de 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -34,6 +34,8 @@ AVFilterGraph *avfilter_graph_alloc(void)
void avfilter_graph_free(AVFilterGraph *graph)
{
+ if (!graph)
+ return;
for (; graph->filter_count > 0; graph->filter_count --)
avfilter_free(graph->filters[graph->filter_count - 1]);
av_freep(&graph->scale_sws_opts);
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 74d7a128129..1b0d242dc59 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -79,7 +79,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
/**
- * Free a graph and destroy its links.
+ * Free a graph and destroy its links, graph may be NULL.
*/
void avfilter_graph_free(AVFilterGraph *graph);
--
GitLab