Mercurial > mplayer.hg
diff cfg-mencoder.h @ 17354:60189cd9bbc8
added support for external libavformat
author | nicodvb |
---|---|
date | Mon, 09 Jan 2006 19:35:44 +0000 |
parents | 956c693fdc80 |
children | 5963b50c2178 |
line wrap: on
line diff
--- a/cfg-mencoder.h Mon Jan 09 15:44:15 2006 +0000 +++ b/cfg-mencoder.h Mon Jan 09 19:35:44 2006 +0000 @@ -55,7 +55,7 @@ extern m_option_t nuvopts_conf[]; extern m_option_t mpegopts_conf[]; -#ifdef USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) extern m_option_t lavfopts_conf[]; #endif @@ -177,7 +177,7 @@ 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 USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) {"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}, @@ -185,7 +185,7 @@ {"help", "\nAvailable output formats:\n" " avi - Microsoft Audio/Video Interleaved\n" " mpeg - MPEG-1/2 system stream format\n" -#ifdef USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) " lavf - FFmpeg libavformat muxers\n" #endif " rawvideo - (video only, one stream only) raw stream, no muxing\n" @@ -298,7 +298,7 @@ {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#ifdef USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif