summaryrefslogtreecommitdiff
path: root/extra/mjpegtools
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-12-07 15:02:31 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-12-07 15:02:31 +0000
commit8736f458a17a03cf79a763a0c8122f93162fed71 (patch)
treefba97f22de8410ee5df8985e6c98756093578100 /extra/mjpegtools
parentd1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff)
Wed Dec 7 15:02:27 UTC 2011
Diffstat (limited to 'extra/mjpegtools')
-rw-r--r--extra/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch11
-rw-r--r--extra/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch24
-rw-r--r--extra/mjpegtools/png2yuv-fix-memleak.patch10
3 files changed, 0 insertions, 45 deletions
diff --git a/extra/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch b/extra/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch
deleted file mode 100644
index e16156046..000000000
--- a/extra/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/extra/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch b/extra/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
deleted file mode 100644
index ec3673186..000000000
--- a/extra/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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);
diff --git a/extra/mjpegtools/png2yuv-fix-memleak.patch b/extra/mjpegtools/png2yuv-fix-memleak.patch
deleted file mode 100644
index a6f03a4e1..000000000
--- a/extra/mjpegtools/png2yuv-fix-memleak.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mjpegtools-1.9.0/lavtools/png2yuv.c.orig 2010-01-17 14:26:24.000000000 +0100
-+++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-01-17 14:27:53.000000000 +0100
-@@ -407,6 +407,7 @@
- return 2;
- }
-
-+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- fclose(pngfile);
-
- return 1;