Merge pull request #730 by @JohnyMoSwag

Support for Worldstarhiphop.com

diff --cc test/tests.json
index 929d454ffa115582d85053a04034a27d03096246,4190c53870fc105fa6b8d347b14162249d3a8aa6..0c94c65bdee2d77cd3a2ffadb0b403444ba1d8e2
--- 1/test/tests.json
--- 2/test/tests.json
+++ b/test/tests.json
@@@ -294,30 -294,13 +294,39 @@@
          "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"
 +    }
 +  },
 +  {
 +    "name": "LiveLeak",
 +    "md5":  "0813c2430bea7a46bf13acf3406992f4",
 +    "url":  "http://www.liveleak.com/view?i=757_1364311680",
 +    "file":  "757_1364311680.mp4",
 +    "info_dict": {
 +        "title": "Most unlucky car accident",
 +        "description": "extremely bad day for this guy..!",
 +        "uploader": "ljfriel2"
 +    }
++  },
+   {
+     "name": "WorldStarHipHop",
+     "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO",
+     "file": "wshh6a7q1ny0G34ZwuIO.mp4",
+     "md5": "9d04de741161603bf7071bbf4e883186",
+     "info_dict": {
+         "title": "Video: KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick! "
+     }
    }
  ]

diff --cc youtube_dl/InfoExtractors.py
Simple merge