aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2010-05-09 19:22:10 +0800
committermiwi <miwi@FreeBSD.org>2010-05-09 19:22:10 +0800
commitbed7e14ae80b8dd5735dd95943426c9a1539d8ea (patch)
treea0946e3d0a674679e0b2f880c93232e73e36f2fb /multimedia
parente988a1d459b92fbeb5cedc5b5b0eefb43616e3b7 (diff)
downloadfreebsd-ports-gnome-bed7e14ae80b8dd5735dd95943426c9a1539d8ea.tar.gz
freebsd-ports-gnome-bed7e14ae80b8dd5735dd95943426c9a1539d8ea.tar.zst
freebsd-ports-gnome-bed7e14ae80b8dd5735dd95943426c9a1539d8ea.zip
- Fix segmentation fault with jpeg
PR: 146308 Submitted by: Ports Fury
Diffstat (limited to 'multimedia')
-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);