From 19efdd59aa98afb226f1ff9d69b8391d6f947220 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 9 Sep 2002 16:13:51 +0000 Subject: 10l git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7334 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_palette.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libmpcodecs/vf_palette.c') diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index 8abff62d5c..0f511b17d5 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -86,25 +86,25 @@ static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ // no stride conversion needed switch(dmpi->imgfmt&255){ case 15: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else palette8torgb15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); break; case 16: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else palette8torgb16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); break; case 24: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else palette8torgb24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); break; case 32: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else palette8torgb32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); @@ -117,25 +117,25 @@ static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ unsigned char* dst=dmpi->planes[0]+y*dmpi->stride[0]; switch(dmpi->imgfmt&255){ case 15: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr15(src,dst,mpi->w,mpi->planes[1]); else palette8torgb15(src,dst,mpi->w,mpi->planes[1]); break; case 16: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr16(src,dst,mpi->w,mpi->planes[1]); else palette8torgb16(src,dst,mpi->w,mpi->planes[1]); break; case 24: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr24(src,dst,mpi->w,mpi->planes[1]); else palette8torgb24(src,dst,mpi->w,mpi->planes[1]); break; case 32: - if (mpi->flags & MP_IMGFLAG_SWAPPED) + if (dmpi->flags & MP_IMGFLAG_SWAPPED) palette8tobgr32(src,dst,mpi->w,mpi->planes[1]); else palette8torgb32(src,dst,mpi->w,mpi->planes[1]); -- cgit v1.2.3