Mercurial > mplayer.hg

changeset 5995:fa5d0ec52031

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
time to make libavcodec as default
author arpi
date Mon, 06 May 2002 12:45:02 +0000
parents dcc6dde0d168
children 73e5c3b80d8c
files mencoder.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Mon May 06 00:37:52 2002 +0000
+++ b/mencoder.c	Mon May 06 12:45:02 2002 +0000
@@ -104,17 +104,16 @@
 #endif
 
 int out_video_codec=
+#ifdef USE_LIBAVCODEC
+    VCODEC_LIBAVCODEC;
+#else
 #ifdef HAVE_DIVX4ENCORE
     VCODEC_DIVX4;
 #else
-#ifdef USE_LIBAVCODEC
-    VCODEC_LIBAVCODEC;
-#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;