X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Ftrgt_ffmpeg.cpp;h=b0e343cf34e963ddf1913166163919fae925c87e;hb=51503132a4e423e260cf9297ddd7d49d4fdff85c;hp=46276f64864d3d03decbdb8138576923f46a0f45;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
index 46276f6..b0e343c 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** ppm Target Module
 ** $Id: trgt_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 ===========================================================
 **
@@ -20,7 +21,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_TARGET
+#define SYNFIG_TARGET
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -40,17 +41,17 @@
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_TARGET_INIT(ffmpeg_trgt);
-SINFG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg");
-SINFG_TARGET_SET_EXT(ffmpeg_trgt,"mpg");
-SINFG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1");
-SINFG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_TARGET_INIT(ffmpeg_trgt);
+SYNFIG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg");
+SYNFIG_TARGET_SET_EXT(ffmpeg_trgt,"mpg");
+SYNFIG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1");
+SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
 
 /* === M E T H O D S ======================================================= */
 
@@ -122,7 +123,7 @@ ffmpeg_trgt::init()
 		multi_image=true;
 	string command;
 	
-	command=strprintf("ffmpeg -f imagepipe -an -r %f -i pipe: -loop -hq -title \"%s\" -y \"%s\"\n",desc.get_frame_rate(),get_canvas()->get_name().c_str(),filename.c_str());
+	command=strprintf("ffmpeg -f image2pipe -vcodec ppm -an -r %f -i pipe: -loop -hq -title \"%s\" -vcodec mpeg1video -y \"%s\"\n",desc.get_frame_rate(),get_canvas()->get_name().c_str(),filename.c_str());
 	
 	file=popen(command.c_str(),"w");
 	
@@ -130,7 +131,7 @@ ffmpeg_trgt::init()
 	
 	if(!file)
 	{
-		sinfg::error(_("Unable to open pipe to ffmpeg"));
+		synfig::error(_("Unable to open pipe to ffmpeg"));
 		return false;
 	}
 			
@@ -146,7 +147,7 @@ ffmpeg_trgt::end_frame()
 }
 
 bool
-ffmpeg_trgt::start_frame(sinfg::ProgressCallback *callback)
+ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback)
 {
 	int w=desc.get_w(),h=desc.get_h();