[vlc-devel] [vlc-commits] mux: mp4: fix broken p_obj test

[Hugo Beauzée-Luyssen]

On Thu, Oct 11, 2018, at 4:57 PM, Francois Cartegnie wrote:
> vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct 
> 11 16:25:42 2018 +0200| [709965b7fd1abd61ae9031c35194172c83e0747c] | 
> committer: Francois Cartegnie
> 
> mux: mp4: fix broken p_obj test
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=709965b7fd1abd61ae9031c35194172c83e0747c
> ---
> 
>  modules/mux/mp4/libmp4mux.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
> index 664516b2ee..4f0b0f8544 100644
> --- a/modules/mux/mp4/libmp4mux.c
> +++ b/modules/mux/mp4/libmp4mux.c
> @@ -1882,9 +1882,10 @@ bool mp4mux_CanMux(vlc_object_t *p_obj, const 
> es_format_t *p_fmt,
>              msg_Warn(p_obj, "H264 muxing from AnnexB source will set an 
> incorrect default profile");
>          break;
>      case VLC_CODEC_HEVC:
> -        if(!p_fmt->i_extra && p_obj)
> +        if(!p_fmt->i_extra)
>          {
> -            msg_Err(p_obj, "HEVC muxing from AnnexB source is 
> unsupported");
> +            if(p_obj)
> +                msg_Err(p_obj, "HEVC muxing from AnnexB source is 
> unsupported");
>              return false;
>          }
>          break;
> 

Is the p_obj test required at all?

Regards,


-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr