[gentoo-commits] gentoo-x86 commit in media-video/mpeg-tools/files: mpeg-tools-1.5b-system-jpeg-7.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/08/24 19:27:38

  Added:                mpeg-tools-1.5b-system-jpeg-7.patch
  Log:
  Fix building with >=media-libs/jpeg-7 wrt #282588, thanks to Christian Becke for reporting.
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch?rev=1.1&content-type=text/plain

Index: mpeg-tools-1.5b-system-jpeg-7.patch
===================================================================
diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c
--- mpeg_encode.orig/jpeg.c	2009-08-24 21:33:18.000000000 +0300
+++ mpeg_encode/jpeg.c	2009-08-24 22:23:08.000000000 +0300
@@ -80,13 +80,9 @@
 /* make it happier.... */
 #undef DCTSIZE2
 #include "jpeglib.h"
-#include "jpegint.h"
-
 
 #define HEADER_SIZE 607   /*JFIF header size used on output images*/
 
-
-
 /*=======================================================================*
  *                                                                       *
  * JMovie2JPEG                                                           *
@@ -517,7 +513,7 @@
 #ifdef JPEG4
   buffer_height = 8;  /* could be 2, 4,8 rows high */
 #else
-  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
+  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
 #endif
   
   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;