diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-13 00:23:16 +0300 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-13 00:23:16 +0300 |
commit | caeb0c30272a42c34b7f80acea90fa14cf98ec20 (patch) | |
tree | d0a8b9b1b41bd1e0dd0c39560dd9d31c0bf8d47b /libavfilter | |
parent | b382d1e3e49143c7e9ebab3986dd84b64073de66 (diff) |
Make avfilter_graph_free() do nothing if graph is NULL.
Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
-rw-r--r-- | libavfilter/avfiltergraph.c | 2 | ||||
-rw-r--r-- | libavfilter/avfiltergraph.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 597e7a71d0..a3c51e0b49 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 cad601be1e..a62fe2f79d 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 74d7a12812..1b0d242dc5 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); |