diff options
| author | wiz <wiz> | 2011-02-10 17:13:10 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-02-10 17:13:10 +0000 |
| commit | 242743e1e31500fc522881fd419e4ea5e4b89915 (patch) | |
| tree | b57570969b3c784cbdcb62d5086d19c71b088b85 /multimedia/mjpegtools | |
| parent | 1a8cfed3e50933fbd4a5f6872baf44869173efba (diff) | |
| download | pkgsrc-242743e1e31500fc522881fd419e4ea5e4b89915.tar.gz | |
Add a fix for lavtools and jpeg7 from Gentoo via upstream bug tracker.
Ride bump from a few minutes ago.
Diffstat (limited to 'multimedia/mjpegtools')
| -rw-r--r-- | multimedia/mjpegtools/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-lavtools_jpegutils.c | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo index af524efbfd7..b33be8b389a 100644 --- a/multimedia/mjpegtools/distinfo +++ b/multimedia/mjpegtools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2011/02/10 17:06:27 wiz Exp $ +$NetBSD: distinfo,v 1.24 2011/02/10 17:13:10 wiz Exp $ SHA1 (mjpegtools-1.9.0.tar.gz) = 1701233354c7ea86b5b7808c4dd5d03a71118e48 RMD160 (mjpegtools-1.9.0.tar.gz) = 79e0eb4bce468bb8f12da336e29abe8fab390a5f @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 79a5324816b8fe7c371c29e4291ccee92a35e99f SHA1 (patch-ad) = 2a6f33fdc9c240d1c5c1172710db7ed95b1fc5a8 SHA1 (patch-ae) = 98bfbaccd8dc79582a32ffbc8dba7b6c039c0373 SHA1 (patch-af) = db90227d0732220123e5900049cf5f3e961432a2 +SHA1 (patch-lavtools_jpegutils.c) = b81357746465a782ae89bd41c26eaa5a5b4cd07d diff --git a/multimedia/mjpegtools/patches/patch-lavtools_jpegutils.c b/multimedia/mjpegtools/patches/patch-lavtools_jpegutils.c new file mode 100644 index 00000000000..1cee5df061e --- /dev/null +++ b/multimedia/mjpegtools/patches/patch-lavtools_jpegutils.c @@ -0,0 +1,27 @@ +$NetBSD: patch-lavtools_jpegutils.c,v 1.1 2011/02/10 17:13:10 wiz Exp $ + +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 +https://sourceforge.net/tracker/?func=detail&aid=2937874&group_id=5776&atid=105776 + +--- 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); |