summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-15 04:47:32 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-15 04:47:32 +0000
commitcaf9c87669ee05ac498e06db30d2c6e7a901376c (patch)
tree17a07dc14c444c67e298cf79865f15e61d0351c7
parentb987127e0e7eb90d8a0a618035a377e92f098447 (diff)
downloadmpv-caf9c87669ee05ac498e06db30d2c6e7a901376c.tar.bz2
mpv-caf9c87669ee05ac498e06db30d2c6e7a901376c.tar.xz
-rnd --> -shuffle
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8453 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/mplayer.18
-rw-r--r--parser-mpcmd.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 246e62a4de..9dc2082756 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -281,13 +281,13 @@ Display less output and status messages.
.B \-really\-quiet \ \
Display even less output and status messages.
.TP
-.B \-rnd \ \
-Play files in random order.
-.TP
.B \-sdp
Specifies that the input file is a SDP ('Session Description Protocol')
file that describes an RTP session (see http://www.live.com/mplayer/).
.TP
+.B \-shuffle \ \
+Play files in random order.
+.TP
.B \-skin <skin\ directory> (BETA CODE)
Load skin from the given directory (WITHOUT path name).
@@ -1282,7 +1282,7 @@ setup.
.TP
.B \-noslices
Disable drawing video by 16-pixel height slices/\:bands, instead draws the
-while frame in a single run.
+whole frame in a single run.
May be faster or slower, depending on card/\:cache.
It has effect only with libmpeg2 and libavcodec codecs.
.TP
diff --git a/parser-mpcmd.c b/parser-mpcmd.c
index e5e7d065d2..03560889ef 100644
--- a/parser-mpcmd.c
+++ b/parser-mpcmd.c
@@ -224,12 +224,12 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
pt->loop = l;
tmp = 1;
}
- } else if(strcasecmp(opt,"rnd") == 0) {
+ } else if(strcasecmp(opt,"shuffle") == 0) {
if(last_entry && last_entry->child)
last_entry->flags |= PLAY_TREE_RND;
else
last_parent->flags |= PLAY_TREE_RND;
- } else if(strcasecmp(opt,"nornd") == 0) {
+ } else if(strcasecmp(opt,"noshuffle") == 0) {
if(last_entry && last_entry->child)
last_entry->flags &= ~PLAY_TREE_RND;
else