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

[legatvs]

The following commit has been merged in the master branch:
commit a6b79e63f257e43d21c2c6fc5e443d2067d094bb
Author: legatvs <legatvs at gmail.com>
Date:   Fri Mar 20 22:50:36 2009 +0200

    config: add support for output:format.

diff --git a/CHANGES b/CHANGES
index afc499f..7847936 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
 Version 2.1.8
 
  User-visible changes:
+  * Config file: add support for [output]:format (--format)
   * Port dailymotion support from cclive
 
  Developer-visible changes:
+  * Touch configrc
   * Add tests/dmotion.url
 
 
diff --git a/clive b/clive
index 9389e56..8dbb110 100755
--- a/clive
+++ b/clive
@@ -98,6 +98,7 @@ my $c = Config::Tiny->read($CONFIGFILE);
     proxy       => $c->{http}->{proxy},
     maxspeed    => $c->{http}->{maxspeed},
     minspeed    => $c->{http}->{minspeed},
+    format      => $c->{output}->{format},
     savedir     => $c->{output}->{savedir},
     cclass      => $c->{output}->{cclass},
     fnfmt       => $c->{output}->{file},
@@ -111,7 +112,7 @@ my $c = Config::Tiny->read($CONFIGFILE);
 
 $opts{clivepass}    = $ENV{CLIVEPASS_PATH} unless $opts{clivepass};
 $opts{progress}     = 'bar' unless $opts{progress};
-$opts{format}       = 'flv';
+$opts{format}       = $opts{format} || 'flv';
 $opts{extract}      = 1;
 $opts{login}        = 1;
 $opts{case}         = 1;
diff --git a/configrc b/configrc
index 335a887..607921e 100644
--- a/configrc
+++ b/configrc
@@ -13,6 +13,9 @@
     #proxy = http://foo:1234
 
 [output]
+    ## Download video format. See the manual page for available formats.
+    #format = mp4
+
     ## Save videos to directory (default: cwd).
     #savedir = /home/user/videos
 

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