From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 27 Oct 2014 00:36:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'olebowle/ard'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=f24a5a2faab20e13c3a9f752f3d41fe66212d2c6;hp=ecfe623422f61df886b83e6eae98a0e4a297802e;p=youtube-dl.git

Merge remote-tracking branch 'olebowle/ard'
---

diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py
index 8de9c11ea..630b1faa9 100644
--- a/youtube_dl/extractor/ard.py
+++ b/youtube_dl/extractor/ard.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
+from .generic import GenericIE
 from ..utils import (
     determine_ext,
     ExtractorError,
@@ -12,6 +13,7 @@ from ..utils import (
     parse_duration,
     unified_strdate,
     xpath_text,
+    parse_xml,
 )
 
 
@@ -54,6 +56,11 @@ class ARDMediathekIE(InfoExtractor):
         if '>Der gewünschte Beitrag ist nicht mehr verfügbar.<' in webpage:
             raise ExtractorError('Video %s is no longer available' % video_id, expected=True)
 
+        if re.search(r'[\?&]rss($|[=&])', url):
+            doc = parse_xml(webpage)
+            if doc.tag == 'rss':
+                return GenericIE()._extract_rss(url, video_id, doc)
+
         title = self._html_search_regex(
             [r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',
              r'<meta name="dcterms.title" content="(.*?)"/>',