X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=b611d97a71a950222f475a78fc2541f2afc25292;hb=d2aca39616b0757abdd4e86a8bad1946df281525;hp=83a086e1a231ed9d575c9aa9b9d6c24948341d15;hpb=e8820e6bd4a49a4ef2e48b8cba3810c6b6b9eb43;p=synfig.git

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 83a086e..b611d97 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -136,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
@@ -178,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')