1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

opt: Fix *av_opt_find2(NULL)

Fixes Ticket650

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-15 22:43:21 +01:00
parent 04bb26e3ee
commit d5e1244ca7

View File

@ -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, const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
int opt_flags, int search_flags, void **target_obj) int opt_flags, int search_flags, void **target_obj)
{ {
const AVClass *c = *(AVClass**)obj; const AVClass *c;
const AVOption *o = NULL; const AVOption *o = NULL;
if(!obj)
return NULL;
c= *(AVClass**)obj;
if (search_flags & AV_OPT_SEARCH_CHILDREN) { if (search_flags & AV_OPT_SEARCH_CHILDREN) {
if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) { if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) {
const AVClass *child = NULL; const AVClass *child = NULL;