diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:13:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:13:35 +0300 |
| commit | e1cd86076fc830bf2d475539543cf3dacc287ca7 (patch) | |
| tree | 3651783063fcca8af4645f61f4196276d6f7f6a9 /libmpcodecs/img_format.h | |
| parent | 4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (diff) | |
| parent | 1292c8adc351b1bf461354cd632b39ec3303a8f2 (diff) | |
| download | mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.bz2 mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.xz | |
Merge svn changes up to r31141
Diffstat (limited to 'libmpcodecs/img_format.h')
| -rw-r--r-- | libmpcodecs/img_format.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 2c4db36a04..e5800828d0 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -29,6 +29,7 @@ #define IMGFMT_RGB4 (IMGFMT_RGB|4) #define IMGFMT_RGB4_CHAR (IMGFMT_RGB|4|128) // RGB4 with 1 pixel per byte #define IMGFMT_RGB8 (IMGFMT_RGB|8) +#define IMGFMT_RGB12 (IMGFMT_RGB|12) #define IMGFMT_RGB15 (IMGFMT_RGB|15) #define IMGFMT_RGB16 (IMGFMT_RGB|16) #define IMGFMT_RGB24 (IMGFMT_RGB|24) @@ -42,6 +43,7 @@ #define IMGFMT_BGR4 (IMGFMT_BGR|4) #define IMGFMT_BGR4_CHAR (IMGFMT_BGR|4|128) // BGR4 with 1 pixel per byte #define IMGFMT_BGR8 (IMGFMT_BGR|8) +#define IMGFMT_BGR12 (IMGFMT_BGR|12) #define IMGFMT_BGR15 (IMGFMT_BGR|15) #define IMGFMT_BGR16 (IMGFMT_BGR|16) #define IMGFMT_BGR24 (IMGFMT_BGR|24) @@ -53,10 +55,14 @@ #define IMGFMT_ARGB IMGFMT_BGR32 #define IMGFMT_RGBA (IMGFMT_BGR32|64) #define IMGFMT_RGB48NE IMGFMT_RGB48BE +#define IMGFMT_RGB12BE IMGFMT_RGB12 +#define IMGFMT_RGB12LE (IMGFMT_RGB12|64) #define IMGFMT_RGB15BE IMGFMT_RGB15 #define IMGFMT_RGB15LE (IMGFMT_RGB15|64) #define IMGFMT_RGB16BE IMGFMT_RGB16 #define IMGFMT_RGB16LE (IMGFMT_RGB16|64) +#define IMGFMT_BGR12BE IMGFMT_BGR12 +#define IMGFMT_BGR12LE (IMGFMT_BGR12|64) #define IMGFMT_BGR15BE IMGFMT_BGR15 #define IMGFMT_BGR15LE (IMGFMT_BGR15|64) #define IMGFMT_BGR16BE IMGFMT_BGR16 @@ -67,10 +73,14 @@ #define IMGFMT_ARGB (IMGFMT_RGB32|64) #define IMGFMT_RGBA IMGFMT_RGB32 #define IMGFMT_RGB48NE IMGFMT_RGB48LE +#define IMGFMT_RGB12BE (IMGFMT_RGB12|64) +#define IMGFMT_RGB12LE IMGFMT_RGB12 #define IMGFMT_RGB15BE (IMGFMT_RGB15|64) #define IMGFMT_RGB15LE IMGFMT_RGB15 #define IMGFMT_RGB16BE (IMGFMT_RGB16|64) #define IMGFMT_RGB16LE IMGFMT_RGB16 +#define IMGFMT_BGR12BE (IMGFMT_BGR12|64) +#define IMGFMT_BGR12LE IMGFMT_BGR12 #define IMGFMT_BGR15BE (IMGFMT_BGR15|64) #define IMGFMT_BGR15LE IMGFMT_BGR15 #define IMGFMT_BGR16BE (IMGFMT_BGR16|64) |