diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-09 19:35:44 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-09 19:35:44 +0000 |
| commit | ad978de549f9d227326f54b1e8903f8c270d7e94 (patch) | |
| tree | 33b7af57b7a2b54b06557e2888fdd641e1e612fc /cfg-mencoder.h | |
| parent | 0355c449220c676542d1cdf5ace47a57d0c59fe9 (diff) | |
| download | mpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.bz2 mpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.xz | |
added support for external libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index fa51288305..b18e904e1e 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -55,7 +55,7 @@ extern m_option_t x264encopts_conf[]; 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 info_conf[]={ 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 @@ m_option_t of_conf[]={ {"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 @@ m_option_t mencoder_opts[]={ {"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 |