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 /fmt-conversion.c | |
| parent | 4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (diff) | |
| parent | 1292c8adc351b1bf461354cd632b39ec3303a8f2 (diff) | |
| download | mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.bz2 mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.xz | |
Merge svn changes up to r31141
Diffstat (limited to 'fmt-conversion.c')
| -rw-r--r-- | fmt-conversion.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fmt-conversion.c b/fmt-conversion.c index 013e3fea55..9e881009e4 100644 --- a/fmt-conversion.c +++ b/fmt-conversion.c @@ -32,6 +32,8 @@ static const struct { {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, + {IMGFMT_BGR12BE, PIX_FMT_RGB444BE}, + {IMGFMT_BGR12LE, PIX_FMT_RGB444LE}, {IMGFMT_BGR8, PIX_FMT_RGB8}, {IMGFMT_BGR4, PIX_FMT_RGB4}, {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, @@ -47,6 +49,8 @@ static const struct { {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, + {IMGFMT_RGB12BE, PIX_FMT_BGR444BE}, + {IMGFMT_RGB12LE, PIX_FMT_BGR444LE}, {IMGFMT_RGB8, PIX_FMT_BGR8}, {IMGFMT_RGB4, PIX_FMT_BGR4}, {IMGFMT_BGR8, PIX_FMT_PAL8}, |