Use ffmpeg by default since it seems to work if we use pause correctly.

diff --git a/debian/control b/debian/control
index 7e6540dcc0bafb579b7e16c057bdc2b889a45807..2c82145bffac696719c22fecc559147e3c7a2cc0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: webdvd
 Architecture: any
-Depends: xvfb, xfonts-base, dvdauthor, mjpegtools, netpbm, ${shlibs:Depends}, ${mozilla:Depends}
+Depends: xvfb, xfonts-base, dvdauthor, ffmpeg | mjpegtools, netpbm, ${shlibs:Depends}, ${mozilla:Depends}
 Recommends: mkisofs
 Description: Converts HTML pages into DVD menus.
  WebDVD is intended to provide a simple way of producing DVDs with

diff --git a/webdvd.cpp b/webdvd.cpp
index 5b9afe042a412d2dbee489f426e79ffc999f5483..f8e44005f204f24bcd80a7196e126dad7ff97c6b 100644 (file)
--- 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