[gerris] 08/13: Replace ffmpeg command by avconv.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gerris.

commit 2574e98edf03e0327eed101e1bf5218d8126fb3f
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jul 31 23:07:04 2014 +0200

    Replace ffmpeg command by avconv.
---
 debian/patches/04_replace_ffmpeg_by_avconv.patch | 91 ++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/debian/patches/04_replace_ffmpeg_by_avconv.patch b/debian/patches/04_replace_ffmpeg_by_avconv.patch
new file mode 100644
index 0000000..523992a
--- /dev/null
+++ b/debian/patches/04_replace_ffmpeg_by_avconv.patch
@@ -0,0 +1,91 @@
+Description: Replace ffmpeg command by avconv
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-07-31
+
+--- gerris-20131206-dfsg.1.orig/doc/examples/logo/logo.gfs
++++ gerris-20131206-dfsg.1/doc/examples/logo/logo.gfs
+@@ -45,7 +45,7 @@
+         min = -0.1348 max = 6.22219
+         # Only generate the movie in a small box centered on the
+ 	# origin. We also need to make sure that box size is a multiple
+-	# of 1./64. so that the PPM image size stays constant (ffmpeg
++	# of 1./64. so that the PPM image size stays constant (avconv
+ 	# crashes on variable image sizes).
+         condition = (Level < 6 || 
+                      (x >= -3./128. && x <= 3./128. && y >= -3./128. && y <= 3./128.))
+--- gerris-20131206-dfsg.1.orig/doc/examples/monai/monai.sh
++++ gerris-20131206-dfsg.1/doc/examples/monai/monai.sh
+@@ -82,11 +82,11 @@ if test ! -f experiment.mpg; then
+ fi
+ 
+ # extract individual frames and change contrast of experimental movie
+-ffmpeg -i experiment.mpg frame-%03d.png
++avconv -i experiment.mpg frame-%03d.png
+ mogrify -modulate 300,100,100 -contrast -rotate 90 -chop 0x10 -geometry x600 frame-*.png
+ 
+ # extract individual frames of simulation
+-ffmpeg -i overhead.mpg sframe-%03d.png
++avconv -i overhead.mpg sframe-%03d.png
+ 
+ # combine frames
+ for f in frame-*.png; do
+@@ -94,7 +94,7 @@ for f in frame-*.png; do
+     echo -n -e '\r'$f
+ done
+ echo ""
+-ffmpeg -r 10 -f image2 -i mframe-%03d.png -b 1800K comparison.mp4
++avconv -r 10 -f image2 -i mframe-%03d.png -b 1800K comparison.mp4
+ 
+ convert mframe-050.png eps2:comparison.eps
+ 
+--- gerris-20131206-dfsg.1.orig/tools/ppm2mpeg
++++ gerris-20131206-dfsg.1/tools/ppm2mpeg
+@@ -1,11 +1,11 @@
+ #!/bin/bash
+ 
+-if test -z "`which ffmpeg`"; then
+-    echo "ppm2mpeg: error: could not find 'ffmpeg'" > /dev/stderr
++if test -z "`which avconv`"; then
++    echo "ppm2mpeg: error: could not find 'avconv'" > /dev/stderr
+     exit 1
+ fi
+ 
+-command="ffmpeg -f image2pipe -vcodec ppm -i - -vcodec mpeg1video -b 1800K -f mpeg1video"
++command="avconv -f image2pipe -vcodec ppm -i - -vcodec mpeg1video -b 1800K -f mpeg1video"
+ while test $# -gt 0; do
+     command="$command $1"
+     shift
+--- gerris-20131206-dfsg.1.orig/tools/ppm2theora
++++ gerris-20131206-dfsg.1/tools/ppm2theora
+@@ -1,11 +1,11 @@
+ #!/bin/bash
+ 
+-if test -z "`which ffmpeg`"; then
+-    echo "ppm2theora: error: could not find 'ffmpeg'" > /dev/stderr
++if test -z "`which avconv`"; then
++    echo "ppm2theora: error: could not find 'avconv'" > /dev/stderr
+     exit 1
+ fi
+ 
+-command="ffmpeg -f image2pipe -vcodec ppm -i - -vcodec libtheora -vb 2048k -f ogg"
++command="avconv -f image2pipe -vcodec ppm -i - -vcodec libtheora -vb 2048k -f ogg"
+ while test $# -gt 0; do
+     command="$command $1"
+     shift
+--- gerris-20131206-dfsg.1.orig/tools/ppm2video
++++ gerris-20131206-dfsg.1/tools/ppm2video
+@@ -1,11 +1,11 @@
+ #!/bin/bash
+ 
+-if test -z "`which ffmpeg`"; then
+-    echo "ppm2video: error: could not find 'ffmpeg'" > /dev/stderr
++if test -z "`which avconv`"; then
++    echo "ppm2video: error: could not find 'avconv'" > /dev/stderr
+     exit 1
+ fi
+ 
+-command="ffmpeg -f image2pipe -vcodec ppm -i - -y"
++command="avconv -f image2pipe -vcodec ppm -i - -y"
+ while test $# -gt 0; do
+     command="$command $1"
+     shift

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gerris.git