generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avopt: Check whether the object actually has got an AVClass

Browse Source 
AVIOContext has got an av_class member that only gets set if
opening the context using avio_open2, but not if allocating a
custom IO context. A caller that wants to read AVOptions from
an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may
not know if the AVIOContext actually has got a class set or not.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-07-29 14:53:01 +03:00
parent b7e6da988b
commit c7e921a54f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/opt.c
View File

@ -650,6 +650,9 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
const AVClass *c = *(AVClass**)obj; const AVClass *c = *(AVClass**)obj;
const AVOption *o = NULL; const AVOption *o = NULL;
if (!c)
return NULL;
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;