summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-02 16:55:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-02 16:55:32 +0000
commitbb33ae56230a56223db51f40dd384aa570e88c00 (patch)
tree2dc87471896d51d57a4328e578812c960c943806 /media-tv/xawtv/files
parentVersion bump KDE 4.4.1 (diff)
downloadgentoo-2-bb33ae56230a56223db51f40dd384aa570e88c00.tar.gz
gentoo-2-bb33ae56230a56223db51f40dd384aa570e88c00.tar.bz2
gentoo-2-bb33ae56230a56223db51f40dd384aa570e88c00.zip
Fix segmentation fault with jpeg >= 7 wrt #288158 by Salah Coronya.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xawtv/files')
-rw-r--r--media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
new file mode 100644
index 000000000000..69f2d9836d55
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/show_bug.cgi?id=288158
+
+--- xawtv-3.95/libng/plugins/conv-mjpeg.c
++++ xawtv-3.95/libng/plugins/conv-mjpeg.c
+@@ -229,6 +229,7 @@
+ jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE);
+
+ h->mjpg_cinfo.raw_data_in = TRUE;
++ h->mjpg_cinfo.do_fancy_downsampling = FALSE;
+ jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr);
+
+ h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*));
+@@ -453,6 +454,7 @@
+ h->buf = in;
+ jpeg_read_header(&h->mjpg_cinfo,1);
+ h->mjpg_cinfo.raw_data_out = 1;
++ h->mjpg_cinfo.do_fancy_upsampling = FALSE;
+
+ if (ng_debug > 1)
+ fprintf(stderr,"yuv: %dx%d - %d %d / %d %d / %d %d\n",