From 90c7239412702776edb1db9ccbb5061ea403d19e Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 6 May 2002 12:45:02 +0000
Subject: time to make libavcodec as default

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5996 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mencoder.c')

diff --git a/mencoder.c b/mencoder.c
index be7b34cdd5..3efac12a0d 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -104,17 +104,16 @@ int out_audio_codec=ACODEC_PCM;
 #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 @@ static int skip_limit=-1;
 int force_srate=0;
 
 char* out_filename="test.avi";
-char* mp3_filename=NULL;
-char* ac3_filename=NULL;
 
 char *force_fourcc=NULL;
 
-- 
cgit v1.2.3