X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Ftool%2Fmain.cpp;h=1bd614eba807095c0f48b7f82deb58e6b02fd17e;hb=bb8ff7dc808b6c28275b5ba8b204e520e5d48d92;hp=d889b2d69c31b16c1e1a07cb472686d126e7a0f0;hpb=1db6ee1a490fce1008b4b22c9f48f80d4fe0fc4b;p=synfig.git

diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp
index d889b2d..1bd614e 100644
--- a/synfig-core/src/tool/main.cpp
+++ b/synfig-core/src/tool/main.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2009-2010 Diego Barrios
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -72,12 +73,14 @@ bool print_benchmarks=false;
 //! Allowed video codecs
 /*! \warning This variable is linked to allowed_video_codecs_description,
  *  if you change this you must change the other acordingly.
+ *  \warning These codecs are linked to the filename extensions for
+ *  mod_ffmpeg. If you change this you must change the others acordingly.
  */
 const char* allowed_video_codecs[] =
 {
-	"flv", "gif", "h263", "h263p", "huffyuv", "libtheora",
-	"libx264", "libxvid", "ljpeg", "mjpeg",	"mpeg1video", "mpeg2video",
-	"mpeg4", "msmpeg4",	"msmpeg4v1", "msmpeg4v2", "wmv1", "wmv2", NULL
+	"flv", "h263p", "huffyuv", "libtheora", "libx264",
+	"mjpeg", "mpeg1video", "mpeg2video", "mpeg4", "msmpeg4",
+	"msmpeg4v1", "msmpeg4v2", "wmv1", "wmv2", NULL
 };
 
 //! Allowed video codecs description.
@@ -87,18 +90,14 @@ const char* allowed_video_codecs[] =
 const char* allowed_video_codecs_description[] =
 {
 	"Flash Video (FLV) / Sorenson Spark / Sorenson H.263.",
-	"GIF (Graphics Interchange Format).",
-	"H.263 / H.263-1996.",
 	"H.263+ / H.263-1998 / H.263 version 2.",
 	"Huffyuv / HuffYUV.",
 	"libtheora Theora.",
 	"libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10.",
-	"libxvidcore MPEG-4 part 2.",
-	"Lossless JPEG.",
 	"MJPEG (Motion JPEG).",
 	"raw MPEG-1 video.",
 	"raw MPEG-2 video.",
-	"MPEG-4 part 2.",
+	"MPEG-4 part 2. (XviD/DivX)",
 	"MPEG-4 part 2 Microsoft variant version 3.",
 	"MPEG-4 part 2 Microsoft variant version 1.",
 	"MPEG-4 part 2 Microsoft variant version 2.",