Remove redundant '-vcodec' option to ffmpeg which stopped working when

the MPEG-2 codec name changed.

diff --git a/ChangeLog b/ChangeLog
index ae4dd91f7daf2a63056e729dd160f9fe9ff8cfb8..9f88a4b156b4c850f76a846dc38fcc8fc48f6be0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+videolink (1.2.7) unstable; urgency=low
+
+  * Remove redundant '-vcodec' option to ffmpeg which stopped working
+    when the MPEG-2 codec name changed
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 05 Apr 2009 22:32:39 +0100
+
 videolink (1.2.6) unstable; urgency=low
 
   * Remove inclusion of Boost header and build-dependency on Boost as

diff --git a/debian/changelog b/debian/changelog
index 87400ad61ff2197dbc482111a36582169230aae6..532d3e395dfccfaef71c6e665344bd5c7271a6ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+videolink (1.2.7-1) unstable; urgency=low
+
+  * New upstream version
+    - Fixes compatibility with current ffmpeg - closes: #522572
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 05 Apr 2009 22:33:11 +0100
+
 videolink (1.2.6-1) unstable; urgency=low
 
   * New upstream version

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index 4fcad482b0d97e5f462f7debd318c5da2a460c3a..8eb5871d682d1598642abca7cf2edd43f02c5824 100644 (file)
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -252,7 +252,7 @@ void dvd_generator::generate_menu_vob(unsigned index,
            " -loop_input -i " << background_name <<
            " -t " << menu_duration_seconds(frame_params_) <<
            " -target " << frame_params_.common_name <<  "-dvd"
-           " -vcodec mpeg2video -aspect 4:3 -an -y /dev/stdout";
+           " -aspect 4:3 -an -y /dev/stdout";
     }
     else
     {