diff options
| author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-25 23:56:33 +0000 |
|---|---|---|
| committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-25 23:56:33 +0000 |
| commit | c424df896cc8788bf0b66a3d2045f99a545798e9 (patch) | |
| tree | 7d9ec8a134eed7f7b05d2a831bb954b301b281ba /libmpdemux | |
| parent | 86d8896c425d66cbf447872aa67620b825c85058 (diff) | |
| download | mpv-c424df896cc8788bf0b66a3d2045f99a545798e9.tar.bz2 mpv-c424df896cc8788bf0b66a3d2045f99a545798e9.tar.xz | |
Changed the -pass option to -passwd to avoid clash with mencoder option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6571 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/network.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 5fb7cfa0b4..66c5bb7e77 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -32,7 +32,7 @@ extern int verbose; extern m_config_t *mconfig; -/* Variables for the command line option -user & -pass */ +/* Variables for the command line option -user & -passwd */ char *network_username; char *network_password; @@ -344,7 +344,7 @@ http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { int ret; if( *auth_retry==1 ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Authentication failed\n"); - mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -pass to provide your username/password for a list of URLs,\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); return -1; } @@ -381,14 +381,14 @@ http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { strcpy(url->username, username); } else { mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to read the username\n"); - mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -pass to provide your username/password for a list of URLs,\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); return -1; } - ret = m_config_is_option_set(mconfig,"pass"); + ret = m_config_is_option_set(mconfig,"passwd"); if( ret==1 ) { char *password; - password = *((char**)m_config_get_option_ptr(mconfig, "pass")); + password = *((char**)m_config_get_option_ptr(mconfig, "passwd")); if( password==NULL ) return -1; url->password = (char*)malloc(strlen(password)+1); if( url->password==NULL ) { |