[MPlayer-cvslog] r29501 - trunk/codec-cfg.c

[reimar]

Author: reimar
Date: Wed Aug 12 03:04:37 2009
New Revision: 29501

Log:
make codec-cfg reuse the proper defined constants for all RGB/BGR formats
instead of re-constructing them itself.

Modified:
   trunk/codec-cfg.c

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Wed Aug 12 03:03:21 2009	(r29500)
+++ trunk/codec-cfg.c	Wed Aug 12 03:04:37 2009	(r29501)
@@ -164,20 +164,20 @@ static int add_to_format(char *s, char *
 
 		{"RGB48LE",  IMGFMT_RGB48LE},
 		{"RGB48BE",  IMGFMT_RGB48BE},
-	        {"RGB4",  IMGFMT_RGB|4},
-	        {"RGB8",  IMGFMT_RGB|8},
-		{"RGB15", IMGFMT_RGB|15},
-		{"RGB16", IMGFMT_RGB|16},
-		{"RGB24", IMGFMT_RGB|24},
-		{"RGB32", IMGFMT_RGB|32},
-		{"BGR4",  IMGFMT_BGR|4},
-		{"BGR8",  IMGFMT_BGR|8},
-		{"BGR15", IMGFMT_BGR|15},
-		{"BGR16", IMGFMT_BGR|16},
-		{"BGR24", IMGFMT_BGR|24},
-		{"BGR32", IMGFMT_BGR|32},
-	        {"RGB1",  IMGFMT_RGB|1},
-		{"BGR1",  IMGFMT_BGR|1},
+	        {"RGB4",  IMGFMT_RGB4},
+	        {"RGB8",  IMGFMT_RGB8},
+		{"RGB15", IMGFMT_RGB15},
+		{"RGB16", IMGFMT_RGB16},
+		{"RGB24", IMGFMT_RGB24},
+		{"RGB32", IMGFMT_RGB32},
+		{"BGR4",  IMGFMT_BGR4},
+		{"BGR8",  IMGFMT_BGR8},
+		{"BGR15", IMGFMT_BGR15},
+		{"BGR16", IMGFMT_BGR16},
+		{"BGR24", IMGFMT_BGR24},
+		{"BGR32", IMGFMT_BGR32},
+	        {"RGB1",  IMGFMT_RGB1},
+		{"BGR1",  IMGFMT_BGR1},
 
 		{"MPES",  IMGFMT_MPEGPES},
 		{"ZRMJPEGNI", IMGFMT_ZRMJPEGNI},