X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Ftool%2Fmain.cpp;h=1bd614eba807095c0f48b7f82deb58e6b02fd17e;hb=8ebc7d0e6fd68a40575572a62b373a00e6b79917;hp=e5516d4a7c023995a2e7b145be6aa4ff8386ddfd;hpb=7218ad458940ed955f32687dddeaf545276b9709;p=synfig.git diff --git a/synfig-core/src/tool/main.cpp b/synfig-core/src/tool/main.cpp index e5516d4..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,9 +78,9 @@ bool print_benchmarks=false; */ 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. @@ -89,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.",