[FFmpeg-devel] [PATCH 1/2] lavu/opt: handle NULL obj in av_opt_next

Lukasz Marek lukasz.m.luki2 at gmail.com
Sun Nov 23 00:58:06 CET 2014


It indirectly also fixes av_opt_free for NULL objs.

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
---
 libavutil/opt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 47b1f0c..85330c9 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -50,6 +50,8 @@ const AVOption *av_next_option(void *obj, const AVOption *last)
 
 const AVOption *av_opt_next(void *obj, const AVOption *last)
 {
+    if (!obj)
+        return NULL;
     AVClass *class = *(AVClass**)obj;
     if (!last && class && class->option && class->option[0].name)
         return class->option;
-- 
1.9.1



More information about the ffmpeg-devel mailing list