[MPlayer-cvslog] r29500 - in trunk: codec-cfg.c libmpcodecs/img_format.h

[reimar]

Author: reimar
Date: Wed Aug 12 03:03:21 2009
New Revision: 29500

Log:
100l, fix compilation again and make codec-cfg.c use the predefined constants
instead of reimplementing the IMGFMT_RGB|bit_depth logic.

Modified:
   trunk/codec-cfg.c
   trunk/libmpcodecs/img_format.h

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Wed Aug 12 02:51:09 2009	(r29499)
+++ trunk/codec-cfg.c	Wed Aug 12 03:03:21 2009	(r29500)
@@ -162,8 +162,8 @@ static int add_to_format(char *s, char *
 		{"UYVY",  IMGFMT_UYVY},
 		{"YVYU",  IMGFMT_YVYU},
 
-		{"RGB48LE",  IMGFMT_RGB|48},
-		{"RGB48BE",  IMGFMT_RGB|49},
+		{"RGB48LE",  IMGFMT_RGB48LE},
+		{"RGB48BE",  IMGFMT_RGB48BE},
 	        {"RGB4",  IMGFMT_RGB|4},
 	        {"RGB8",  IMGFMT_RGB|8},
 		{"RGB15", IMGFMT_RGB|15},

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	Wed Aug 12 02:51:09 2009	(r29499)
+++ trunk/libmpcodecs/img_format.h	Wed Aug 12 03:03:21 2009	(r29500)
@@ -14,7 +14,7 @@
 #define IMGFMT_RGB24 (IMGFMT_RGB|24)
 #define IMGFMT_RGB32 (IMGFMT_RGB|32)
 #define IMGFMT_RGB48LE (IMGFMT_RGB|48)
-#define IMGFMT_RGB48BE (IMGFMT_RGB|48)
+#define IMGFMT_RGB48BE (IMGFMT_RGB|48|128)
 
 #define IMGFMT_BGR_MASK 0xFFFFFF00
 #define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))