X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-getimage-video;h=4dc449ff53fe52c5088cec86d68b9d2690312554;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=d79bc47c8bd6b7d477f73c74756452d8d758ef74;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33;p=xscreensaver

diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index d79bc47c..4dc449ff 100755
--- a/driver/xscreensaver-getimage-video
+++ b/driver/xscreensaver-getimage-video
@@ -29,7 +29,7 @@ use diagnostics;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.4 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.6 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $verbose = 0;
 
@@ -44,7 +44,7 @@ my $verbose = 0;
 my $tmpdir = $ENV{TMPDIR};
 $tmpdir = "/tmp" unless $tmpdir;
 
-my $tmpfile = "$tmpdir/xssgv.$$";
+my $tmpfile = "$tmpdir/xssgv.$$.ppm";
 
 # this crap is because "vidtomem" can only write to a file, and uses
 # a stupid, non-overridable file name format.
@@ -52,12 +52,12 @@ my $sgi_bogosity = "$tmpfile-00000.rgb";
 
 my @programs = (
 
-  "bttvgrab -d q -Q -l 1 -o jpg -f $tmpfile",	# BTTV
+  "bttvgrab -d q -Q -l 1 -o ppm -f $tmpfile",	# BTTV
   "qcam > $tmpfile",				# Connectix Qcam
-  "streamer -o $tmpfile",			# XawTV
+  "streamer -s 768x576 -o $tmpfile",		# XawTV
   "atitv snap $tmpfile",			# ATI video capture card
 
-  "vidtomem -f $tmpfile 2>- && mv $sgi_bogosity $tmpfile",  # Silicon Graphics
+  "vidtomem -f $tmpfile 2>&- && mv $sgi_bogosity $tmpfile",  # Silicon Graphics
 );