[Mplayer-cvslog] CVS: main asfheader.c,1.1.1.1,1.2 codecctrl.c,1.2,1.3 demux_asf.c,1.1.1.1,1.2 demux_avi.c,1.1.1.1,1.2 mplayer.c,1.11,1.12

GEREOFFY arpi_esp at users.sourceforge.net
Thu Mar 15 20:38:36 CET 2001


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

Modified Files:
	asfheader.c codecctrl.c demux_asf.c demux_avi.c mplayer.c 
Log Message:
small code cleanup, removed unused variables

Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/asfheader.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** asfheader.c	2001/02/24 20:28:23	1.1.1.1
--- asfheader.c	2001/03/15 19:38:34	1.2
***************
*** 88,92 ****
  int asf_check_header(){
    unsigned char asfhdrguid[16]={0x30,0x26,0xB2,0x75,0x8E,0x66,0xCF,0x11,0xA6,0xD9,0x00,0xAA,0x00,0x62,0xCE,0x6C};
-   int i;
    stream_read(demuxer->stream,(char*) &asfh,sizeof(asfh)); // header obj
  //  for(i=0;i<16;i++) printf(" %02X",temp[i]);printf("\n");
--- 88,91 ----

Index: codecctrl.c
===================================================================
RCS file: /cvsroot/mplayer/main/codecctrl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** codecctrl.c	2001/03/04 21:01:53	1.2
--- codecctrl.c	2001/03/15 19:38:34	1.3
***************
*** 137,141 ****
          
          while(1){
-           int num_frames;
            int len=0;
            int len2;
--- 137,140 ----

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_asf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** demux_asf.c	2001/02/24 20:28:32	1.1.1.1
--- demux_asf.c	2001/03/15 19:38:34	1.2
***************
*** 18,26 ****
  
  static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,int id,int seq,unsigned long time,unsigned short dur,int offs){
-   int d;
- //  int len;
-   int skip;
-   float pts=0;
-   unsigned char c=0;
    demux_stream_t *ds=NULL;
    
--- 18,21 ----
***************
*** 97,105 ****
  //     1 = successfully read a packet
  int demux_asf_fill_buffer(demuxer_t *demux){
- unsigned int id=0;
- unsigned int len;
- int skipped=0;
- int max_packs=128;
- int ret=0;
  
    demux->filepos=stream_tell(demux->stream);
--- 92,95 ----

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_avi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** demux_avi.c	2001/02/24 20:28:32	1.1.1.1
--- demux_avi.c	2001/03/15 19:38:34	1.2
***************
*** 28,36 ****
  
  static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int len,int idxpos){
-   int d;
- //  int len;
    int skip;
    float pts=0;
-   unsigned char c=0;
    demux_stream_t *ds=demux_avi_select_stream(demux,id);
    
--- 28,33 ----
***************
*** 80,84 ****
  unsigned int id=0;
  unsigned int len;
- int skipped=0;
  int max_packs=128;
  int ret=0;
--- 77,80 ----
***************
*** 162,166 ****
  unsigned int id=0;
  unsigned int len;
- int skipped=0;
  int max_packs=128;
  int ret=0;
--- 158,161 ----
***************
*** 234,238 ****
  unsigned int id=0;
  unsigned int len;
- int skipped=0;
  int ret=0;
  int *fpos=NULL;
--- 229,232 ----

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** mplayer.c	2001/03/13 02:22:47	1.11
--- mplayer.c	2001/03/15 19:38:34	1.12
***************
*** 12,15 ****
--- 12,16 ----
  #include <stdio.h>
  #include <stdlib.h>
+ #include <string.h>
  
  #include <signal.h>
***************
*** 589,593 ****
          if(force_ni || abs(a_pos-v_pos)>0x100000){  // distance > 1MB
            printf("Detected NON-INTERLEAVED AVI file-format!\n");
!           file_format=DEMUXER_TYPE_AVI_NI; // HACK!!!!
            demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
  	  pts_from_bps=1; // force BPS sync!
--- 590,594 ----
          if(force_ni || abs(a_pos-v_pos)>0x100000){  // distance > 1MB
            printf("Detected NON-INTERLEAVED AVI file-format!\n");
! //          file_format=DEMUXER_TYPE_AVI_NI; // HACK!!!!
            demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
  	  pts_from_bps=1; // force BPS sync!
***************
*** 1085,1089 ****
  
  if(has_audio==2){
!   if(file_format==DEMUXER_TYPE_AVI || file_format==DEMUXER_TYPE_AVI_NI){
      // AVI PCM Audio:
      WAVEFORMATEX *h=(WAVEFORMATEX*)&avi_header.wf_ext;
--- 1086,1090 ----
  
  if(has_audio==2){
!   if(file_format==DEMUXER_TYPE_AVI){
      // AVI PCM Audio:
      WAVEFORMATEX *h=(WAVEFORMATEX*)&avi_header.wf_ext;
***************
*** 1234,1238 ****
  //==================== START PLAYING =======================
  
! if(file_format==DEMUXER_TYPE_AVI || file_format==DEMUXER_TYPE_AVI_NI){
    a_pts=d_audio->pts-(buffer_delay+audio_delay);
    audio_delay-=(float)(avi_header.audio.dwInitialFrames-avi_header.video.dwInitialFrames)/default_fps;
--- 1235,1239 ----
  //==================== START PLAYING =======================
  
! if(file_format==DEMUXER_TYPE_AVI){
    a_pts=d_audio->pts-(buffer_delay+audio_delay);
    audio_delay-=(float)(avi_header.audio.dwInitialFrames-avi_header.video.dwInitialFrames)/default_fps;
***************
*** 1582,1586 ****
  /*================ A-V TIMESTAMP CORRECTION: =========================*/
    if(has_audio){
!     if(pts_from_bps && (file_format==DEMUXER_TYPE_AVI || file_format==DEMUXER_TYPE_AVI_NI)){
  //      a_pts=(float)ds_tell(d_audio)/((WAVEFORMATEX*)avi_header.wf_ext)->nAvgBytesPerSec-(buffer_delay+audio_delay);
        a_pts=(float)ds_tell(d_audio)/((WAVEFORMATEX*)avi_header.wf_ext)->nAvgBytesPerSec-(buffer_delay);
--- 1583,1587 ----
  /*================ A-V TIMESTAMP CORRECTION: =========================*/
    if(has_audio){
!     if(pts_from_bps && (file_format==DEMUXER_TYPE_AVI)){
  //      a_pts=(float)ds_tell(d_audio)/((WAVEFORMATEX*)avi_header.wf_ext)->nAvgBytesPerSec-(buffer_delay+audio_delay);
        a_pts=(float)ds_tell(d_audio)/((WAVEFORMATEX*)avi_header.wf_ext)->nAvgBytesPerSec-(buffer_delay);
***************
*** 1729,1733 ****
  switch(file_format){
  
-   case DEMUXER_TYPE_AVI_NI:
    case DEMUXER_TYPE_AVI: {
    //================= seek in AVI ==========================
--- 1730,1733 ----
***************
*** 1797,1801 ****
          int apos=0;
          int last=0;
-         int temp;
          int len=0;
  
--- 1797,1800 ----
***************
*** 1991,1994 ****
  //printf("\nEnd of file.\n");
  exit_player("End of file");
! }}
! 
--- 1990,1994 ----
  //printf("\nEnd of file.\n");
  exit_player("End of file");
! }
! return 1;
! }


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



More information about the MPlayer-cvslog mailing list