diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-12-08 01:57:43 +0100 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-12-08 01:57:43 +0100 |
| commit | 3c6ffbaedbbae8734f6b86fea1169413b656abf3 (patch) | |
| tree | 27edbd964e1411e0228900b1c36612058cca7954 /test/tests.json | |
| parent | c7287a3cafba65b700b64633d76aa016f5cbc95d (diff) | |
| parent | 863baa16eca7a98c38fb29c5e54f76df224f2351 (diff) | |
| download | youtube-dl-3c6ffbaedbbae8734f6b86fea1169413b656abf3.tar.xz | |
Merge 'rg3/master' into fork_master
Diffstat (limited to 'test/tests.json')
| -rw-r--r-- | test/tests.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/tests.json b/test/tests.json index 731c91718..cb29f2053 100644 --- a/test/tests.json +++ b/test/tests.json @@ -16,7 +16,7 @@ "size": 5754305, "addIEs": ["Youtube"], "url": "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/", - "file": "aUehQsCQtM.flv" + "file": "_aUehQsCQtM.flv" }, { "name": "BlipTV", @@ -40,7 +40,7 @@ "name": "Soundcloud", "md5": "c1b9b9ea8bfd620b96b2628664576e1c", "url": "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy", - "file": "n6FLbx6ZzMiu.mp3" + "file": "62986583.mp3" }, { "name": "StanfordOpenClassroom", @@ -54,10 +54,16 @@ "url": "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody", "file": "" }, - { + { "name": "XNXX", "md5": "c5c67df477eb0d9b058200351448ba4c", "url": "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_", "file": "1135332.flv" + }, + { + "name": "Youku", + "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", + "file": "XNDgyMDQ2NTQw_part00.flv", + "md5": "ffe3f2e435663dc2d1eea34faeff5b5b" } -]
\ No newline at end of file +] |