summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-11-19 17:44:23 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-11-19 17:44:23 +0000
commit89a5e84af0c660e7d577dfc973a99a954693f8f8 (patch)
treea45467ca271ec8ac75094d2c92e536f9739b5203 /media-video/mjpegtools
parentpthreads assertion fix from upstream (diff)
downloadgentoo-2-89a5e84af0c660e7d577dfc973a99a954693f8f8.tar.gz
gentoo-2-89a5e84af0c660e7d577dfc973a99a954693f8f8.tar.bz2
gentoo-2-89a5e84af0c660e7d577dfc973a99a954693f8f8.zip
Added lost hunk to patch for Bug #137530 :).
(Portage version: 2.1.2_rc2)
Diffstat (limited to 'media-video/mjpegtools')
-rw-r--r--media-video/mjpegtools/ChangeLog6
-rw-r--r--media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch11
2 files changed, 15 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 8a186061a514..44f5ebd5f9ce 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mjpegtools
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.123 2006/11/19 17:22:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.124 2006/11/19 17:44:23 zzam Exp $
+
+ 19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+ files/mjpegtools-1.8.0-fix-lav2mpeg.patch:
+ Added lost hunk to patch for Bug #137530 :).
*mjpegtools-1.8.0-r2 (19 Nov 2006)
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
index ac8afc0b94de..14ad0855024b 100644
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
@@ -1,6 +1,15 @@
diff -ru mjpegtools-1.8.0-orig/scripts/lav2mpeg mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg
--- mjpegtools-1.8.0-orig/scripts/lav2mpeg 2006-11-19 17:11:41.000000000 +0100
-+++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg 2006-11-19 17:22:21.000000000 +0100
++++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg 2006-11-19 18:28:32.000000000 +0100
+@@ -253,7 +253,7 @@
+ esac
+ done
+ let MOPTIND=OPTIND-LAVRC_COUNT
+-shift `expr $MOPTIND-1`
++shift $((MOPTIND-1))
+
+ if [ "${QUIETLOG}" != "" ]; then
+ logfile=${QUIETLOG}
@@ -267,7 +267,8 @@
# lavinfo should set up video_frames, video_width