[SCM] lives packaging branch, master, updated. debian/1.1.8-1-12-ge9f7194
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Mon Jan 11 21:43:11 UTC 2010
The following commit has been merged in the master branch:
commit e9f7194e4525a8d2d3cf0d2aee6f4b7fbd42bfe0
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Mon Jan 11 22:43:02 2010 +0100
Convert removepy.diff to quilt format.
diff --git a/debian/patches/removepy.diff b/debian/patches/removepy.diff
old mode 100755
new mode 100644
index f08d5f9..233dc89
--- a/debian/patches/removepy.diff
+++ b/debian/patches/removepy.diff
@@ -1,17 +1,34 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Description: This patch removes the py extensions from the marcos
-## encoders and updates all files that reference them to not use
-## the .py extensions. This is because the files need to be in
-## /usr/bin and it is against Debian policy to have .py extensions
-## there. dirac_encoder is also renamed to lives_dirac_encoder
-## to avoid conflicts with dirac.
-## Author: Harry Rickards <hrickards at l33tmyst.com>
-## ---
+Description: This patch removes the py extensions from the marcos
+ encoders and updates all files that reference them to not use
+ the .py extensions. This is because the files need to be in
+ /usr/bin and it is against Debian policy to have .py extensions
+ there. dirac_encoder is also renamed to lives_dirac_encoder
+ to avoid conflicts with dirac.
+Author: Harry Rickards <hrickards at l33tmyst.com>
+---
+ lives-plugins/marcos-encoders/Makefile.am | 16
+ lives-plugins/marcos-encoders/Makefile.in | 16
+ lives-plugins/marcos-encoders/avi_encoder | 825 ++++++++++++++++++++
+ lives-plugins/marcos-encoders/avi_encoder.py | 825 --------------------
+ lives-plugins/marcos-encoders/dirac_encoder.py | 843 --------------------
+ lives-plugins/marcos-encoders/gif_encoder | 651 ++++++++++++++++
+ lives-plugins/marcos-encoders/gif_encoder.py | 651 ----------------
+ lives-plugins/marcos-encoders/lives_dirac_encoder | 843 ++++++++++++++++++++
+ lives-plugins/marcos-encoders/mkv_encoder | 888 ++++++++++++++++++++++
+ lives-plugins/marcos-encoders/mkv_encoder.py | 888 ----------------------
+ lives-plugins/marcos-encoders/mng_encoder | 651 ++++++++++++++++
+ lives-plugins/marcos-encoders/mng_encoder.py | 651 ----------------
+ lives-plugins/marcos-encoders/mpeg_encoder | 886 +++++++++++++++++++++
+ lives-plugins/marcos-encoders/mpeg_encoder.py | 886 ---------------------
+ lives-plugins/marcos-encoders/ogm_encoder | 816 ++++++++++++++++++++
+ lives-plugins/marcos-encoders/ogm_encoder.py | 816 --------------------
+ lives-plugins/marcos-encoders/theora_encoder | 817 ++++++++++++++++++++
+ lives-plugins/marcos-encoders/theora_encoder.py | 817 --------------------
+ lives-plugins/plugins/encoders/multi_encoder | 60 -
+ 19 files changed, 6423 insertions(+), 6423 deletions(-)
- at DPATCH@
-diff -urNad lives~/lives-plugins/marcos-encoders/Makefile.am lives/lives-plugins/marcos-encoders/Makefile.am
---- lives~/lives-plugins/marcos-encoders/Makefile.am 2009-11-01 15:52:56.000000000 +0000
-+++ lives/lives-plugins/marcos-encoders/Makefile.am 2010-01-11 18:59:23.712235835 +0000
+--- lives.orig/lives-plugins/marcos-encoders/Makefile.am
++++ lives/lives-plugins/marcos-encoders/Makefile.am
@@ -2,14 +2,14 @@
#
@@ -35,10 +52,9 @@ diff -urNad lives~/lives-plugins/marcos-encoders/Makefile.am lives/lives-plugins
install-data-hook:
for encoder in $(marcosencoders_DATA) ; do chmod a+rx $(DESTDIR)$(marcosencodersdir)/$${encoder} ; done
-diff -urNad lives~/lives-plugins/marcos-encoders/Makefile.in lives/lives-plugins/marcos-encoders/Makefile.in
---- lives~/lives-plugins/marcos-encoders/Makefile.in 2009-12-29 00:32:15.000000000 +0000
-+++ lives/lives-plugins/marcos-encoders/Makefile.in 2010-01-11 18:59:38.448261079 +0000
-@@ -293,14 +293,14 @@
+--- lives.orig/lives-plugins/marcos-encoders/Makefile.in
++++ lives/lives-plugins/marcos-encoders/Makefile.in
+@@ -293,14 +293,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
marcosencodersdir = $(bindir)
@@ -61,9 +77,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/Makefile.in lives/lives-plugins
EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
all: all-am
-diff -urNad lives~/lives-plugins/marcos-encoders/avi_encoder lives/lives-plugins/marcos-encoders/avi_encoder
---- lives~/lives-plugins/marcos-encoders/avi_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/avi_encoder 2010-01-11 18:58:58.120234913 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/avi_encoder
@@ -0,0 +1,825 @@
+#!/usr/bin/env python
+
@@ -503,7 +518,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/avi_encoder lives/lives-plugins
+ all_vars = {}
+ all_vars.update(globals())
+ all_vars.update(locals())
-+
++
+ if audio:
+ if not quiet:
+ print 'Creating "%s"-quality mp3 file' % vtype
@@ -890,9 +905,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/avi_encoder lives/lives-plugins
+ (thanks Gabriel).
+08 Dec 2007 : 0.0.9 : added "-mc 0" and "-noskip" options.
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/avi_encoder.py lives/lives-plugins/marcos-encoders/avi_encoder.py
---- lives~/lives-plugins/marcos-encoders/avi_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/avi_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/avi_encoder.py
++++ /dev/null
@@ -1,825 +0,0 @@
-#!/usr/bin/env python
-
@@ -1719,9 +1733,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/avi_encoder.py lives/lives-plug
- (thanks Gabriel).
-08 Dec 2007 : 0.0.9 : added "-mc 0" and "-noskip" options.
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/dirac_encoder.py lives/lives-plugins/marcos-encoders/dirac_encoder.py
---- lives~/lives-plugins/marcos-encoders/dirac_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/dirac_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/dirac_encoder.py
++++ /dev/null
@@ -1,843 +0,0 @@
-#!/usr/bin/env python
-
@@ -2566,9 +2579,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/dirac_encoder.py lives/lives-pl
-28 Jun 2007 : 0.1.a15 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder lives/lives-plugins/marcos-encoders/gif_encoder
---- lives~/lives-plugins/marcos-encoders/gif_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/gif_encoder 2010-01-11 18:58:58.124234024 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/gif_encoder
@@ -0,0 +1,651 @@
+#!/usr/bin/env python
+
@@ -2663,7 +2675,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder lives/lives-plugins
+-v be verbose.
+
+-t type* type of video created.
-+ * = NOT IMPLEMENTED
++ * = NOT IMPLEMENTED
+
+-e perform some simple filtering/enhancement to improve image
+ quality. The images created by using this option will be
@@ -3167,7 +3179,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder lives/lives-plugins
+ last_frame = os.path.join(img_dir, img_pre + last_frame_num + ext)
+
+ if not quiet: print 'Found: ' + first_frame
-+
++
+ work_dir = opts.get('-w', img_dir)
+ work_dir = os.path.abspath(work_dir)
+ if not os.path.isdir(work_dir):
@@ -3221,9 +3233,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder lives/lives-plugins
+28 Jun 2007 : 0.0.6 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder.py lives/lives-plugins/marcos-encoders/gif_encoder.py
---- lives~/lives-plugins/marcos-encoders/gif_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/gif_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/gif_encoder.py
++++ /dev/null
@@ -1,651 +0,0 @@
-#!/usr/bin/env python
-
@@ -3876,9 +3887,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/gif_encoder.py lives/lives-plug
-28 Jun 2007 : 0.0.6 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/lives_dirac_encoder lives/lives-plugins/marcos-encoders/lives_dirac_encoder
---- lives~/lives-plugins/marcos-encoders/lives_dirac_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/lives_dirac_encoder 2010-01-11 18:58:58.120234913 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/lives_dirac_encoder
@@ -0,0 +1,843 @@
+#!/usr/bin/env python
+
@@ -4644,7 +4654,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/lives_dirac_encoder lives/lives
+ last_frame = os.path.join(img_dir, img_pre + last_frame_num + ext)
+
+ if not quiet: print 'Found: ' + first_frame
-+
++
+ work_dir = opts.get('-w', img_dir)
+ work_dir = os.path.abspath(work_dir)
+ if not os.path.isdir(work_dir):
@@ -4723,9 +4733,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/lives_dirac_encoder lives/lives
+28 Jun 2007 : 0.1.a15 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mkv_encoder lives/lives-plugins/marcos-encoders/mkv_encoder
---- lives~/lives-plugins/marcos-encoders/mkv_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mkv_encoder 2010-01-11 18:58:58.124234024 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/mkv_encoder
@@ -0,0 +1,888 @@
+#!/usr/bin/env python
+
@@ -5615,9 +5624,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mkv_encoder lives/lives-plugins
+28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mkv_encoder.py lives/lives-plugins/marcos-encoders/mkv_encoder.py
---- lives~/lives-plugins/marcos-encoders/mkv_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mkv_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/mkv_encoder.py
++++ /dev/null
@@ -1,888 +0,0 @@
-#!/usr/bin/env python
-
@@ -6507,9 +6515,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mkv_encoder.py lives/lives-plug
-28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder lives/lives-plugins/marcos-encoders/mng_encoder
---- lives~/lives-plugins/marcos-encoders/mng_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mng_encoder 2010-01-11 18:58:58.128234603 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/mng_encoder
@@ -0,0 +1,651 @@
+#!/usr/bin/env python
+
@@ -6604,7 +6611,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder lives/lives-plugins
+-v be verbose.
+
+-t type* type of video created.
-+ * = NOT IMPLEMENTED
++ * = NOT IMPLEMENTED
+
+-e perform some simple filtering/enhancement to improve image
+ quality. The images created by using this option will be
@@ -7108,7 +7115,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder lives/lives-plugins
+ last_frame = os.path.join(img_dir, img_pre + last_frame_num + ext)
+
+ if not quiet: print 'Found: ' + first_frame
-+
++
+ work_dir = opts.get('-w', img_dir)
+ work_dir = os.path.abspath(work_dir)
+ if not os.path.isdir(work_dir):
@@ -7162,9 +7169,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder lives/lives-plugins
+28 Jun 2007 : 0.0.6 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder.py lives/lives-plugins/marcos-encoders/mng_encoder.py
---- lives~/lives-plugins/marcos-encoders/mng_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mng_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/mng_encoder.py
++++ /dev/null
@@ -1,651 +0,0 @@
-#!/usr/bin/env python
-
@@ -7817,9 +7823,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mng_encoder.py lives/lives-plug
-28 Jun 2007 : 0.0.6 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder lives/lives-plugins/marcos-encoders/mpeg_encoder
---- lives~/lives-plugins/marcos-encoders/mpeg_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mpeg_encoder 2010-01-11 18:58:58.128234603 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/mpeg_encoder
@@ -0,0 +1,886 @@
+#!/usr/bin/env python
+
@@ -8338,9 +8343,9 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder lives/lives-plugin
+ run(command)
+ else:
+ wav = sndf
-+
++
+ if vtype in ['sdvd', 'spdvd']:
-+ command = ' '.join([sox, wav, pcmsox_opts, tmpsndf, 'resample'])
++ command = ' '.join([sox, wav, pcmsox_opts, tmpsndf, 'resample'])
+ else:
+ files = ' '.join(['-o', tmpsndf, '<', wav])
+ command = ' '.join([mp2enc, mp2enc_opts, files])
@@ -8366,7 +8371,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder lives/lives-plugin
+ command = """
+%(mplex)s %(mplex_opts)s %(mpegv)s -o "%(vidname)s" """ % all_vars
+ run(command)
-+
++
+ if os.path.exists(mpegv): os.remove(mpegv)
+
+
@@ -8707,9 +8712,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder lives/lives-plugin
+28 Jun 2007 : 0.1.8 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder.py lives/lives-plugins/marcos-encoders/mpeg_encoder.py
---- lives~/lives-plugins/marcos-encoders/mpeg_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/mpeg_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/mpeg_encoder.py
++++ /dev/null
@@ -1,886 +0,0 @@
-#!/usr/bin/env python
-
@@ -9597,9 +9601,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/mpeg_encoder.py lives/lives-plu
-28 Jun 2007 : 0.1.8 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/ogm_encoder lives/lives-plugins/marcos-encoders/ogm_encoder
---- lives~/lives-plugins/marcos-encoders/ogm_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/ogm_encoder 2010-01-11 18:58:58.132234204 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/ogm_encoder
@@ -0,0 +1,816 @@
+#!/usr/bin/env python
+
@@ -10417,9 +10420,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/ogm_encoder lives/lives-plugins
+28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/ogm_encoder.py lives/lives-plugins/marcos-encoders/ogm_encoder.py
---- lives~/lives-plugins/marcos-encoders/ogm_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/ogm_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/ogm_encoder.py
++++ /dev/null
@@ -1,816 +0,0 @@
-#!/usr/bin/env python
-
@@ -11237,9 +11239,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/ogm_encoder.py lives/lives-plug
-28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plugins/marcos-encoders/theora_encoder
---- lives~/lives-plugins/marcos-encoders/theora_encoder 1970-01-01 01:00:00.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/theora_encoder 2010-01-11 18:58:58.132234204 +0000
+--- /dev/null
++++ lives/lives-plugins/marcos-encoders/theora_encoder
@@ -0,0 +1,817 @@
+#!/usr/bin/env python
+
@@ -11267,7 +11268,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plug
+mplayer = 'mplayer'
+theora_encoder = 'encoder_example'
+theora_encoder2 = 'theora_encoder_example'
-+
++
+sox = 'sox'
+identify = 'identify'
+
@@ -11534,7 +11535,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plug
+ """
+ if b == 0: return a
+ else: return gcd(b, a%b)
-+
++
+
+def frame2pixel_aspect(size, frame_aspect):
+ pixel_den = int(frame_aspect[1])*int(size[0])
@@ -11764,7 +11765,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plug
+ if prog != theora_encoder2:
+ print prog + ': command not found'
+ raise SystemExit
-+
++
+ else:
+ if verbose:
+ print wprog + ': found'
@@ -11974,7 +11975,7 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plug
+ last_frame = os.path.join(img_dir, img_pre + last_frame_num + ext)
+
+ if not quiet: print 'Found: ' + first_frame + ' (%sx%s)' % (geom[0], geom[1])
-+
++
+ work_dir = opts.get('-w', img_dir)
+ work_dir = os.path.abspath(work_dir)
+ if not os.path.isdir(work_dir):
@@ -12058,9 +12059,8 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder lives/lives-plug
+28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
+ (thanks Gabriel).
+"""
-diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder.py lives/lives-plugins/marcos-encoders/theora_encoder.py
---- lives~/lives-plugins/marcos-encoders/theora_encoder.py 2009-10-22 15:26:20.000000000 +0100
-+++ lives/lives-plugins/marcos-encoders/theora_encoder.py 1970-01-01 01:00:00.000000000 +0100
+--- lives.orig/lives-plugins/marcos-encoders/theora_encoder.py
++++ /dev/null
@@ -1,817 +0,0 @@
-#!/usr/bin/env python
-
@@ -12879,10 +12879,9 @@ diff -urNad lives~/lives-plugins/marcos-encoders/theora_encoder.py lives/lives-p
-28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately
- (thanks Gabriel).
-"""
-diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plugins/plugins/encoders/multi_encoder
---- lives~/lives-plugins/plugins/encoders/multi_encoder 2009-10-22 15:26:13.000000000 +0100
-+++ lives/lives-plugins/plugins/encoders/multi_encoder 2010-01-11 19:00:42.511818947 +0000
-@@ -10,14 +10,14 @@
+--- lives.orig/lives-plugins/plugins/encoders/multi_encoder
++++ lives/lives-plugins/plugins/encoders/multi_encoder
+@@ -10,14 +10,14 @@ multi_encoder
LiVES plugin which uses the following encoding programs:
@@ -12905,7 +12904,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
See each *.py encoder for complete list of requirements
(you can type e.g. mpeg_encoder.py -C)
-@@ -30,14 +30,14 @@
+@@ -30,14 +30,14 @@ See my vids at http://amv.reimeika.ca !
"""
version = '0.2.11'
@@ -12928,7 +12927,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
usage = \
"""
-@@ -51,14 +51,14 @@
+@@ -51,14 +51,14 @@ SUMMARY (ver. %s):
LiVES plugin which calls one of the following programs:
@@ -12951,7 +12950,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
in order to generate movies in one of the following formats:
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
MNG (no sound)
Animated GIF (no sound)
@@ -12960,7 +12959,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
ditribution and/or available from:
http://lives.reimeika.ca/lives_guide.html
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ if __name__ == '__main__':
quiet = '-q'
tonull = '2> /dev/null'
@@ -12969,7 +12968,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
outfile, '-w', tempdir, '-a', arc, \
'-f', fpsc, quiet, '-t', \
type, '-s ./audiodump.wav', \
-@@ -525,7 +525,7 @@
+@@ -525,7 +525,7 @@ CHANGELOG:
02 Aug 2004 : 0.0.6 : added default extension to 'get_formats'.
changed 'format' to 'vformat' for clarity.
added support for 'debug' argument.
@@ -12978,7 +12977,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
(the latter HIGHLY EXPERIMENTAL).
no longer needs all encoders to work, it
will look for and offer the available
-@@ -536,10 +536,10 @@
+@@ -536,10 +536,10 @@ CHANGELOG:
Ogg Theora file extension is now .ogg.
made vblock=16 (may need to be tweaked).
26 Oct 2004 : 0.1.0 : can use arbitrary frame rate for Ogg Theora.
@@ -12991,7 +12990,7 @@ diff -urNad lives~/lives-plugins/plugins/encoders/multi_encoder lives/lives-plug
02 Nov 2004 : 0.1.4 : added xvid.
made descriptions clearer.
08 Nov 2004 : 0.1.5 : rm xvid-twopass.stats if present.
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ CHANGELOG:
fps difference threshold can be controlled
through "fpst" variable.
06 Dec 2004 : 0.2.1 : set fpst to 0.0005.
--
lives packaging
More information about the pkg-multimedia-commits
mailing list