diff cfg-mencoder.h @ 32142:4614728cab25

build system: Merge all FFmpeg library checks into a single FFmpeg check. There is little point in assuming that some parts of FFmpeg might be available without the others. Plus, mixing and matching static and shared FFmpeg libraries was never supported.

--- a/cfg-mencoder.h	Mon Sep 13 18:09:29 2010 +0000
+++ b/cfg-mencoder.h	Mon Sep 13 18:19:25 2010 +0000
@@ -51,7 +51,7 @@
 #ifdef CONFIG_LIBLZO
     "   nuv      - nuppel video\n"
 #endif
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
     "   lavc     - libavcodec codecs - best quality!\n"
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -79,11 +79,11 @@
 #else
     {"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_MP3LAME */
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
     {"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL},
 #else
     {"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* CONFIG_LIBAVCODEC */
+#endif /* CONFIG_FFMPEG */
 #ifdef CONFIG_TOOLAME
     {"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL},
 #else
@@ -105,7 +105,7 @@
 #ifdef CONFIG_MP3LAME
     "   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
 #endif
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
     "   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
 #endif
 #ifdef CONFIG_TOOLAME
@@ -144,7 +144,7 @@
 const m_option_t of_conf[]={
     {"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
     {"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
-#ifdef CONFIG_LIBAVFORMAT
+#ifdef CONFIG_FFMPEG
     {"lavf", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_LAVF, NULL},
 #endif
     {"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL},
@@ -152,7 +152,7 @@
     {"help", "\nAvailable output formats:\n"
     "   avi      - Microsoft Audio/Video Interleaved\n"
     "   mpeg     - MPEG-1/2 system stream format\n"
-#ifdef CONFIG_LIBAVFORMAT
+#ifdef CONFIG_FFMPEG
     "   lavf     - FFmpeg libavformat muxers\n"
 #endif
     "   rawvideo - (video only, one stream only) raw stream, no muxing\n"
@@ -223,11 +223,11 @@
 #ifdef CONFIG_MP3LAME
     {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
     {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else
     {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* CONFIG_LIBAVCODEC */
+#endif /* CONFIG_FFMPEG */
 #ifdef CONFIG_TOOLAME
     {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #else
@@ -257,7 +257,7 @@
     {"nuvopts",  nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
     {"mpegopts",  mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
-#ifdef CONFIG_LIBAVFORMAT
+#ifdef CONFIG_FFMPEG
     {"lavfopts",  lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif