diff options
| -rw-r--r-- | LATEST_VERSION | 2 | ||||
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 6 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/LATEST_VERSION b/LATEST_VERSION index 275de03d9..a334573b6 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -9999.99.99
\ No newline at end of file +2012.12.99 diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 4f87eeb39..a992ccc1b 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3699,11 +3699,11 @@ class SteamIE(InfoExtractor): } videos.append(info) return videos - + class UstreamIE(InfoExtractor): - _VALID_URL = r'http://www.ustream.tv/recorded/(?P<videoID>\d+)' + _VALID_URL = r'https?://www\.ustream\.tv/recorded/(?P<videoID>\d+)' IE_NAME = u'ustream' - + def _real_extract(self, url): m = re.match(self._VALID_URL, url) video_id = m.group('videoID') diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 0d9053db3..95add9eb1 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -278,6 +278,10 @@ def parseOpts(): def _real_main(): parser, opts, args = parseOpts() + # Update version + if opts.update_self: + update_self(fd.to_screen, opts.verbose, sys.argv[0]) + # Open appropriate CookieJar if opts.cookiefile is None: jar = compat_cookiejar.CookieJar() @@ -455,13 +459,6 @@ def _real_main(): if opts.extractaudio: fd.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, keepvideo=opts.keepvideo, nopostoverwrites=opts.nopostoverwrites)) - if opts.format: - fd.add_post_processor(FFmpegVideoConvertor(preferedformat=opts.format)) - - # Update version - if opts.update_self: - update_self(fd.to_screen, opts.verbose, sys.argv[0]) - # Maybe do nothing if len(all_urls) < 1: if not opts.update_self: |