Make avfilter_graph_free() do nothing if graph is NULL.

Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini committed 15 years ago

Commit caeb0c31 parent b382d1e3 files · +4 −2Browse files

Unified · Split

3 files

libavfilter/avfilter.h +1 −1
libavfilter/avfiltergraph.c +2 −0
libavfilter/avfiltergraph.h +1 −1

libavfilter/avfilter.h+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28		28
29	#define LIBAVFILTER_VERSION_MAJOR 1	29	#define LIBAVFILTER_VERSION_MAJOR 1
30	#define LIBAVFILTER_VERSION_MINOR 73	30	#define LIBAVFILTER_VERSION_MINOR 73
31	#define LIBAVFILTER_VERSION_MICRO 0	31	#define LIBAVFILTER_VERSION_MICRO 1
32		32
33	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	33	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
34	LIBAVFILTER_VERSION_MINOR, \	34	LIBAVFILTER_VERSION_MINOR, \

libavfilter/avfiltergraph.c+2−0

@@ -34,6 +34,8 @@ AVFilterGraph *avfilter_graph_alloc(void) · 33 unmodified lines
34		34
35	void avfilter_graph_free(AVFilterGraph *graph)	35	void avfilter_graph_free(AVFilterGraph *graph)
36	{	36	{
		37	if (!graph)
		38	return;
37	for (; graph->filter_count > 0; graph->filter_count --)	39	for (; graph->filter_count > 0; graph->filter_count --)
38	avfilter_free(graph->filters[graph->filter_count - 1]);	40	avfilter_free(graph->filters[graph->filter_count - 1]);
39	av_freep(&graph->scale_sws_opts);	41	av_freep(&graph->scale_sws_opts);

libavfilter/avfiltergraph.h+1−1

@@ -79,7 +79,7 @@ int avfilter_graph_create_filter(AVFilterContext *filt_ctx, AVFilter filt, · 78 unmodified lines
79	int avfilter_graph_config(AVFilterGraph graphctx, AVClass log_ctx);	79	int avfilter_graph_config(AVFilterGraph graphctx, AVClass log_ctx);
80		80
81	/**	81	/**
82	* Free a graph and destroy its links.	82	* Free a graph and destroy its links, graph may be NULL.
83	*/	83	*/
84	void avfilter_graph_free(AVFilterGraph *graph);	84	void avfilter_graph_free(AVFilterGraph *graph);
85		85