[MPlayer-dev-eng] [PATCH] frameno file

Oded Shimon ods15 at ods15.dyndns.org
Thu Mar 3 15:21:25 CET 2005


On Thursday 03 March 2005 15:53, Dominik 'Rathann' Mierzejewski wrote:
> I'd do this part like this:
> --- mencoder.c.old      2005-03-01 23:29:21.000000000 +0100
> +++ mencoder.c  2005-03-03 14:51:26.000000000 +0100
> @@ -448,12 +448,14 @@
>  }
>
>    // FIXME: get rid of -dvd and other tricky options
> -  stream2=open_stream(frameno_filename,0,&i);
> +if(framenofile){
> +  stream2=open_stream(framenofile,0,&i);
>    if(stream2){
>      demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL);
> -    if(demuxer2) mp_msg(MSGT_FIXME, MSGL_FIXME,
> MSGTR_UsingPass3ControllFile, frameno_filename); +    if(demuxer2)
> mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_UsingPass3ControllFile, framenofile);
> else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); }
> +}
>
>   mconfig = m_config_new();
>   m_config_register_options(mconfig,mencoder_opts);
>
> Now do you see what I'm talking about?

LOL, are you serious?.. Look in your own patch! There's a reason he moved it - 
the argument/config parsing is done AFTER here!! 'framenofile' will ALWAYS be 
NULL in that area!
It wasn't an indentation change, it was a movement of a chunk of code to a 
more appropriate place.

BTW, should that '// FIXME' still be there?... I'm not even sure what it 
means, but I think it's very old and probably "fixed"...

- ods15




More information about the MPlayer-dev-eng mailing list