git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a89afb
)
lavu/opt: handle NULL obj in av_opt_next
author
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Sat, 22 Nov 2014 23:48:17 +0000
(
00:48
+0100)
committer
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Tue, 25 Nov 2014 22:09:16 +0000
(23:09 +0100)
It indirectly also fixes av_opt_free for NULL objs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
libavutil/opt.c
patch
|
blob
|
history
diff --git
a/libavutil/opt.c
b/libavutil/opt.c
index
0546a37
..
5b26a00
100644
(file)
--- a/
libavutil/opt.c
+++ b/
libavutil/opt.c
@@
-50,7
+50,10
@@
const AVOption *av_next_option(void *obj, const AVOption *last)
const AVOption *av_opt_next(void *obj, const AVOption *last)
{
- AVClass *class = *(AVClass**)obj;
+ const AVClass *class;
+ if (!obj)
+ return NULL;
+ class = *(const AVClass**)obj;
if (!last && class && class->option && class->option[0].name)
return class->option;
if (last && last[1].name)