diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-12 01:03:21 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-12 01:03:21 +0000 |
| commit | a3d39e2702b0b9d3abc721b60216fbd866fea48e (patch) | |
| tree | fd638342ecefdbef910c236edebda8287c19296f | |
| parent | c9f520a3f905012c93c40da7e12c9ba051e1d618 (diff) | |
| download | mpv-a3d39e2702b0b9d3abc721b60216fbd866fea48e.tar.bz2 mpv-a3d39e2702b0b9d3abc721b60216fbd866fea48e.tar.xz | |
100l, fix compilation again and make codec-cfg.c use the predefined constants
instead of reimplementing the IMGFMT_RGB|bit_depth logic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29500 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | codec-cfg.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/img_format.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 764457467b..c0246e9f21 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -162,8 +162,8 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"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 --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 8c7dfa39e9..89efb1d6cb 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -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)) |