Merge 'jaimeMF/videoconversion' (sans actual option for now)

diff --git a/LATEST_VERSION b/LATEST_VERSION
index 275de03d947758f5c9b002a6c63c1d4576dacd90..a334573b600a9e84f9f1b4bd79b3e6c1125c8605 100644 (file)
--- 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 4f87eeb3927ef72be525e616e4ac0cd8082aa96b..a992ccc1b9832e25333dbe6681061cccea51bcb9 100755 (executable)
--- 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 0d9053db326383ccb7edf9b38fcb2a03e06876a9..95add9eb1102d669983f6647adc6ffb9d7ad58d9 100644 (file)
--- 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: