diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
| commit | 4ebf0075806ccf2bdde276a4e56eac41c7e350c4 (patch) | |
| tree | 89b4572543527808c92f4e37448bca4012e926ad /libmpcodecs/img_format.h | |
| parent | efd25f7811b232ae2b1899ca0fee6fd598837b9f (diff) | |
| parent | c2ba58aefce038ce4ccf6ed23791f5de823aa041 (diff) | |
| download | mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.bz2 mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.xz | |
Merge svn changes up to r30375
Diffstat (limited to 'libmpcodecs/img_format.h')
| -rw-r--r-- | libmpcodecs/img_format.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 6bab56632d..2aa037e5b7 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -35,12 +35,28 @@ #define IMGFMT_ARGB IMGFMT_BGR32 #define IMGFMT_RGBA (IMGFMT_BGR32|64) #define IMGFMT_RGB48NE IMGFMT_RGB48BE +#define IMGFMT_RGB15BE IMGFMT_RGB15 +#define IMGFMT_RGB15LE (IMGFMT_RGB15|64) +#define IMGFMT_RGB16BE IMGFMT_RGB16 +#define IMGFMT_RGB16LE (IMGFMT_RGB16|64) +#define IMGFMT_BGR15BE IMGFMT_BGR15 +#define IMGFMT_BGR15LE (IMGFMT_BGR15|64) +#define IMGFMT_BGR16BE IMGFMT_BGR16 +#define IMGFMT_BGR16LE (IMGFMT_BGR16|64) #else #define IMGFMT_ABGR (IMGFMT_BGR32|64) #define IMGFMT_BGRA IMGFMT_BGR32 #define IMGFMT_ARGB (IMGFMT_RGB32|64) #define IMGFMT_RGBA IMGFMT_RGB32 #define IMGFMT_RGB48NE IMGFMT_RGB48LE +#define IMGFMT_RGB15BE (IMGFMT_RGB15|64) +#define IMGFMT_RGB15LE IMGFMT_RGB15 +#define IMGFMT_RGB16BE (IMGFMT_RGB16|64) +#define IMGFMT_RGB16LE IMGFMT_RGB16 +#define IMGFMT_BGR15BE (IMGFMT_BGR15|64) +#define IMGFMT_BGR15LE IMGFMT_BGR15 +#define IMGFMT_BGR16BE (IMGFMT_BGR16|64) +#define IMGFMT_BGR16LE IMGFMT_BGR16 #endif /* old names for compatibility */ |