From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 21 Mar 2014 21:14:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/generic-webpage-unescape'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=0f2a2ba14b2cbf4bd8bec0ce32f8d7c27a733c68

Merge remote-tracking branch 'dstftw/generic-webpage-unescape'

Conflicts:
	youtube_dl/extractor/generic.py
---

0f2a2ba14b2cbf4bd8bec0ce32f8d7c27a733c68
diff --cc youtube_dl/extractor/generic.py
index 2254ade90,0d02f836e..238913256
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -158,34 -143,19 +158,45 @@@ class GenericIE(InfoExtractor)
                  'ext': 'mp4',
                  'title': 'Between Two Ferns with Zach Galifianakis: President Barack Obama',
                  'description': 'Episode 18: President Barack Obama sits down with Zach Galifianakis for his most memorable interview yet.',
 +            },
 +        },
 +        # RUTV embed
 +        {
 +            'url': 'http://www.rg.ru/2014/03/15/reg-dfo/anklav-anons.html',
 +            'info_dict': {
 +                'id': '776940',
 +                'ext': 'mp4',
 +                'title': 'Охотское море стало целиком российским',
 +                'description': 'md5:5ed62483b14663e2a95ebbe115eb8f43',
 +            },
 +            'params': {
 +                # m3u8 download
 +                'skip_download': True,
 +            },
 +        },
 +        # Embedded TED video
 +        {
 +            'url': 'http://en.support.wordpress.com/videos/ted-talks/',
 +            'md5': 'deeeabcc1085eb2ba205474e7235a3d5',
 +            'info_dict': {
 +                'id': '981',
 +                'ext': 'mp4',
 +                'title': 'My web playroom',
 +                'uploader': 'Ze Frank',
 +                'description': 'md5:ddb2a40ecd6b6a147e400e535874947b',
              }
-         }
+         },
+         # nowvideo embed hidden behind percent encoding
+         {
+             'url': 'http://www.waoanime.tv/the-super-dimension-fortress-macross-episode-1/',
+             'md5': '2baf4ddd70f697d94b1c18cf796d5107',
+             'info_dict': {
+                 'id': '06e53103ca9aa',
+                 'ext': 'flv',
+                 'title': 'Macross Episode 001  Watch Macross Episode 001 onl',
+                 'description': 'No description',
+             },
 -        }
++        },
      ]
  
      def report_download_webpage(self, video_id):