[Mplayer-cvslog] CVS: main mplayer.c,1.34,1.35

[GEREOFFY]

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

Modified Files:
	mplayer.c 
Log Message:
lamer_protection++

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** mplayer.c	2001/03/30 10:16:54	1.34
--- mplayer.c	2001/04/01 23:01:37	1.35
***************
*** 941,945 ****
     if(verbose) if(out_fmt==IMGFMT_YUY2) printf("Using YUV/YUY2 video output format!\n");
     avi_header.our_out_buffer=NULL;
!    DS_VideoDecoder_Open(avi_header.video_codec,avi_header.vids_guid, &avi_header.bih, 0, &avi_header.our_out_buffer);
     
     if(out_fmt==IMGFMT_YUY2)
--- 941,951 ----
     if(verbose) if(out_fmt==IMGFMT_YUY2) printf("Using YUV/YUY2 video output format!\n");
     avi_header.our_out_buffer=NULL;
!    if(DS_VideoDecoder_Open(avi_header.video_codec,avi_header.vids_guid, &avi_header.bih, 0, &avi_header.our_out_buffer)){
!         printf("ERROR: Couldn't open required DirectShow codec: %s\n",avi_header.video_codec);
!         printf("Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n");
!         printf("package from:  ftp://thot.banki.hu/esp-team/linux/MPlayer/w32codec.zip  !\n");
!         printf("Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n");
!         exit(1);
!    }
     
     if(out_fmt==IMGFMT_YUY2)
***************
*** 1280,1288 ****
  
    } else {
!     printf("Could not load/initialize Win32/DirctShow AUDIO codec (missing .AX file?)\n");
      if((in_fmt->wFormatTag)==0x55){
        printf("Audio format is MP3 -> fallback to internal mp3lib/mpg123\n");
        has_audio=1;  // fallback to mp3lib
      } else
        has_audio=0;  // nosound
    }
--- 1286,1295 ----
  
    } else {
!     printf("ERROR: Could not load/initialize Win32/DirctShow AUDIO codec: %s\n",avi_header.audio_codec);
      if((in_fmt->wFormatTag)==0x55){
        printf("Audio format is MP3 -> fallback to internal mp3lib/mpg123\n");
        has_audio=1;  // fallback to mp3lib
      } else
+       printf("Audio disabled! Try to upgrade your w32codec.zip package!!!\n");
        has_audio=0;  // nosound
    }


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