[ingex-commits] ingex/studio/common mjpeg_compress.c, 1.8, 1.9 mjpeg_compress.h, 1.2, 1.3

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/common
In directory vz-cvs-4.sog:/tmp/cvs-serv31797

Modified Files:
	mjpeg_compress.c mjpeg_compress.h 
Log Message:
Updates re. YUVlib


Index: mjpeg_compress.h
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/common/mjpeg_compress.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mjpeg_compress.h	26 Feb 2009 19:28:07 -0000	1.2
--- mjpeg_compress.h	10 Feb 2012 15:22:25 -0000	1.3
***************
*** 52,55 ****
--- 52,56 ----
      unsigned char *half_v;
      unsigned char *workspace;
+     size_t workspace_size;
      JSAMPROW black_y[DCTSIZE];
      JSAMPROW black_u[DCTSIZE];

Index: mjpeg_compress.c
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/common/mjpeg_compress.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mjpeg_compress.c	18 Apr 2011 09:39:59 -0000	1.8
--- mjpeg_compress.c	10 Feb 2012 15:22:25 -0000	1.9
***************
*** 270,274 ****
  
          // Also allocate a temp workspace for YUV scale_pic
!         p->workspace = (unsigned char *)malloc(width * 4);
      }
  
--- 270,275 ----
  
          // Also allocate a temp workspace for YUV scale_pic
!         p->workspace_size = 2 * jpeg_width * 4;
!         p->workspace = (unsigned char *)malloc(p->workspace_size);
      }
  
***************
*** 438,442 ****
              0, 0, output_frame.Y.w, output_frame.Y.h,
              0, 1, 1,				// intlc, hfil, vfil
!             p->workspace);
  
          while (cinfo->next_scanline < cinfo->image_height) {
--- 439,443 ----
              0, 0, output_frame.Y.w, output_frame.Y.h,
              0, 1, 1,				// intlc, hfil, vfil
!             p->workspace, p->workspace_size);
  
          while (cinfo->next_scanline < cinfo->image_height) {