diff options
authorwm4 <wm4@nowhere>2012-11-30 17:32:46 +0100
committerwm4 <wm4@nowhere>2012-12-03 21:08:48 +0100
commit358dc473146bd1fb6dec0ab41d9a9aa58b754d90 (patch)
parent1085539bde0937dd156566b3dea957f3efbe0b29 (diff)
ao_pcm: fix references to -novideo
The option is -no-video. Remove the deprecated "fast" suboption, which did nothing and instructed the user to use "-novideo" instead. Fix a reference to -novideo in encoding.rst. Add a "generic" entry about -no-* to the list of renamed options. The change is already explicitly mentioned in the text above the table, but even if it's redundant, it makes it harder to overlook.
3 files changed, 3 insertions, 9 deletions
diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst
index a414bdf3f9..bc301cfea7 100644
--- a/DOCS/encoding.rst
+++ b/DOCS/encoding.rst
@@ -131,7 +131,7 @@ What works
* Using x264 presets/tunings/profiles (by using profile=, tune=, preset= in the
* Deinterlacing/Inverse Telecine with any of mpv's filters for that
-* Audio file converting: mpv -o outfile.mp3 infile.flac -novideo -oac
+* Audio file converting: mpv -o outfile.mp3 infile.flac -no-video -oac
libmp3lame -oacopts ab=320k
* inverse telecine filters (confirmed working: detc, pullup, filmdint)
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index eeafd537a9..c2cceddcfc 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -93,6 +93,7 @@ Command line switches
=================================== ===================================
Old New
=================================== ===================================
+ -no<opt> --no-<opt> (add a dash)
-nosound --no-audio
-use-filename-title --title="${filename}"
-loop 0 --loop=inf
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index f0fd390c8e..5b3cc94395 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -127,11 +127,9 @@ static int init(struct ao *ao, char *params)
struct priv *priv = talloc_zero(ao, struct priv);
ao->priv = priv;
- int fast = 0;
const opt_t subopts[] = {
{"waveheader", OPT_ARG_BOOL, &priv->waveheader, NULL},
{"file", OPT_ARG_MSTRZ, &priv->outputfilename, NULL},
- {"fast", OPT_ARG_BOOL, &fast, NULL},
// set defaults
@@ -140,11 +138,6 @@ static int init(struct ao *ao, char *params)
if (subopt_parse(params, subopts) != 0)
return -1;
- if (fast)
- mp_msg(MSGT_AO, MSGL_WARN,
- "[AO PCM] Suboption \"fast\" is deprecated.\n"
- "[AO PCM] Use -novideo, or -benchmark if you want "
- "faster playback with video.\n");
if (!priv->outputfilename)
priv->outputfilename =
strdup(priv->waveheader ? "audiodump.wav" : "audiodump.pcm");
@@ -175,7 +168,7 @@ static int init(struct ao *ao, char *params)
priv->waveheader ? "WAVE" : "RAW PCM", ao->samplerate,
ao->channels, af_fmt2str_short(ao->format));
- "[AO PCM] Info: Faster dumping is achieved with -novideo\n"
+ "[AO PCM] Info: Faster dumping is achieved with -no-video\n"
"[AO PCM] Info: To write WAVE files use -ao pcm:waveheader (default).\n");
priv->fp = fopen(priv->outputfilename, "wb");