Brought documentation up to date.

[videolink.git] / webdvd.cpp

diff --git a/webdvd.cpp b/webdvd.cpp
index 5b9afe042a412d2dbee489f426e79ffc999f5483..66c70caddaa5897fe5ef864d1732b40451c73c61 100644 (file)
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadentplace.org.uk>.
+// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>
@@ -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