Check for EOF before complaining about the lack of PPM in the pipe in the ffmpeg...

[synfig.git] / synfig-core / trunk / src / modules / mod_ffmpeg / mptr_ffmpeg.cpp

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index e74f772..b611d97 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -76,6 +77,11 @@ SYNFIG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
+bool ffmpeg_mptr::is_animated()
+{
+       return true;
+}
+
 bool
 ffmpeg_mptr::seek_to(int frame)
 {
@@ -130,7 +136,7 @@ ffmpeg_mptr::seek_to(int frame)
                        execlp("ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
                        // We should never reach here unless the exec failed
                        cerr<<"Unable to open pipe to ffmpeg"<<endl;
-                       return false;
+                       _exit(1);
                } else {
                        // Parent process
                        // Close pipeout, not needed
@@ -172,6 +178,10 @@ ffmpeg_mptr::grab_frame(void)
        float divisor;
        char cookie[2];
        cookie[0]=fgetc(file);
+
+       if(feof(file))
+               return false;
+
        cookie[1]=fgetc(file);
 
        if(cookie[0]!='P' || cookie[1]!='6')
@@ -259,5 +269,5 @@ ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallb
        }
 
        surface=frame;
-       return false;
+       return true;
 }