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

[synfig.git] / synfig-core / src / tool / main.cpp

diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp
index d889b2d..c587496 100644 (file)
--- a/synfig-core/src/tool/main.cpp
+++ b/synfig-core/src/tool/main.cpp
@@ -72,12 +72,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 +89,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.",