[MPlayer-cvslog] Re: CVS: main/libmpdemux demuxer.c,1.191,1.192

[Guillaume POIRIER]

Hi,

On 7/4/05, Tobias Diedrich <ranma at tdiedrich.de> wrote:
> Guillaume Poirier CVS wrote:
> 
> > CVS change done by Guillaume Poirier CVS
> >
> > Update of /cvsroot/mplayer/main/libmpdemux
> > In directory mail:/var2/tmp/cvs-serv3405/libmpdemux
> >
> > Modified Files:
> >       demuxer.c
> > Log Message:
> > adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
> >
> >
> > Index: demuxer.c
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
> > retrieving revision 1.191
> > retrieving revision 1.192
> > diff -u -r1.191 -r1.192
> > --- demuxer.c 20 Jun 2005 14:16:59 -0000      1.191
> > +++ demuxer.c 20 Jun 2005 23:07:35 -0000      1.192
> > @@ -1603,7 +1603,11 @@
> >
> >      mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_ClipInfo);
> >      for(n = 0; info[2*n] != NULL ; n++)
> > +    {
> >        mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
> > +      if (identify)
> > +        mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_%s=%s\n", info[2*n], info[2*n+1]);
> > +    }
> >
> >      return 0;
> >  }
> 
> This breaks the midentify shellscript, because the info names can
> contain spaces.  I'd suggest the following fix:
> 
> Index: libmpdemux/demuxer.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
> retrieving revision 1.192
> diff -u -r1.192 demuxer.c
> --- libmpdemux/demuxer.c        20 Jun 2005 23:07:35 -0000      1.192
> +++ libmpdemux/demuxer.c        4 Jul 2005 16:28:36 -0000
> @@ -1605,9 +1605,13 @@
>      for(n = 0; info[2*n] != NULL ; n++)
>      {
>        mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
> -      if (identify)
> -        mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_%s=%s\n", info[2*n], info[2*n+1]);
> +      if (identify) {
> +        mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, info[2*n]);
> +        mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, info[2*n+1]);
> +      }
>      }
> +    if (identify)
> +      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n);
> 
>      return 0;
>  }

I don't feel like I really can comment on this, so if this fits you,
just commit! :)

Guillaume
-- 
A woman isn't complete without a man.
But where do you find a man - a real man - these
days?
  -- Lauren Bacall
My answer: Only at #mplayerdev on the freenode IRC network.