From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 5 Apr 2009 22:49:46 +0000 (+0100)
Subject: Remove redundant '-vcodec' option to ffmpeg which stopped working when
X-Git-Tag: 1.2.7~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2e167b8c1f0028035d8325146792ecf0a095eb9e;p=videolink.git

Remove redundant '-vcodec' option to ffmpeg which stopped working when
the MPEG-2 codec name changed.
---

diff --git a/ChangeLog b/ChangeLog
index ae4dd91..9f88a4b 100644
--- 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 87400ad..532d3e3 100644
--- 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 4fcad48..8eb5871 100644
--- 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
     {