Mercurial > mplayer.hg

changeset 23622:fdd016bae333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid more void * arithmetic
author reimar
date Sun, 24 Jun 2007 12:32:33 +0000
parents 757d1fae7a44
children cc3baf55288d
files libmpcodecs/vd_hmblck.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_hmblck.c	Sun Jun 24 11:18:12 2007 +0000
+++ b/libmpcodecs/vd_hmblck.c	Sun Jun 24 12:32:33 2007 +0000
@@ -59,7 +59,7 @@
 /*************************************************************************
  * convert a nv12 buffer to yv12
  */
-static int nv12_to_yv12(void *data, int len, mp_image_t* mpi, int swapped) {
+static int nv12_to_yv12(unsigned char *data, int len, mp_image_t* mpi, int swapped) {
     unsigned int Y_size  = mpi->width * mpi->height;
     unsigned int UV_size = mpi->chroma_width * mpi->chroma_height;
     unsigned int idx;
@@ -128,7 +128,9 @@
     if(sh->format == IMGFMT_HM12) {
         //if(!de_macro(sh, data, len, flags, mpi)) return NULL;
 	de_macro_y(mpi->planes[0],data,mpi->stride[0],mpi->w,mpi->h);
-	de_macro_uv(mpi->planes[1],mpi->planes[2],data+mpi->w*mpi->h,mpi->stride[1],mpi->w/2,mpi->h/2);
+	de_macro_uv(mpi->planes[1],mpi->planes[2],
+                    (unsigned char *)data+mpi->w*mpi->h,mpi->stride[1],
+                    mpi->w/2,mpi->h/2);
     } else {
 	if(!nv12_to_yv12(data, len, mpi,(sh->format == IMGFMT_NV21))) return NULL;
     }