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.
This commit is contained in:
wm4
2012-11-30 17:32:46 +01:00
parent 1085539bde
commit 358dc47314
3 changed files with 3 additions and 9 deletions

View File

@@ -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},
{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));
mp_tmsg(MSGT_AO, MSGL_INFO,
"[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");