[Mplayer-cvslog] CVS: main dec_video.c,1.111,1.112 cinepak.c,1.4,1.5

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv16509

Modified Files:
	dec_video.c cinepak.c 
Log Message:
stride!=width*bpp support to cinepak decoder

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- dec_video.c	27 Feb 2002 11:16:52 -0000	1.111
+++ dec_video.c	28 Feb 2002 01:12:23 -0000	1.112
@@ -159,7 +159,8 @@
   unsigned char *frame,
   int width,
   int height,
-  int bit_per_pixel);
+  int bit_per_pixel,
+  int stride);
 
 void decode_cyuv(
   unsigned char *buf,
@@ -865,7 +866,7 @@
    else
    {
      decode_cinepak(sh_video->context, start, in_size, sh_video->our_out_buffer,
-       sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255));
+       sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255), 0);
      blit_frame = 3;
    }
    break;

Index: cinepak.c
===================================================================
RCS file: /cvsroot/mplayer/main/cinepak.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cinepak.c	10 Feb 2002 01:23:36 -0000	1.4
+++ cinepak.c	28 Feb 2002 01:12:24 -0000	1.5
@@ -383,7 +383,7 @@
  * bit_per_pixel - the number of bits per pixel allocated to the output
  *   frame (only 24 or 32 bpp are supported)
  */
-void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel)
+void decode_cinepak(void *context, unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel, int stride_)
 {
 cinepak_info *cvinfo = (cinepak_info *)context;
 cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL;
@@ -429,7 +429,7 @@
 			break;
 		}
 
-	frm_stride = width * bpp;
+	frm_stride = stride_ ? stride_ : width * bpp;
 	frm_ptr = frame;
 	frm_end = frm_ptr + width * height * bpp;