[Bug-gnupod] Bug fixes for gnupod.

[Brad]

gnupod is broken with FFmpeg within the last 2 years and the ImageMagick
check is broken because it returns with an error return of 1 instead of 0.


>From d9001005771fab59c8e6024f8beb5d7a62ceebcc Mon Sep 17 00:00:00 2001
From: Brad Smith <address@hidden>
Date: Mon, 30 May 2011 16:34:31 -0400
Subject: [PATCH] Fix commandline options used for modern FFmpeg and fix
 ImageMagick test within autoconf script.

---
 configure.ac               |    4 ++--
 src/gnupod_convert_FLAC.pl |    2 +-
 src/gnupod_convert_RIFF.pl |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c7811df..aa2bd99 100755
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ printf "%s\n" " done"
 
 
 printf "%s" "checking for ffmpeg with AAC support... "
-ffmpeg -formats 2>&1|egrep " aac" > /dev/null
+ffmpeg -codecs 2>&1|egrep " aac" > /dev/null
  if test $? = 0; then
   printf "%s\n" "found!"
   ENCS="mpeg4 $ENCS"
@@ -142,7 +142,7 @@ ffmpeg -formats 2>&1|egrep " aac" > /dev/null
 
 printf "%s" "checking for ImageMagick..."
 convert --version > /dev/null 2>&1
- if test $? = 0; then
+ if test $? = 1; then
   printf "%s\n" "found!"
   IMAGIC="Yes"
  else
diff --git a/src/gnupod_convert_FLAC.pl b/src/gnupod_convert_FLAC.pl
index 210ff59..e9bd83b 100644
--- a/src/gnupod_convert_FLAC.pl
+++ b/src/gnupod_convert_FLAC.pl
@@ -122,7 +122,7 @@ else {
 # Check if ffmpeg knows how to encode 'alac'
 sub check_ffmpeg_alac {
        my @alac_support = grep(/\s+DEA\s+alac/,split(/\n/,
-               `ffmpeg -formats 2> /dev/null`));
+               `ffmpeg -codecs 2> /dev/null`));
        return (defined(@alac_support));
 }
 
diff --git a/src/gnupod_convert_RIFF.pl b/src/gnupod_convert_RIFF.pl
index c4d2fbc..32a5291 100644
--- a/src/gnupod_convert_RIFF.pl
+++ b/src/gnupod_convert_RIFF.pl
@@ -45,7 +45,8 @@ elsif($gimme eq "GET_VIDEO") {
        
        my $x = system("ffmpeg", "-i", $file, "-acodec", $acodec, "-ab", 
"128k", "-vcodec", "mpeg4",
                       "-b", "1200kb", "-mbd", 2, "-flags", "+4mv+trell", 
"-aic", 2, "-cmp", 2,
-                      "-subcmp", 2, "-s", "320x240", "-r", "29.97", $tmpout);
+                      "-subcmp", 2, "-s", "320x240", "-r", "29.97", "-strict", 
"experimental",
+                      $tmpout);
        print "PATH:$tmpout\n";
 }
 else {
@@ -58,7 +59,7 @@ else {
 # still shall call it with AAC
 sub check_ffmpeg_aac {
        my @newstyle = grep(/\s+EA\s+libfaac/,split(/\n/,
-                      `ffmpeg -formats 2> /dev/null`));
+                      `ffmpeg -codecs 2> /dev/null`));
        return (defined(@newstyle) ? 'libfaac' : 'aac');
 }
 
-- 
1.7.5


-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.