diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-15 22:43:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-15 22:43:21 +0100 |
| commit | d5e1244ca7731820639849924c77e65eeaea5089 (patch) | |
| tree | dad501aa46f8b6cf20d844523ef94c9176eecaeb /libavutil/opt.c | |
| parent | 04bb26e3ee50a3506af924ff83bf83e13ebef9b0 (diff) | |
| download | ffmpeg-d5e1244ca7731820639849924c77e65eeaea5089.tar.gz | |
opt: Fix *av_opt_find2(NULL)
Fixes Ticket650
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 2421ee8bf1..ca31be3a9a 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -753,9 +753,14 @@ const AVOption *av_opt_find(void *obj, const char *name, const char *unit, const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, int opt_flags, int search_flags, void **target_obj) { - const AVClass *c = *(AVClass**)obj; + const AVClass *c; const AVOption *o = NULL; + if(!obj) + return NULL; + + c= *(AVClass**)obj; + if (search_flags & AV_OPT_SEARCH_CHILDREN) { if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) { const AVClass *child = NULL; |