summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-17 14:40:44 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-17 14:40:44 +0000
commit2f7f6fdb9d21648cb14ac0125d61c6215a11b263 (patch)
tree2ad729476b3ee4c0ecdbd331bce89c31652c780c
parent1d08d54a97e806db664bf04da3cf6675ddf3bbb8 (diff)
downloadmpv-2f7f6fdb9d21648cb14ac0125d61c6215a11b263.tar.bz2
mpv-2f7f6fdb9d21648cb14ac0125d61c6215a11b263.tar.xz
More format support in fmt-conversion.c: split RGB32 and BGR32
into ARGB, BGRA, ABGR, RGBA. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30351 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--fmt-conversion.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fmt-conversion.c b/fmt-conversion.c
index 9371ab1a11..de2f2c572d 100644
--- a/fmt-conversion.c
+++ b/fmt-conversion.c
@@ -25,7 +25,8 @@ static const struct {
int fmt;
enum PixelFormat pix_fmt;
} conversion_map[] = {
- {IMGFMT_BGR32, PIX_FMT_RGB32},
+ {IMGFMT_ARGB, PIX_FMT_ARGB},
+ {IMGFMT_BGRA, PIX_FMT_BGRA},
{IMGFMT_BGR24, PIX_FMT_BGR24},
{IMGFMT_BGR16, PIX_FMT_RGB565},
{IMGFMT_BGR15, PIX_FMT_RGB555},
@@ -37,7 +38,8 @@ static const struct {
{IMGFMT_BG4B, PIX_FMT_RGB4_BYTE},
{IMGFMT_RGB48LE, PIX_FMT_RGB48LE},
{IMGFMT_RGB48BE, PIX_FMT_RGB48BE},
- {IMGFMT_RGB32, PIX_FMT_BGR32},
+ {IMGFMT_ABGR, PIX_FMT_ABGR},
+ {IMGFMT_RGBA, PIX_FMT_RGBA},
{IMGFMT_RGB24, PIX_FMT_RGB24},
{IMGFMT_RGB16, PIX_FMT_BGR565},
{IMGFMT_RGB15, PIX_FMT_BGR555},