X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=videolink.cpp;h=1d473fac03fd102630ac1ff289c8dd58a4e83f1f;hp=cec4eccad2e8dfe5d11e3ddfe1cc5cdbcf8c7937;hb=08d62241a742a68cde7cce7ffb7de7ffa62e538c;hpb=750c7218b1b782c996379078714cec299050047f

diff --git a/videolink.cpp b/videolink.cpp
index cec4ecc..1d473fa 100644
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -762,7 +762,7 @@ namespace
 	    "Usage: " << command_name << " [gtk-options] [--preview]\n"
 	    "           [--video-std {525|525/60|NTSC|ntsc"
 	    " | 625|625/50|PAL|pal}]\n"
-	    "           [--encoder {mjpegtools|mjpegtools-old}]\n"
+	    "           [--encoder {ffmpeg|mjpegtools}]\n"
 	    "           menu-url [output-dir]\n";
     }
     
@@ -913,14 +913,9 @@ int main(int argc, char ** argv)
 		{
 		    encoder = dvd_generator::mpeg_encoder_ffmpeg;
 		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools-old") == 0)
+		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0)
 		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_old;
-		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0
-			 || std::strcmp(argv[argi + 1], "mjpegtools-new") == 0)
-		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_new;
+		    encoder = dvd_generator::mpeg_encoder_mjpegtools;
 		}
 		else
 		{