[Mplayer-cvslog] CVS: main mplayer.c,1.95,1.96

[Szabolcs Berecz]

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

Modified Files:
	mplayer.c 
Log Message:
warnings killed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** mplayer.c	2001/04/23 21:25:09	1.95
--- mplayer.c	2001/04/24 00:02:20	1.96
***************
*** 320,323 ****
--- 320,325 ----
  static int play_in_bg=0;
  
+ extern void avi_fixate();
+ 
  void exit_player(char* how){
    if(how) printf("\nExiting... (%s)\n",how);
***************
*** 359,362 ****
--- 361,372 ----
  int divx_quality=0;
  
+ extern int vcd_get_track_end(int fd,int track);
+ extern int init_audio(sh_audio_t *sh_audio);
+ extern int init_video_codec(sh_video_t *sh_video);
+ extern void mpeg2_allocate_image_buffers(picture_t * picture);
+ extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
+ extern int vo_init(void);
+ extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int maxlen);
+ 
  int main(int argc,char* argv[], char *envp[]){
  char* filename=NULL; //"MI2-Trailer.avi";
***************
*** 724,729 ****
    if(verbose) printf("AVI video length=%d\n",avi_bitrate);
    avi_bitrate=((float)avi_bitrate/(float)sh_video->video.dwLength)*sh_video->fps;
!   printf("VIDEO:  [%.4s]  %dx%d  %dbpp  %4.2f fps  %5.1f kbps (%4.1f kbyte/s)\n",
!     &sh_video->bih->biCompression,
      sh_video->bih->biWidth,
      sh_video->bih->biHeight,
--- 734,739 ----
    if(verbose) printf("AVI video length=%d\n",avi_bitrate);
    avi_bitrate=((float)avi_bitrate/(float)sh_video->video.dwLength)*sh_video->fps;
!   printf("VIDEO:  [%.4s]  %ldx%ld  %dbpp  %4.2f fps  %5.1f kbps (%4.1f kbyte/s)\n",
!     (char *)&sh_video->bih->biCompression,
      sh_video->bih->biWidth,
      sh_video->bih->biHeight,
***************
*** 758,763 ****
    }
    sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
!   printf("VIDEO:  [%.4s]  %dx%d  %dbpp\n",
!     &sh_video->bih->biCompression,
      sh_video->bih->biWidth,
      sh_video->bih->biHeight,
--- 768,773 ----
    }
    sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
!   printf("VIDEO:  [%.4s]  %ldx%ld  %dbpp\n",
!     (char *)&sh_video->bih->biCompression,
      sh_video->bih->biWidth,
      sh_video->bih->biHeight,
***************
*** 772,776 ****
   }
   case DEMUXER_TYPE_MPEG_PS: {
!   if(has_audio)
    if(!ds_fill_buffer(d_audio)){
      printf("MPEG: No Audio stream found...  ->nosound\n");
--- 782,786 ----
   }
   case DEMUXER_TYPE_MPEG_PS: {
!   if(has_audio) {
    if(!ds_fill_buffer(d_audio)){
      printf("MPEG: No Audio stream found...  ->nosound\n");
***************
*** 786,789 ****
--- 796,800 ----
      }
    }
+   }
    break;
   }
***************
*** 1423,1427 ****
                           sh_video->bih,   start,
                          &sh_video->o_bih, sh_video->our_out_buffer);
!       if(ret){ printf("Error decompressing frame, err=%d\n",ret);break; }
      }
      current_module="draw_frame";
--- 1434,1438 ----
                           sh_video->bih,   start,
                          &sh_video->o_bih, sh_video->our_out_buffer);
!       if(ret){ printf("Error decompressing frame, err=%d\n",(int)ret);break; }
      }
      current_module="draw_frame";


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