Merge commit 'upstream/2011.08.04'

[youtubedl] / debian / patches / 01-prefer-open-formats.patch

diff --git a/debian/patches/01-prefer-open-formats.patch b/debian/patches/01-prefer-open-formats.patch
index 817d3d5498a5f0d3827835ad227ea9c11a69281e..289b21d6a0bb151ce1b7469d43bb7cbfa5a4713a 100644 (file)
--- a/debian/patches/01-prefer-open-formats.patch
+++ b/debian/patches/01-prefer-open-formats.patch
@@ -5,7 +5,7 @@ Last-Update: 2010-10-13
 
 --- a/youtube-dl
 +++ b/youtube-dl
 
 --- a/youtube-dl
 +++ b/youtube-dl

-@@ -863,7 +863,7 @@
+@@ -864,7 +864,7 @@

        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality