[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.88,1.89
Nico Sabbi CVS
syncmail at mplayerhq.hu
Tue Sep 21 21:45:53 CEST 2004
CVS change done by Nico Sabbi CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv11286
Modified Files:
cfg-mencoder.h
Log Message:
encoding to mp2 with libtoolame
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- cfg-mencoder.h 27 Aug 2004 20:43:04 -0000 1.88
+++ cfg-mencoder.h 21 Sep 2004 19:45:49 -0000 1.89
@@ -55,6 +55,10 @@
extern m_option_t lavcopts_conf[];
#endif
+#ifdef HAVE_TOOLAME
+extern m_option_t toolameopts_conf[];
+#endif
+
#ifdef USE_WIN32DLL
extern m_option_t vfwopts_conf[];
#endif
@@ -128,6 +132,11 @@
#else
{"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
+#ifdef HAVE_TOOLAME
+ {"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL},
+#else
+ {"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
{"help", "\nAvailable codecs:\n"
" copy - frame copy, without re-encoding (useful for AC3)\n"
" pcm - uncompressed PCM audio\n"
@@ -137,6 +146,9 @@
#ifdef USE_LIBAVCODEC
" lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
#endif
+#ifdef HAVE_TOOLAME
+ " toolame - Toolame MP2 audio encoder\n"
+#endif
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -241,6 +253,11 @@
#else
{"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
+#ifdef HAVE_TOOLAME
+ {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+#else
+ {"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
#ifdef USE_WIN32DLL
{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
More information about the MPlayer-cvslog
mailing list