X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=webdvd.cpp;h=f8e44005f204f24bcd80a7196e126dad7ff97c6b;hp=5b9afe042a412d2dbee489f426e79ffc999f5483;hb=388aa3e7fbf7d7586c998833ab53712a88c8d46a;hpb=6afd65acff8fba3d5b98813ff040deb1261f06b2

diff --git a/webdvd.cpp b/webdvd.cpp
index 5b9afe0..f8e4400 100644
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -71,7 +71,7 @@ namespace
     // We can try using any of these encoders to convert PNG to MPEG.
     enum mpeg_encoder
     {
-	mpeg_encoder_ffmpeg,         // ffmpeg - doesn't work yet
+	mpeg_encoder_ffmpeg,         // ffmpeg
 	mpeg_encoder_mjpegtools_old, // mjpegtools before version 1.8
 	mpeg_encoder_mjpegtools_new  // mjpegtools from version 1.8
     };
@@ -884,7 +884,7 @@ int main(int argc, char ** argv)
 	bool preview_mode = false;
 	std::string menu_url;
 	std::string output_dir;
-	mpeg_encoder encoder = mpeg_encoder_mjpegtools_new;
+	mpeg_encoder encoder = mpeg_encoder_ffmpeg;
 
 	// Do initial option parsing.  We have to do this before
 	// letting Gtk parse the arguments since we may need to spawn