diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-08-27 02:00:23 +0200 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-08-27 02:00:23 +0200 | 
| commit | 65883c8dbdb0241c42a18f0502b0d5103cff72bc (patch) | |
| tree | 4da7ca0d3a725e13f7d592375dd9a7d7c0c3656a | |
| parent | 341ca8d74c8f090bd696111353400f0cef2ba9bc (diff) | |
| parent | 1b01e2b085987b06bd7b360d779a6cb537d4752c (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | youtube_dl/extractor/c56.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/dailymotion.py | 2 | 
2 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/c56.py b/youtube_dl/extractor/c56.py index 4c8a8af09..dc3a8d47d 100644 --- a/youtube_dl/extractor/c56.py +++ b/youtube_dl/extractor/c56.py @@ -12,8 +12,8 @@ class C56IE(InfoExtractor):      _TEST ={          u'url': u'http://www.56.com/u39/v_OTM0NDA3MTY.html', -        u'file': u'93440716.mp4', -        u'md5': u'9dc07b5c8e978112a6441f9e75d2b59e', +        u'file': u'93440716.flv', +        u'md5': u'e59995ac63d0457783ea05f93f12a866',          u'info_dict': {              u'title': u'网事知多少 第32期:车怒',          }, diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index fa8c630d0..1ea449ca8 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -21,7 +21,7 @@ class DailymotionIE(InfoExtractor):          u'file': u'x33vw9.mp4',          u'md5': u'392c4b85a60a90dc4792da41ce3144eb',          u'info_dict': { -            u"uploader": u"Alex and Van .",  +            u"uploader": u"Amphora Alex and Van .",               u"title": u"Tutoriel de Youtubeur\"DL DES VIDEO DE YOUTUBE\""          }      }  | 
