From 063e7692731798426ef90989211ed7d07f9dc38f Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 7 Jan 2010 22:59:22 +0000 Subject: [PATCH] Make avfilter_formats_unref(AVFilterFormats **ref) handle the case when *ref is NULL. Originally committed as revision 21077 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfilter.h | 7 ++++--- libavfilter/formats.c | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index a796280435..ddf13c3bad 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 14 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -231,8 +231,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b); void avfilter_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref); /** - * Removes *ref as a reference to the format list it currently points to, - * deallocates that list if this was the last reference, and sets *ref to NULL. + * If *ref is non-NULL, removes *ref as a reference to the format list + * it currently points to, deallocates that list if this was the last + * reference, and sets *ref to NULL. * * Before After * ________ ________ NULL diff --git a/libavfilter/formats.c b/libavfilter/formats.c index e558195a1d..e175cd3314 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -133,6 +133,9 @@ static int find_ref_index(AVFilterFormats **ref) void avfilter_formats_unref(AVFilterFormats **ref) { + if (!*ref) + return; + int idx = find_ref_index(ref); if(idx >= 0)