From: Carlos Lopez <genetita@gmail.com>
Date: Wed, 26 May 2010 15:07:48 +0000 (+0200)
Subject: Remove libxvid codec (not working) and replace the default by its real name. Update... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=996a9b11c8fdb587000df35cf7c6feae46657cab;p=synfig.git

Remove libxvid codec (not working) and replace the default by its real name. Update video MPEG-4 codec name
---

diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp
index 03d9a08..c587496 100644
--- a/synfig-core/src/tool/main.cpp
+++ b/synfig-core/src/tool/main.cpp
@@ -77,7 +77,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 +93,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.",
diff --git a/synfig-studio/src/gtkmm/dialog_targetparam.cpp b/synfig-studio/src/gtkmm/dialog_targetparam.cpp
index 14db3e6..7884ca5 100644
--- a/synfig-studio/src/gtkmm/dialog_targetparam.cpp
+++ b/synfig-studio/src/gtkmm/dialog_targetparam.cpp
@@ -53,7 +53,7 @@ using namespace studio;
  */
 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", "customvc", NULL
 };
@@ -69,11 +69,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."),
diff --git a/synfig-studio/src/gtkmm/render.cpp b/synfig-studio/src/gtkmm/render.cpp
index f976674..fa54450 100644
--- a/synfig-studio/src/gtkmm/render.cpp
+++ b/synfig-studio/src/gtkmm/render.cpp
@@ -68,7 +68,7 @@ RenderSettings::RenderSettings(Gtk::Window& parent, etl::handle<synfigapp::Canva
 	adjustment_antialias(1,1,31),
 	entry_antialias(adjustment_antialias,1,0),
 	toggle_single_frame(_("Use _current frame"), true),
-	tparam("libxvid",200)
+	tparam("mpeg4",200)
 {
 	widget_rend_desc.show();
 	widget_rend_desc.signal_changed().connect(sigc::mem_fun(*this,&studio::RenderSettings::on_rend_desc_changed));