[Mplayer-cvslog] CVS: main mplayer.c,1.139,1.140

[GEREOFFY]

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

Modified Files:
	mplayer.c 
Log Message:
audio_out cvs conflict fixed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -r1.139 -r1.140
*** mplayer.c	2001/06/03 00:34:15	1.139
--- mplayer.c	2001/06/03 00:41:07	1.140
***************
*** 573,580 ****
      return 0;
    }
! 
! // check audio_out
! audio_out=audio_out_drivers[0];
! if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp);
  
  // check codec.conf
--- 573,577 ----
      return 0;
    }
!   if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,dsp);
  
  // check codec.conf


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