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

[Clément Bœsch]

On Sun, Nov 23, 2014 at 12:58:06AM +0100, Lukasz Marek wrote:
> 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;

AVClass *class must be declared above

>      if (!last && class && class->option && class->option[0].name)
>          return class->option;
> -- 
> 1.9.1
> 

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141123/525ce47f/attachment.asc>