# HG changeset patch # User reimar # Date 1250039001 0 # Node ID c85a54f30ed9f65db5781c3c84d698d4f018c124 # Parent 052acc1342cacb37be33d3e1e52cee95ac983a57 100l, fix compilation again and make codec-cfg.c use the predefined constants instead of reimplementing the IMGFMT_RGB|bit_depth logic. diff -r 052acc1342ca -r c85a54f30ed9 codec-cfg.c --- a/codec-cfg.c Wed Aug 12 00:51:09 2009 +0000 +++ b/codec-cfg.c Wed Aug 12 01:03:21 2009 +0000 @@ -162,8 +162,8 @@ {"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}, diff -r 052acc1342ca -r c85a54f30ed9 libmpcodecs/img_format.h --- a/libmpcodecs/img_format.h Wed Aug 12 00:51:09 2009 +0000 +++ b/libmpcodecs/img_format.h Wed Aug 12 01:03:21 2009 +0000 @@ -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))