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

diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp
index 03d9a08..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
@@ -77,7 +78,7 @@ bool print_benchmarks=false;
  */
 const char* allowed_video_codecs[] =
 {
-	"flv", "h263p", "huffyuv", "libtheora", "libx264", "libxvid",
+	"flv", "h263p", "huffyuv", "libtheora", "libx264",
 	"mjpeg", "mpeg1video", "mpeg2video", "mpeg4", "msmpeg4",
 	"msmpeg4v1", "msmpeg4v2", "wmv1", "wmv2", NULL
 };
@@ -93,11 +94,10 @@ const char* allowed_video_codecs_description[] =
 	"Huffyuv / HuffYUV.",
 	"libtheora Theora.",
 	"libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10.",
-	"libxvidcore MPEG-4 part 2.",
 	"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.",