From 388aa3e7fbf7d7586c998833ab53712a88c8d46a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 30 Jun 2006 23:57:29 +0000 Subject: [PATCH] Use ffmpeg by default since it seems to work if we use pause correctly. --- debian/control | 2 +- webdvd.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 7e6540d..2c82145 100644 --- 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 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 -- 2.39.2