Mercurial > mplayer.hg
comparison cfg-mencoder.h @ 8567:917130ff78bb
Three typos, two of them noticed by Arpad Biro <biro_arpad@yahoo.com>.
author | diego |
---|---|
date | Thu, 26 Dec 2002 11:33:11 +0000 |
parents | bcf1b010bf14 |
children | 186d3ee01012 |
comparison
equal
deleted
inserted
replaced
8566:97fcaed8d028 | 8567:917130ff78bb |
---|---|
74 #ifdef USE_LIBAVCODEC | 74 #ifdef USE_LIBAVCODEC |
75 " lavc - using libavcodec codecs - best quality!\n" | 75 " lavc - using libavcodec codecs - best quality!\n" |
76 #endif | 76 #endif |
77 #ifdef USE_WIN32DLL | 77 #ifdef USE_WIN32DLL |
78 " vfw - using VfW DLLs, currently only AVID is supported\n" | 78 " vfw - using VfW DLLs, currently only AVID is supported\n" |
79 " qtvideo - using Quickime DLLs, currently only SVQ1/3 are supported\n" | 79 " qtvideo - using QuickTime DLLs, currently only SVQ1/3 are supported\n" |
80 #endif | 80 #endif |
81 #ifdef HAVE_LIBDV095 | 81 #ifdef HAVE_LIBDV095 |
82 " libdv - DV encoding using libdv v0.9.5\n" | 82 " libdv - DV encoding using libdv v0.9.5\n" |
83 #endif | 83 #endif |
84 #ifdef HAVE_XVID | 84 #ifdef HAVE_XVID |
95 {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL}, | 95 {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL}, |
96 #else | 96 #else |
97 {"mp3lame", "MPlayer was compiled without libmp3lame support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 97 {"mp3lame", "MPlayer was compiled without libmp3lame support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
98 #endif | 98 #endif |
99 {"help", "\nAvailable codecs:\n" | 99 {"help", "\nAvailable codecs:\n" |
100 " copy - frame copy, without re-encoding (usefull for AC3)\n" | 100 " copy - frame copy, without re-encoding (useful for AC3)\n" |
101 " pcm - uncompressed PCM audio\n" | 101 " pcm - uncompressed PCM audio\n" |
102 #ifdef HAVE_MP3LAME | 102 #ifdef HAVE_MP3LAME |
103 " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" | 103 " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" |
104 #endif | 104 #endif |
105 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 105 "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
147 {"audio-delay", &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, | 147 {"audio-delay", &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, |
148 | 148 |
149 {"x", "This option is obsolete, use -vop scale=w:h for scaling\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 149 {"x", "This option is obsolete, use -vop scale=w:h for scaling\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
150 {"xsize", "This option is obsolete, use -vop crop=w:h:x0:y0 for cropping\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 150 {"xsize", "This option is obsolete, use -vop crop=w:h:x0:y0 for cropping\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
151 | 151 |
152 // outut audio/video codec selection | 152 // output audio/video codec selection |
153 {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 153 {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
154 {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 154 {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
155 | 155 |
156 // override FOURCC in output file | 156 // override FOURCC in output file |
157 {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL}, | 157 {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL}, |