aboutsummaryrefslogtreecommitdiff
path: root/multimedia/mjpegtools
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2010-05-09 11:22:10 +0000
committerMartin Wilke <miwi@FreeBSD.org>2010-05-09 11:22:10 +0000
commitb5cd10fe439b904b845afb19146250bf8d51ca12 (patch)
tree28f6ab0789fc3114db37b57eea9d33c72f113f32 /multimedia/mjpegtools
parent167ced67f34cde65cf4b377da3a32213f157fc3f (diff)
downloadports-b5cd10fe439b904b845afb19146250bf8d51ca12.tar.gz
ports-b5cd10fe439b904b845afb19146250bf8d51ca12.zip
Notes
Diffstat (limited to 'multimedia/mjpegtools')
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mjpegtools/files/patch-lavtools__jpegutils.c24
2 files changed, 25 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 5ae7835e7698..e067d6803f2b 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mjpegtools
PORTVERSION= 1.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c b/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c
new file mode 100644
index 000000000000..ec367318628c
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-lavtools__jpegutils.c
@@ -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);