[Mplayer-cvslog] CVS: main mplayer.c,1.148,1.149

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv23952

Modified Files:
	mplayer.c 
Log Message:
fixed punkso's mess... local variables moved back to main()

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -r1.148 -r1.149
*** mplayer.c	2001/06/04 19:30:24	1.148
--- mplayer.c	2001/06/05 00:58:51	1.149
***************
*** 384,389 ****
  }
  
- int divx_quality=0;
- 
  extern int vcd_get_track_end(int fd,int track);
  extern int init_audio(sh_audio_t *sh_audio);
--- 384,387 ----
***************
*** 394,408 ****
  extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen);
  
! char* filename=NULL; //"MI2-Trailer.avi";
! int i;
  char *seek_to_sec=NULL;
  int seek_to_byte=0;
- int f; // filedes
- stream_t* stream=NULL;
- int file_format=DEMUXER_TYPE_UNKNOWN;
  int has_audio=1;
  //int has_video=1;
- //
  int audio_format=0; // override
  #ifdef USE_DIRECTSHOW
  int allow_dshow=1;
--- 392,403 ----
  extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen);
  
! // options:
! int divx_quality=0;
  char *seek_to_sec=NULL;
  int seek_to_byte=0;
  int has_audio=1;
  //int has_video=1;
  int audio_format=0; // override
+ 
  #ifdef USE_DIRECTSHOW
  int allow_dshow=1;
***************
*** 410,432 ****
  int allow_dshow=0;
  #endif
! #ifdef ALSA_TIMER
! int alsa=1;
! #else
! int alsa=0;
! #endif
  int audio_id=-1;
  int video_id=-1;
  int dvdsub_id=-1;
- float default_max_pts_correction=-1;//0.01f;
- int delay_corrected=1;
- float force_fps=0;
- int force_srate=0;
- float audio_delay=0;
- float initial_pts_delay=0;
  int vcd_track=0;
! #ifdef VCD_CACHE
! int vcd_cache_size=128;
! #endif
  int index_mode=-1;  // -1=untouched  0=don't use index  1=use (geneate) index
  #ifdef AVI_SYNC_BPS
  int pts_from_bps=1;
--- 405,426 ----
  int allow_dshow=0;
  #endif
! 
! //#ifdef ALSA_TIMER
! //int alsa=1;
! //#else
! //int alsa=0;
! //#endif
! 
! // streaming:
  int audio_id=-1;
  int video_id=-1;
  int dvdsub_id=-1;
  int vcd_track=0;
! char *stream_dump_name=NULL;
! int stream_dump_type=0;
  int index_mode=-1;  // -1=untouched  0=don't use index  1=use (geneate) index
+ int force_ni=0;
+ 
+ float default_max_pts_correction=-1;//0.01f;
  #ifdef AVI_SYNC_BPS
  int pts_from_bps=1;
***************
*** 434,439 ****
  int pts_from_bps=0;
  #endif
  int frame_dropping=0; // option  0=no drop  1= drop vo  2= drop decode
! char* title="MPlayer";
  // screen info:
  char* video_driver=NULL; //"mga"; // default
--- 428,437 ----
  int pts_from_bps=0;
  #endif
+ 
+ float force_fps=0;
+ int force_srate=0;
+ float audio_delay=0;
  int frame_dropping=0; // option  0=no drop  1= drop vo  2= drop decode
! 
  // screen info:
  char* video_driver=NULL; //"mga"; // default
***************
*** 446,455 ****
  int screen_size_y=0;//SCREEN_SIZE_Y;
  int screen_size_xy=0;
! // movie info:
! int out_fmt=0;
! char *dsp=NULL;
! int force_ni=0;
! char *conffile;
! int conffile_fd;
  char *font_name=NULL;
  float font_factor=0.75;
--- 444,449 ----
  int screen_size_y=0;//SCREEN_SIZE_Y;
  int screen_size_xy=0;
! 
! // sub:
  char *font_name=NULL;
  float font_factor=0.75;
***************
*** 458,472 ****
  float sub_fps=0;
  int   sub_auto = 1;
- char *stream_dump_name=NULL;
- int stream_dump_type=0;
- //int user_bpp=0;
- 
- int osd_visible=100;
- int osd_function=OSD_PLAY;
- int osd_last_pts=-303;
- 
- float a_frame=0;    // Audio
  
! float rel_seek_secs=0;
  
  #include "mixer.h"
--- 452,457 ----
  float sub_fps=0;
  int   sub_auto = 1;
  
! char *dsp=NULL;
  
  #include "mixer.h"
***************
*** 475,478 ****
--- 460,465 ----
  void parse_cfgfiles( void )
  {
+ char *conffile;
+ int conffile_fd;
  if (parse_config_file(conf, "/etc/mplayer.conf") < 0)
    exit(1);
***************
*** 503,506 ****
--- 490,519 ----
  #endif
  
+ char* filename=NULL; //"MI2-Trailer.avi";
+ stream_t* stream=NULL;
+ int file_format=DEMUXER_TYPE_UNKNOWN;
+ //
+ int delay_corrected=1;
+ float initial_pts_delay=0;
+ #ifdef VCD_CACHE
+ int vcd_cache_size=128;
+ #endif
+ char* title="MPlayer";
+ 
+ // movie info:
+ int out_fmt=0;
+ //int user_bpp=0;
+ 
+ int osd_visible=100;
+ int osd_function=OSD_PLAY;
+ int osd_last_pts=-303;
+ 
+ float a_frame=0;    // Audio
+ 
+ float rel_seek_secs=0;
+ 
+ int i;
+ int f; // filedes
+ 
    printf("%s",banner_text);
  
***************
*** 1472,1476 ****
    d_audio->id=-2;         // do not read audio chunks
    if(sh_audio) if(sh_audio->a_buffer) free(sh_audio->a_buffer);
!   alsa=1;
    // fake, required for timer:
  #if 1
--- 1485,1489 ----
    d_audio->id=-2;         // do not read audio chunks
    if(sh_audio) if(sh_audio->a_buffer) free(sh_audio->a_buffer);
!   //alsa=1;
    // fake, required for timer:
  #if 1
***************
*** 2127,2130 ****
--- 2140,2144 ----
            if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
        }
+       num_frames=d_video->pack_no;
        avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
  


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog