[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit d84024d0957bafaa723b10065d270d70565c7987
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Aug 12 17:31:36 2007 +1000

    Fix for ffmpeg options and mktemp in ppm2mpeg
    
    Newer ffmpeg versions seem to have stricter syntax for the bitrate.
    
    Also mktemp does not seem to accept the "-t" option on all systems.
    
    darcs-hash:20070812073136-d4795-a2c47601f2c4a75688a8d21c00ebdee4a0737f43.gz

diff --git a/tools/ppm2mpeg b/tools/ppm2mpeg
index b603587..6e47045 100755
--- a/tools/ppm2mpeg
+++ b/tools/ppm2mpeg
@@ -5,13 +5,18 @@ if test -z "`which ffmpeg`"; then
     exit 1
 fi
 
-command="ffmpeg -f image2pipe -vcodec ppm -i - -vcodec mpeg1video -b 1800 -f mpeg1video"
+command="ffmpeg -f image2pipe -vcodec ppm -i - -vcodec mpeg1video -b 1800K -f mpeg1video"
 while test $# -gt 0; do
     command="$command $1"
     shift
 done
 
-log=`mktemp -t ppm2mpeg.XXXXXX`
+if test -d "$TMPDIR" ; then
+  log=`mktemp $TMPDIR/ppm2mpeg.XXXXXX`
+else
+  log=`mktemp /tmp/ppm2mpeg.XXXXXX`
+fi
+
 if $command - 2> $log; then :
 else
     cat $log > /dev/stderr

-- 
Gerris Flow Solver