Mercurial > mplayer.hg

changeset 29459:c1bf06060606

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make codec-cfg reuse the proper defined constants for all RGB/BGR formats instead of re-constructing them itself.
author reimar
date Wed, 12 Aug 2009 01:04:37 +0000
parents c85a54f30ed9
children d9be78936c0c
files codec-cfg.c
diffstat 1 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.c	Wed Aug 12 01:03:21 2009 +0000
+++ b/codec-cfg.c	Wed Aug 12 01:04:37 2009 +0000
@@ -164,20 +164,20 @@
 
 		{"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},