avformat: make avformat_close_input() more tolerant.

The purpose of this commit is to make error management simpler and less error prone, just like av_free() which is safe with NULL.

Clément Bœsch committed 13 years ago

Commit 36cd0171 parent bc689273 files · +12 −3Browse files

Unified · Split

3 files

@@ -15,6 +15,9 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2013-xx-xx - xxxxxxx - lavf 55.16.101 - avformat.h
		19	avformat_close_input() argument can be NULL and point on NULL.
		20
18	2013-08-29 - e31db62 - lavf 55.15.100 - avformat.h	21	2013-08-29 - e31db62 - lavf 55.15.100 - avformat.h
19	Add av_format_get_probe_score().	22	Add av_format_get_probe_score().
20		23

 void avformat_close_input(AVFormatContext **ps)
 {
-    AVFormatContext *s = *ps;
+    AVFormatContext *s;
-    AVIOContext *pb = s->pb;
+    AVIOContext *pb;
+    if (!ps || !*ps)
+        return;
+    s = *ps;
+    pb = s->pb;
     if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
         (s->flags & AVFMT_FLAG_CUSTOM_IO))

@@ -31,7 +31,7 @@ · 30 unmodified lines
31		31
32	#define LIBAVFORMAT_VERSION_MAJOR 55	32	#define LIBAVFORMAT_VERSION_MAJOR 55
33	#define LIBAVFORMAT_VERSION_MINOR 16	33	#define LIBAVFORMAT_VERSION_MINOR 16
34	#define LIBAVFORMAT_VERSION_MICRO 100	34	#define LIBAVFORMAT_VERSION_MICRO 101
35		35
36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
37	LIBAVFORMAT_VERSION_MINOR, \	37	LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts