From 05a053093a2ee5ba5b726511668b9fbb9ae2f063 Mon Sep 17 00:00:00 2001
From: michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 27 Jun 2002 17:35:37 +0000
Subject: {RGB,BGR}{1,4}

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6577 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/img_format.c | 4 ++++
 libmpcodecs/img_format.h | 4 ++++
 libmpcodecs/mp_image.h   | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c
index ae6f83669d..912e5d0be6 100644
--- a/libmpcodecs/img_format.c
+++ b/libmpcodecs/img_format.c
@@ -4,11 +4,15 @@ char *vo_format_name(int format)
 {
     switch(format)
     {
+	case IMGFMT_RGB1: return("RGB 1-bit");
+	case IMGFMT_RGB4: return("RGB 4-bit");
 	case IMGFMT_RGB8: return("RGB 8-bit");
 	case IMGFMT_RGB15: return("RGB 15-bit");
 	case IMGFMT_RGB16: return("RGB 16-bit");
 	case IMGFMT_RGB24: return("RGB 24-bit");
 	case IMGFMT_RGB32: return("RGB 32-bit");
+	case IMGFMT_BGR1: return("BGR 1-bit");
+	case IMGFMT_BGR4: return("BGR 4-bit");
 	case IMGFMT_BGR8: return("BGR 8-bit");
 	case IMGFMT_BGR15: return("BGR 15-bit");
 	case IMGFMT_BGR16: return("BGR 16-bit");
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 321b9c3c37..467ebe1873 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -6,6 +6,8 @@
 
 #define IMGFMT_RGB_MASK 0xFFFFFF00
 #define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8))
+#define IMGFMT_RGB1  (IMGFMT_RGB|1)
+#define IMGFMT_RGB4  (IMGFMT_RGB|4)
 #define IMGFMT_RGB8  (IMGFMT_RGB|8)
 #define IMGFMT_RGB15 (IMGFMT_RGB|15)
 #define IMGFMT_RGB16 (IMGFMT_RGB|16)
@@ -14,6 +16,8 @@
 
 #define IMGFMT_BGR_MASK 0xFFFFFF00
 #define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))
+#define IMGFMT_BGR1 (IMGFMT_BGR|1)
+#define IMGFMT_BGR4 (IMGFMT_BGR|4)
 #define IMGFMT_BGR8 (IMGFMT_BGR|8)
 #define IMGFMT_BGR15 (IMGFMT_BGR|15)
 #define IMGFMT_BGR16 (IMGFMT_BGR|16)
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h
index b1fca0142b..d81b24c313 100644
--- a/libmpcodecs/mp_image.h
+++ b/libmpcodecs/mp_image.h
@@ -73,11 +73,13 @@ static inline void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){
     mpi->num_planes=1;
     if( (out_fmt&IMGFMT_RGB_MASK) == IMGFMT_RGB ){
 	mpi->bpp=((out_fmt&255)+7)&(~7);
+	if(out_fmt==IMGFMT_RGB1) mpi->bpp=1;
 	return;
     }
     if( (out_fmt&IMGFMT_BGR_MASK) == IMGFMT_BGR ){
 	mpi->bpp=((out_fmt&255)+7)&(~7);
 	mpi->flags|=MP_IMGFLAG_SWAPPED;
+	if(out_fmt==IMGFMT_BGR1) mpi->bpp=1;
 	return;
     }
     mpi->flags|=MP_IMGFLAG_YUV;
-- 
cgit v1.2.3