X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Ftool%2Fmain.cpp;h=c5874967f820c5a84fced39ff05affc4c797adcd;hb=996a9b11c8fdb587000df35cf7c6feae46657cab;hp=03d9a08615f44035dc3c88bb519369e0dbbce6b1;hpb=68bdea3d84e667ac52a04f5cafa09152b38136d2;p=synfig.git 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.",