Merge branch 'master' of http://10.200.0.3/GIT/videosite

diff --git a/videosite/YouTubeGrabber.pm b/videosite/YouTubeGrabber.pm
index d333912..a7ed395 100644 (file)
--- a/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@ -35,6 +35,7 @@ my %videoformats = (
     22 => 'MP4/H264/AAC/720p',      # isommp42, High
     34 => 'FLV/H264/AAC/360p',      # Main
     35 => 'FLV/H264/AAC/480p',      # Main
+    36 => '3GP/MPEG4-Visual/240p',
     37 => 'MP4/H264/AAC/1080p',     # High
     38 => 'MP4/H264/AAC/3072p',     # High
     43 => 'WebM/VP8/Vorbis/360p',