r149 - tarballs unstable/mkvtoolnix/debian
unstable/mkvtoolnix/debian/patches
zorglub at alioth.debian.org
zorglub at alioth.debian.org
Wed Mar 14 14:22:19 CET 2007
Author: zorglub
Date: 2007-01-28 11:55:01 +0000 (Sun, 28 Jan 2007)
New Revision: 149
Added:
tarballs/mkvtoolnix_2.0.0.orig.tar.gz
unstable/mkvtoolnix/debian/patches/10-manpage-error
unstable/mkvtoolnix/debian/patches/20-honor-strip
unstable/mkvtoolnix/debian/patches/30-mplayer-options
Removed:
tarballs/mkvtoolnix_1.7.0.orig.tar.gz
tarballs/mkvtoolnix_1.8.0.orig.tar.gz
unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
unstable/mkvtoolnix/debian/patches/20-honor-strip.diff
unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff
Modified:
unstable/mkvtoolnix/debian/changelog
unstable/mkvtoolnix/debian/patches/series
Log:
mkvtoolnix 2.0.0 to experimental
Deleted: tarballs/mkvtoolnix_1.7.0.orig.tar.gz
===================================================================
(Binary files differ)
Deleted: tarballs/mkvtoolnix_1.8.0.orig.tar.gz
===================================================================
(Binary files differ)
Added: tarballs/mkvtoolnix_2.0.0.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/mkvtoolnix_2.0.0.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/mkvtoolnix/debian/changelog
===================================================================
--- unstable/mkvtoolnix/debian/changelog 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/changelog 2007-01-28 11:55:01 UTC (rev 149)
@@ -1,3 +1,11 @@
+mkvtoolnix (2.0.0-1) experimental; urgency=low
+
+ * New upstream version (Closes:#408744)
+ - Remove 30-fix-segfault patch, fixed upstream
+ * Fix a deprecated option in README (Closes:#401500)
+
+ -- Clément Stenac <zorglub at debian.org> Sun, 28 Jan 2007 11:18:27 +0200
+
mkvtoolnix (1.8.0-1) unstable; urgency=low
* New upstream version
Added: unstable/mkvtoolnix/debian/patches/10-manpage-error
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-manpage-error 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error 2007-01-28 11:55:01 UTC (rev 149)
@@ -0,0 +1,13 @@
+--- mkvtoolnix-1.8.0.orig/doc/mkvmerge.1 2006-11-12 11:32:16.000000000 +0100
++++ mkvtoolnix-1.8.0/doc/mkvmerge.1 2006-11-12 11:32:18.000000000 +0100
+@@ -218,8 +218,8 @@
+ MIME type of the following attachment. Applies to the next
+ \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command.
+ A list of officially recognized MIME types can be found e.g. at
+-.UR ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
+-<ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types>
++.UR ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types
++<ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types>
+ The MIME type is mandatory for an attachment.
+ .TP
+ \fB\-\-attachment\-name\fR <\fIname\fR>
Deleted: unstable/mkvtoolnix/debian/patches/10-manpage-error.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/10-manpage-error.diff 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/10-manpage-error.diff 2007-01-28 11:55:01 UTC (rev 149)
@@ -1,23 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Patch for a formatting problem in the manpage
-
-
-. debian/patches/00template
-
- at DPATCH@
-Index: mkvtoolnix-1.8.0/doc/mkvmerge.1
-===================================================================
---- mkvtoolnix-1.8.0.orig/doc/mkvmerge.1 2006-11-12 11:32:16.000000000 +0100
-+++ mkvtoolnix-1.8.0/doc/mkvmerge.1 2006-11-12 11:32:18.000000000 +0100
-@@ -218,8 +218,8 @@
- MIME type of the following attachment. Applies to the next
- \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command.
- A list of officially recognized MIME types can be found e.g. at
--.UR ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
--<ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types>
-+.UR ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types
-+<ftp://ftp.isi.edu/in-notes/iana/assignments/ - media-types/media-types>
- The MIME type is mandatory for an attachment.
- .TP
- \fB\-\-attachment\-name\fR <\fIname\fR>
Added: unstable/mkvtoolnix/debian/patches/20-honor-strip
===================================================================
--- unstable/mkvtoolnix/debian/patches/20-honor-strip 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/20-honor-strip 2007-01-28 11:55:01 UTC (rev 149)
@@ -0,0 +1,172 @@
+Index: mkvtoolnix-2.0.0/Makefile.in
+===================================================================
+--- mkvtoolnix-2.0.0.orig/Makefile.in 2007-01-28 11:44:13.000000000 +0100
++++ mkvtoolnix-2.0.0/Makefile.in 2007-01-28 11:45:08.000000000 +0100
+@@ -55,6 +55,7 @@
+ PROFILING_CFLAGS = @PROFILING_CFLAGS@
+ PROFILING_LIBS = @PROFILING_LIBS@
+ RANLIB = @RANLIB@
++STRIP = @STRIP@
+ UIC = @UIC@
+
+ # Variable stuff as set by configure
+Index: mkvtoolnix-2.0.0/configure
+===================================================================
+--- mkvtoolnix-2.0.0.orig/configure 2007-01-28 11:45:37.000000000 +0100
++++ mkvtoolnix-2.0.0/configure 2007-01-28 11:46:31.000000000 +0100
+@@ -668,6 +668,7 @@
+ INSTALL_SCRIPT
+ INSTALL_DATA
+ RANLIB
++STRIP
+ AR
+ LD
+ GREP
+@@ -3631,6 +3632,102 @@
+ fi
+
+ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++ { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_STRIP="strip"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
++else
++ STRIP="$ac_cv_prog_STRIP"
++fi
++
++if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -10532,6 +10629,7 @@
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
+ RANLIB!$RANLIB$ac_delim
++STRIP!$STRIP$ac_delim
+ AR!$AR$ac_delim
+ LD!$LD$ac_delim
+ GREP!$GREP$ac_delim
+@@ -10573,7 +10671,6 @@
+ WXWIDGETS_LIBS!$WXWIDGETS_LIBS$ac_delim
+ USE_WXWIDGETS!$USE_WXWIDGETS$ac_delim
+ MOC!$MOC$ac_delim
+-UIC!$UIC$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -10615,6 +10712,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++UIC!$UIC$ac_delim
+ QT_CFLAGS!$QT_CFLAGS$ac_delim
+ QT_LIBS!$QT_LIBS$ac_delim
+ USE_QT!$USE_QT$ac_delim
+@@ -10626,7 +10724,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+Index: mkvtoolnix-2.0.0/configure.in
+===================================================================
+--- mkvtoolnix-2.0.0.orig/configure.in 2007-01-28 11:44:13.000000000 +0100
++++ mkvtoolnix-2.0.0/configure.in 2007-01-28 11:46:22.000000000 +0100
+@@ -19,6 +19,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+ AC_CHECK_TOOL(AR, ar, :)
+ AC_CHECK_TOOL(LD, ld, :)
+
Deleted: unstable/mkvtoolnix/debian/patches/20-honor-strip.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/20-honor-strip.diff 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/20-honor-strip.diff 2007-01-28 11:55:01 UTC (rev 149)
@@ -1,180 +0,0 @@
-Index: mkvtoolnix-1.8.0/configure.in
-===================================================================
---- mkvtoolnix-1.8.0.orig/configure.in 2006-11-12 11:32:50.000000000 +0100
-+++ mkvtoolnix-1.8.0/configure.in 2006-11-12 11:52:34.000000000 +0100
-@@ -19,7 +19,6 @@
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
- AC_CHECK_TOOL(AR, ar, :)
- AC_CHECK_TOOL(LD, ld, :)
-
-Index: mkvtoolnix-1.8.0/Makefile.in
-===================================================================
---- mkvtoolnix-1.8.0.orig/Makefile.in 2006-11-12 11:32:50.000000000 +0100
-+++ mkvtoolnix-1.8.0/Makefile.in 2006-11-12 11:52:34.000000000 +0100
-@@ -45,7 +45,6 @@
- PROFILING_CFLAGS = @PROFILING_CFLAGS@
- PROFILING_LIBS = @PROFILING_LIBS@
- RANLIB = @RANLIB@
--STRIP = @STRIP@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -151,7 +150,6 @@
- f=`echo "$$p1" | sed 's,^.*/,,;s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
-- $(STRIP) $(DESTDIR)$(bindir)/$$f; \
- else :; fi; \
- done
-
-Index: mkvtoolnix-1.8.0/configure
-===================================================================
---- mkvtoolnix-1.8.0.orig/configure 2006-11-12 11:53:12.000000000 +0100
-+++ mkvtoolnix-1.8.0/configure 2006-11-12 11:53:16.000000000 +0100
-@@ -653,7 +653,6 @@
- INSTALL_SCRIPT
- INSTALL_DATA
- RANLIB
--STRIP
- AR
- LD
- GREP
-@@ -3787,102 +3786,6 @@
- fi
-
- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$STRIP"; then
-- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--STRIP=$ac_cv_prog_STRIP
--if test -n "$STRIP"; then
-- { echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_prog_STRIP"; then
-- ac_ct_STRIP=$STRIP
-- # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_STRIP"; then
-- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_STRIP="strip"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
-- if test "x$ac_ct_STRIP" = x; then
-- STRIP=":"
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- STRIP=$ac_ct_STRIP
-- fi
--else
-- STRIP="$ac_cv_prog_STRIP"
--fi
--
--if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -11429,7 +11332,6 @@
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
- RANLIB!$RANLIB$ac_delim
--STRIP!$STRIP$ac_delim
- AR!$AR$ac_delim
- LD!$LD$ac_delim
- GREP!$GREP$ac_delim
-@@ -11471,6 +11373,7 @@
- WXWINDOWS_LIBS!$WXWINDOWS_LIBS$ac_delim
- MMG_SUBDIRS!$MMG_SUBDIRS$ac_delim
- USE_WXWINDOWS!$USE_WXWINDOWS$ac_delim
-+LIBINTL_LIBS!$LIBINTL_LIBS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -11512,7 +11415,6 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
--LIBINTL_LIBS!$LIBINTL_LIBS$ac_delim
- TRANSLATIONS_POS!$TRANSLATIONS_POS$ac_delim
- TRANSLATIONS!$TRANSLATIONS$ac_delim
- MAGIC_LIBS!$MAGIC_LIBS$ac_delim
-@@ -11520,7 +11422,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Deleted: unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff
===================================================================
--- unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/30-fix-attachement-segfault.diff 2007-01-28 11:55:01 UTC (rev 149)
@@ -1,19 +0,0 @@
-Index: mkv/src/merge/mkvmerge.cpp
-===================================================================
---- mkv.old/src/merge/mkvmerge.cpp (revision 3363)
-+++ mkv/src/merge/mkvmerge.cpp (revision 3364)
-@@ -1610,6 +1610,14 @@ parse_args(vector<string> args) {
- if (no_next_arg)
- mxerror(_("'%s' lacks the file name.\n"), this_arg.c_str());
-
-+ try {
-+ mm_file_io_c test(next_arg);
-+ } catch (...) {
-+ mxerror(_("The file '%s' cannot be attached because "
-+ "it does not exist or cannot be read.\n"),
-+ next_arg.c_str());
-+ }
-+
- attachment.name = next_arg;
- if (attachment.mime_type == "")
- attachment.mime_type = guess_mime_type_and_report(next_arg);
Added: unstable/mkvtoolnix/debian/patches/30-mplayer-options
===================================================================
--- unstable/mkvtoolnix/debian/patches/30-mplayer-options 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/30-mplayer-options 2007-01-28 11:55:01 UTC (rev 149)
@@ -0,0 +1,19 @@
+Index: mkvtoolnix-2.0.0/README
+===================================================================
+--- mkvtoolnix-2.0.0.orig/README 2007-01-28 11:49:08.000000000 +0100
++++ mkvtoolnix-2.0.0/README 2007-01-28 11:50:13.000000000 +0100
+@@ -140,12 +140,12 @@
+
+ mencoder -oac copy -ovc lavc \
+ -lavcopts vcodec=mpeg4:vbitrate=1000:vhq:vqmin=2:vpass=1 \
+- -vop scale=....,crop=..... \
++ -vf scale=....,crop=..... \
+ -o /dev/null dvd://1
+
+ mencoder -oac copy -ovc lavc \
+ -lavcopts vcodec=mpeg4:vbitrate=1000:vhq:vqmin=2:vpass=2 \
+- -vop scale=....,crop=..... \
++ -vf scale=....,crop=..... \
+ -o movie.avi dvd://1
+
+ f) Merge:
Modified: unstable/mkvtoolnix/debian/patches/series
===================================================================
--- unstable/mkvtoolnix/debian/patches/series 2007-01-25 01:00:19 UTC (rev 148)
+++ unstable/mkvtoolnix/debian/patches/series 2007-01-28 11:55:01 UTC (rev 149)
@@ -1,3 +1,3 @@
-10-manpage-error.diff
-20-honor-strip.diff
-30-fix-attachement-segfault.diff
+10-manpage-error
+20-honor-strip
+30-mplayer-options
More information about the Pkg-multimedia-commits
mailing list