From: pabs <pabs@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Fri, 23 Jun 2006 04:32:36 +0000 (+0000)
Subject: Update mod_ffmpeg for modern ffmpeg. Thanks to Luka Pravica for the diagnosis.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=51503132a4e423e260cf9297ddd7d49d4fdff85c;p=synfig.git

Update mod_ffmpeg for modern ffmpeg. Thanks to Luka Pravica for the diagnosis.


git-svn-id: http://svn.voria.com/code@181 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

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 023d8f8..3fa4076 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -65,7 +65,7 @@ ffmpeg_mptr::seek_to(int frame)
 
 		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");
 	
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 21dcfb4..b0e343c 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
@@ -123,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");