aboutsummaryrefslogtreecommitdiff
path: root/test/tests.json
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaimemf93@gmail.com>2013-03-28 13:02:04 +0100
committerJaime Marquínez Ferrándiz <jaimemf93@gmail.com>2013-03-28 13:20:33 +0100
commitcfa90f4adce8b5e7faf92d0a08abe38630b150b8 (patch)
treec01bf55de811875af39e21024572d1e83bcb5c21 /test/tests.json
parenta0d6fe7b924697c089ed7ae37df0ca590ac38a96 (diff)
parentf10b2a9c14db686e7f9b7d050f41b26d5cc35e01 (diff)
Merge branch 'master' into extract_info_rewrite
Diffstat (limited to 'test/tests.json')
-rw-r--r--test/tests.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/test/tests.json b/test/tests.json
index 7af3c2892..fd9d33332 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -293,5 +293,20 @@
"info_dict": {
"title": "Absolute Mehrheit vom 17.02.2013 - Die Highlights, Teil 2"
}
+ },
+ {
+ "name": "Generic",
+ "url": "http://www.hodiho.fr/2013/02/regis-plante-sa-jeep.html",
+ "file": "13601338388002.mp4",
+ "md5": "85b90ccc9d73b4acd9138d3af4c27f89"
+ },
+ {
+ "name": "Spiegel",
+ "url": "http://www.spiegel.de/video/vulkan-tungurahua-in-ecuador-ist-wieder-aktiv-video-1259285.html",
+ "file": "1259285.mp4",
+ "md5": "2c2754212136f35fb4b19767d242f66e",
+ "info_dict": {
+ "title": "Vulkanausbruch in Ecuador: Der \"Feuerschlund\" ist wieder aktiv"
+ }
}
]