Mercurial > mplayer.hg

changeset 7409:33f2f851d264

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This patch fixes a segfault for native cvid decoder in bgr32 and bgr24 modes. Roberto Togni <rtogni@bresciaonline.it>
author arpi
date Sun, 15 Sep 2002 21:02:22 +0000
parents 0c6948b8100f
children 1578dc56a9ad
files libmpcodecs/native/cinepak.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/native/cinepak.c	Sun Sep 15 20:51:55 2002 +0000
+++ b/libmpcodecs/native/cinepak.c	Sun Sep 15 21:02:22 2002 +0000
@@ -352,7 +352,7 @@
 /* ------------------------------------------------------------------------ */
 inline void cvid_v1_32(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook *cb)
 {
-int stride = mpi->stride[0];
+int stride = mpi->stride[0]/4;
 unsigned long *vptr = (unsigned long *)mpi->planes[0];
 unsigned long rgb;
 
@@ -378,7 +378,7 @@
 inline void cvid_v4_32(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook *cb0,
 	cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
-int stride = mpi->stride[0];
+int stride = mpi->stride[0]/4;
 unsigned long *vptr = (unsigned long *)mpi->planes[0];
 
 	if(y+3>=(unsigned int)mpi->height) return; // avoid sig11
@@ -450,8 +450,8 @@
 inline void cvid_v1_24(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook *cb)
 {
 unsigned char r, g, b;
-int stride = (mpi->stride[0]-4)*3;
-unsigned char *vptr = mpi->planes[0] + (y * mpi->stride[0] + x) * 3;
+int stride = (mpi->stride[0])-4*3;
+unsigned char *vptr = mpi->planes[0] + (y * mpi->stride[0]) + x * 3;
 
 	if(y+3>=(unsigned int)mpi->height) return; // avoid sig11
 
@@ -481,8 +481,8 @@
 inline void cvid_v4_24(mp_image_t *mpi, unsigned int x, unsigned int y, cvid_codebook *cb0,
 	cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
-int stride = (mpi->stride[0]-4)*3;
-unsigned char *vptr = mpi->planes[0] + (y * mpi->stride[0] + x) * 3;
+int stride = (mpi->stride[0])-4*3;
+unsigned char *vptr = mpi->planes[0] + (y * mpi->stride[0]) + x * 3;
 
 	if(y+3>=(unsigned int)mpi->height) return; // avoid sig11