summaryrefslogtreecommitdiffstats
path: root/cfg-mencoder.h
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-25 07:07:57 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-25 07:07:57 +0000
commit4ba968706493931a3eb559a12155dd99acdc9f2e (patch)
tree9b23e6e9e922fe383d5493a9965ce41ae7e2287e /cfg-mencoder.h
parent1164c516dbc3493467e2a5af66b6d0502fa80b3d (diff)
downloadmpv-4ba968706493931a3eb559a12155dd99acdc9f2e.tar.bz2
mpv-4ba968706493931a3eb559a12155dd99acdc9f2e.tar.xz
added faac audio encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15260 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
-rw-r--r--cfg-mencoder.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 7d120a18e1..ae42066d71 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -33,6 +33,10 @@ extern m_option_t lavcopts_conf[];
extern m_option_t toolameopts_conf[];
#endif
+#ifdef HAVE_FAAC
+extern m_option_t faacopts_conf[];
+#endif
+
#ifdef USE_WIN32DLL
extern m_option_t vfwopts_conf[];
#endif
@@ -115,6 +119,11 @@ m_option_t oac_conf[]={
#else
{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
+#ifdef HAVE_FAAC
+ {"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
+#else
+ {"faac", "MPlayer was compiled without libfaac. 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"
@@ -127,6 +136,9 @@ m_option_t oac_conf[]={
#ifdef HAVE_TOOLAME
" toolame - Toolame MP2 audio encoder\n"
#endif
+#ifdef HAVE_FAAC
+ " faac - FAAC AAC audio encoder\n"
+#endif
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -244,6 +256,11 @@ m_option_t mencoder_opts[]={
#else
{"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
+#ifdef HAVE_FAAC
+ {"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+#else
+ {"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
#ifdef USE_WIN32DLL
{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif