diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-30 09:15:09 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-30 09:15:09 +0000 |
commit | 49a3af8585178fa4b790bedfb587a8c23ec9c99e (patch) | |
tree | d580a9eb8d4512209354a96bdd6e7ef1cea3f625 /libmpcodecs/mp_image.h | |
parent | 6df2ca6ea6d6e8f9ceda72e00991a0331ccdbc5d (diff) | |
download | mpv-49a3af8585178fa4b790bedfb587a8c23ec9c99e.tar.bz2 mpv-49a3af8585178fa4b790bedfb587a8c23ec9c99e.tar.xz |
fixing rgb4 & bgr4 (2 pixels per byte)
adding bg4b & rg4b (1 pixel per byte)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9172 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/mp_image.h')
-rw-r--r-- | libmpcodecs/mp_image.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index f5a26ac5a2..23d0c34852 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -96,14 +96,14 @@ static inline void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ } mpi->num_planes=1; if (IMGFMT_IS_RGB(out_fmt)) { - if (IMGFMT_RGB_DEPTH(out_fmt) < 8) + if (IMGFMT_RGB_DEPTH(out_fmt) < 8 && !(out_fmt&128)) mpi->bpp = IMGFMT_RGB_DEPTH(out_fmt); else mpi->bpp=(IMGFMT_RGB_DEPTH(out_fmt)+7)&(~7); return; } if (IMGFMT_IS_BGR(out_fmt)) { - if (IMGFMT_BGR_DEPTH(out_fmt) < 8) + if (IMGFMT_BGR_DEPTH(out_fmt) < 8 && !(out_fmt&128)) mpi->bpp = IMGFMT_BGR_DEPTH(out_fmt); else mpi->bpp=(IMGFMT_BGR_DEPTH(out_fmt)+7)&(~7); |