summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-08 07:36:32 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-08 07:36:32 +0200
commit102b240e96ea2d5a675958d8365f2feb301a7498 (patch)
treed236903897b654fa5233bf4b20a29a7695b25672
parent7001c2d994457e49b6c330319987649eadbdcb80 (diff)
downloadmpv-102b240e96ea2d5a675958d8365f2feb301a7498.tar.bz2
mpv-102b240e96ea2d5a675958d8365f2feb301a7498.tar.xz
ao_pcm: change message to mention "-novideo" instead of "-vc null"
-novideo is the right way to disable video, and should also work in more cases now that lavf is used as the default demuxer for more formats (like AVI; internal AVI demuxer fails with -novideo). Also change the man page description of -novideo a bit to make it sound less negative about the chances of the option working.
-rw-r--r--DOCS/man/en/mplayer.12
-rw-r--r--libao2/ao_pcm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 5de2a32749..60ee3b9169 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -4942,7 +4942,7 @@ Useful for benchmarking.
.TP
.B \-novideo
Do not play/\:encode video.
-In many cases this will not work, use \-vc null \-vo null instead.
+With some demuxers this may not work. In those cases you can try \-vc null \-vo null instead; but "\-vc null" is always unreliable.
.
.TP
.B \-pp <quality> (also see \-vf pp)
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index e10125fb90..64eda888f7 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -183,7 +183,7 @@ static int init(int rate,int channels,int format,int flags){
mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] File: %s (%s)\nPCM: Samplerate: %iHz Channels: %s Format %s\n", ao_outputfilename,
(ao_pcm_waveheader?"WAVE":"RAW PCM"), rate,
(channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format));
- mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] Info: Faster dumping is achieved with -vc null -vo null -ao pcm:fast\n[AO PCM] Info: To write WAVE files use -ao pcm:waveheader (default).\n");
+ mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] Info: Faster dumping is achieved with -novideo -ao pcm:fast\n[AO PCM] Info: To write WAVE files use -ao pcm:waveheader (default).\n");
fp = fopen(ao_outputfilename, "wb");
if(fp) {