RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 20:37:04 +00:00
Code Issues Projects Releases Wiki Activity

Make avfilter_formats_unref(AVFilterFormats **ref) handle the case

Browse Source 
when *ref is NULL.

Originally committed as revision 21077 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-07 22:59:22 +00:00
parent fe59258516
commit 063e769273
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avfilter.h
View File

@ -26,7 +26,7 @@
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 14 #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, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
@ -231,8 +231,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b);
void avfilter_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref); void avfilter_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
/** /**
* Removes *ref as a reference to the format list it currently points to, * If *ref is non-NULL, removes *ref as a reference to the format list
* deallocates that list if this was the last reference, and sets *ref to NULL. * it currently points to, deallocates that list if this was the last
* reference, and sets *ref to NULL.
* *
* Before After * Before After
* ________ ________ NULL * ________ ________ NULL

3
libavfilter/formats.c
View File

@ -133,6 +133,9 @@ static int find_ref_index(AVFilterFormats **ref)
void avfilter_formats_unref(AVFilterFormats **ref) void avfilter_formats_unref(AVFilterFormats **ref)
{ {
if (!*ref)
return;
int idx = find_ref_index(ref); int idx = find_ref_index(ref);
if(idx >= 0) if(idx >= 0)