summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authoratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-25 23:33:46 +0000
committeratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-25 23:33:46 +0000
commit86d8896c425d66cbf447872aa67620b825c85058 (patch)
tree97bd96c6e02eb88e4f163ece18242d262baf3ffa /cfg-common.h
parentc840dbe3250aa8312704483314b8f1eeb4db507e (diff)
downloadmpv-86d8896c425d66cbf447872aa67620b825c85058.tar.bz2
mpv-86d8896c425d66cbf447872aa67620b825c85058.tar.xz
10l to me and bertrand ;) Fix clash of -pass for http auth with -pass of mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6570 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 2239228d30..72b11feb38 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -41,7 +41,7 @@
#ifdef STREAMING
{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"pass", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
#else
{"user", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif