X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=3a1646f43bb698aa767cb9eca4d5319d43ead8ff;hb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;hp=82cf7579095b7c0cdcf0c49b8ccad0e9a01b3f11;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;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 82cf757..3a1646f 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -3,16 +3,17 @@
 ** ppm Target Module
 ** $Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **
 ** === N O T E S ===========================================================
 **
@@ -59,15 +60,15 @@ ffmpeg_mptr::seek_to(int frame)
 	{
 		if(file)
 		{
-			pclose(file);	
+			pclose(file);
 		}
 
 		string command;
-	
-		command=strprintf("ffmpeg -i \"%s\" -an -f ppmpipe -\n",filename.c_str());
-	
+
+		command=strprintf("ffmpeg -i \"%s\" -an -f image2pipe -vcodec ppm -\n",filename.c_str());
+
 		file=popen(command.c_str(),"r");
-	
+
 		if(!file)
 		{
 			cerr<<"Unable to open pipe to ffmpeg"<<endl;
@@ -75,7 +76,7 @@ ffmpeg_mptr::seek_to(int frame)
 		}
 		cur_frame=-1;
 	}
-	
+
 	while(cur_frame<frame-1)
 	{
 		cerr<<"Seeking to..."<<frame<<'('<<cur_frame<<')'<<endl;
@@ -98,21 +99,21 @@ ffmpeg_mptr::grab_frame(void)
 	char cookie[2];
 	cookie[0]=fgetc(file);
 	cookie[1]=fgetc(file);
-	
+
 	if(cookie[0]!='P' || cookie[1]!='6')
 	{
 		cerr<<"stream not in PPM format \""<<cookie[0]<<cookie[1]<<'"'<<endl;
 		return false;
 	}
-	
+
 	fgetc(file);
 	fscanf(file,"%d %d\n",&w,&h);
 	fscanf(file,"%f",&divisor);
 	fgetc(file);
-			
+
 	if(feof(file))
 		return false;
-	
+
 	int x;
 	int y;
 	frame.set_wh(w,h);
@@ -138,7 +139,7 @@ ffmpeg_mptr::grab_frame(void)
 				1.0
 			);
 		}
-	cur_frame++;		
+	cur_frame++;
 	return true;
 }
 
@@ -156,7 +157,7 @@ ffmpeg_mptr::ffmpeg_mptr(const char *f)
 ffmpeg_mptr::~ffmpeg_mptr()
 {
 	if(file)
-		pclose(file);	
+		pclose(file);
 #ifdef HAVE_TERMIOS_H
 	tcsetattr(0,TCSANOW,&oldtty);
 #endif
@@ -173,7 +174,7 @@ ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallb
 		if(!grab_frame());
 			return false;
 	}
-	
+
 	surface=frame;
 	return false;
 }