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

[Dominik 'Rathann' Mierzejewski]

On Thursday, 03 March 2005 at 02:45, Olivier Rolland wrote:
> Le 03.03.2005 02:05:27, Dominik 'Rathann' Mierzejewski a écrit :
> >Rejected, because:
> >- indentation changes are strictly forbidden
> 
> I hope it's fixed, but I do not understand mplayer's indentation rules.

It's not. And Diego, please pay attention, too.

> >- default behaviour changes have to be well-motivated and gradual
> 
> Not fixed (following Rich's advice).

Fine.

[...]
> Index: mencoder.c
[...]
> @@ -447,14 +447,6 @@
>    }
>  }
>  
> -  // FIXME: get rid of -dvd and other tricky options
> -  stream2=open_stream(frameno_filename,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);
> -    else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
> -  }
> -
>   mconfig = m_config_new();
>   m_config_register_options(mconfig,mencoder_opts);
>   parse_cfgfiles(mconfig);
> @@ -463,6 +455,16 @@
>  
>    mp_msg_set_level(verbose+MSGL_STATUS);
>  
> +  // FIXME: get rid of -dvd and other tricky options
> +  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, framenofile);
> +      else mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
> +    }
> +  }
> +
>  // check font
>  #ifdef USE_OSD
>  #ifdef HAVE_FREETYPE

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?

Regards,
R.

-- 
MPlayer RPMs maintainer: http://rpm.greysector.net/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"