Merge pull request #211 from techtonik/patch-1

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index fb66d64af061b11dd84dee9ba4042b008499f0a5..1475a203f6958b8770983461c0656836a94f816f 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -2549,7 +2549,7 @@ class YoutubeUserIE(InfoExtractor):
        _TEMPLATE_URL = 'http://gdata.youtube.com/feeds/api/users/%s'
        _GDATA_PAGE_SIZE = 50
        _GDATA_URL = 'http://gdata.youtube.com/feeds/api/users/%s/uploads?max-results=%d&start-index=%d'
-       _VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+       _VIDEO_INDICATOR = r'/watch\?v=(.+?)[\<&]'
        _youtube_ie = None
        IE_NAME = u'youtube:user'