X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=videolink.cpp;h=e0b71d8acc981ddf3b7aee6a2bdda2f26475ead8;hp=cec4eccad2e8dfe5d11e3ddfe1cc5cdbcf8c7937;hb=99e4995e0cc45aac43ae85fdb47650c19f115841;hpb=9d2e69a1cf5011f52ae8ec6f5a45c5ddc39ac112

diff --git a/videolink.cpp b/videolink.cpp
index cec4ecc..e0b71d8 100644
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -22,8 +22,10 @@
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
+#include "videolink.hpp"
+#include "wchar_t_short.h"
 #include <ImageErrors.h>
-#if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
+#if MOZ_VERSION_GE(1,9,0)
 #include <nsWeakPtr.h>
 /* For some reason <nsWeakPtr.h> no longer defines this */
 typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
@@ -56,6 +58,7 @@ typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
 #else
 #include <nsStringAPI.h>
 #endif
+#include "wchar_t_default.h"
 
 #include "browser_widget.hpp"
 #include "child_iterator.hpp"
@@ -762,7 +765,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 +916,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
 		{