update README to reflect the merge of #317

This commit is contained in:
Mort Yao 2014-05-21 01:41:58 +02:00
parent 359fe2beba
commit 0bd2cab7e9
2 changed files with 2 additions and 0 deletions

View File

@ -174,6 +174,7 @@ For a complete list of all available options, see:
-i | --info Display the information of videos without downloading. -i | --info Display the information of videos without downloading.
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-c | --cookies Load NetScape's cookies.txt file.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
-p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer. -p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer.
-x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading. -x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading.

View File

@ -182,6 +182,7 @@ For a complete list of all available options, see::
-i | --info Display the information of videos without downloading. -i | --info Display the information of videos without downloading.
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-c | --cookies Load NetScape's cookies.txt file.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
-p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer. -p | --player <PLAYER [options]> Directly play the video with PLAYER like vlc/smplayer.
-x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading. -x | --http-proxy <HOST:PORT> Use specific HTTP proxy for downloading.