[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.9-120-g5cdb4a5

[legatvs]

The following commit has been merged in the master branch:
commit b77e27a2f99fe977853dd809ca1d6fcd508d248e
Author: legatvs <legatvs at gmail.com>
Date:   Thu Apr 2 00:07:45 2009 +0300

    Add --format=mp4_hd support.

diff --git a/CHANGES b/CHANGES
index 39cb3d4..1a72938 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ changes were made to enable using abby (0.2.0+) as a front-end for
 clive (2.1.10+).
 
  User-visible changes:
+  * Youtube HD support (--format=mp4_hd)
+    - Thanks to bf for the patch
   * Add abby (front-end) compatibility
     - Change output similar to cclive
     - http://code.google.com/p/abby/
diff --git a/clive b/clive
index d185076..4bc3b08 100755
--- a/clive
+++ b/clive
@@ -762,9 +762,10 @@ sub handle_youtube
         $xurl = "http://youtube.com/get_video?video_id=$id&t=$t";
 
         my $fmt;
-        if    ($opts{format} eq "mp4")  { $fmt = 18; }
-        elsif ($opts{format} eq "3gpp") { $fmt = 17; }
-        elsif ($opts{format} eq "xflv") { $fmt = 6; }
+        if    ($opts{format} eq "mp4")    { $fmt = 18; }
+        elsif ($opts{format} eq "mp4_hd") { $fmt = 22; }
+        elsif ($opts{format} eq "3gpp")   { $fmt = 17; }
+        elsif ($opts{format} eq "xflv")   { $fmt = 6; }
 
         $xurl .= "&fmt=$fmt"
           if $fmt;
diff --git a/clive.1 b/clive.1
index 1e0dc65..cb35e89 100644
--- a/clive.1
+++ b/clive.1
@@ -132,7 +132,7 @@
 .\" ========================================================================
 .\"
 .IX Title "clive 1"
-.TH clive 1 "2009-03-30" "2.1.10" "clive manual"
+.TH clive 1 "2009-04-01" "2.1.10" "clive manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -479,11 +479,13 @@ list below only as a rough reference of what formats should be available.
 .IP "\fBwww.last.fm\fR" 4
 .IX Item "www.last.fm"
 .PD
-Formats: (flv|mp4|3gpp|xflv)  Continue: Yes (except flv)
+Formats: (flv|mp4|mp4_hd|3gpp|xflv)  Continue: Yes (except flv)
 .Sp
-mp4 and 3gpp formats are typically, or will become later, available.
+mp4 and 3gpp formats are typically, or will soon become, available.
 xflv appears to be very rare. Videos dating back to 2006 may only be
-available as flv.
+available as flv. The high-definition mp4_hd format is currently available
+for a limited number of videos, which are usually explicitly marked as \*(L"\s-1HD\s0\*(R"
+or \*(L"720p\*(R".
 .Sp
 Some of the videos displayed on last.fm site are actually Youtube videos.
 You can pass the lastfm'ed video URLs to \fBclive\fR.
diff --git a/clive.pod b/clive.pod
index 7949eec..3ea2717 100644
--- a/clive.pod
+++ b/clive.pod
@@ -423,11 +423,13 @@ list below only as a rough reference of what formats should be available.
 
 =item B<www.last.fm>
 
-Formats: (flv|mp4|3gpp|xflv)  Continue: Yes (except flv)
+Formats: (flv|mp4|mp4_hd|3gpp|xflv)  Continue: Yes (except flv)
 
-mp4 and 3gpp formats are typically, or will become later, available.
+mp4 and 3gpp formats are typically, or will soon become, available.
 xflv appears to be very rare. Videos dating back to 2006 may only be
-available as flv.
+available as flv. The high-definition mp4_hd format is currently available
+for a limited number of videos, which are usually explicitly marked as "HD"
+or "720p".
 
 Some of the videos displayed on last.fm site are actually Youtube videos.
 You can pass the lastfm'ed video URLs to B<clive>.

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)