[Mplayer-cvslog] CVS: main mencoder.c,1.127,1.128

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv13731

Modified Files:
	mencoder.c 
Log Message:
time to make libavcodec as default

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mencoder.c	1 May 2002 14:42:42 -0000	1.127
+++ mencoder.c	6 May 2002 12:45:02 -0000	1.128
@@ -104,17 +104,16 @@
 #endif
 
 int out_video_codec=
-#ifdef HAVE_DIVX4ENCORE
-    VCODEC_DIVX4;
-#else
 #ifdef USE_LIBAVCODEC
     VCODEC_LIBAVCODEC;
 #else
+#ifdef HAVE_DIVX4ENCORE
+    VCODEC_DIVX4;
+#else
     VCODEC_COPY;
 #endif
 #endif
 
-
 // audio stream skip/resync functions requires only for seeking.
 // (they should be implemented in the audio codec layer)
 //void skip_audio_frame(sh_audio_t *sh_audio){}
@@ -144,8 +143,6 @@
 int force_srate=0;
 
 char* out_filename="test.avi";
-char* mp3_filename=NULL;
-char* ac3_filename=NULL;
 
 char *force_fourcc=NULL;