add mjpegtools
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2890 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig 2009-05-27 01:31:46.000000000 -0700
|
||||
+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.000000000 -0700
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
bool LPCMStream::Probe(IBitStream &bs )
|
||||
{
|
||||
- char *last_dot = strrchr( bs.StreamName(), '.' );
|
||||
+ const char *last_dot = strrchr( bs.StreamName(), '.' );
|
||||
return
|
||||
last_dot != NULL
|
||||
&& strcmp( last_dot+1, "lpcm") == 0;
|
||||
24
media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
Normal file
24
media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
|
||||
|
||||
Patch by: Salah Coronya
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=293919
|
||||
|
||||
--- lavtools/jpegutils.c
|
||||
+++ lavtools/jpegutils.c
|
||||
@@ -502,6 +502,7 @@
|
||||
|
||||
jpeg_read_header (&dinfo, TRUE);
|
||||
dinfo.raw_data_out = TRUE;
|
||||
+ dinfo.do_fancy_upsampling = FALSE;
|
||||
dinfo.out_color_space = JCS_YCbCr;
|
||||
dinfo.dct_method = JDCT_IFAST;
|
||||
guarantee_huff_tables(&dinfo);
|
||||
@@ -599,6 +600,7 @@
|
||||
if (field > 0) {
|
||||
jpeg_read_header (&dinfo, TRUE);
|
||||
dinfo.raw_data_out = TRUE;
|
||||
+ dinfo.do_fancy_upsampling = FALSE;
|
||||
dinfo.out_color_space = JCS_YCbCr;
|
||||
dinfo.dct_method = JDCT_IFAST;
|
||||
jpeg_start_decompress (&dinfo);
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f06488a..0413374 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -159,7 +159,7 @@ case $host in
|
||||
[have_video4linux=true
|
||||
AC_DEFINE(HAVE_V4L, 1,
|
||||
[Building for Linux - using the video4linux API])],
|
||||
- [AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])])
|
||||
+ [AC_MSG_WARN([videodev.h not found - please install the linux kernel headers])])
|
||||
;;
|
||||
esac
|
||||
AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
|
||||
diff --git a/autogen.sh b/autogen.sh
|
||||
index c894008..f5c6a7c 100755
|
||||
--- autogen.sh
|
||||
+++ autogen.sh
|
||||
@@ -1,4 +1,3 @@
|
||||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
-export ACLOCAL="aclocal -I missing_M4"
|
||||
autoreconf -f -i
|
||||
Reference in New Issue
Block a user