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 /m_option.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 'm_option.c')
| -rw-r--r-- | m_option.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/m_option.c b/m_option.c index 63436bb165..36e538f6f3 100644 --- a/m_option.c +++ b/m_option.c @@ -1118,6 +1118,7 @@ static struct { {"bgr32", IMGFMT_BGR32}, {"bgr16", IMGFMT_BGR16}, {"bgr15", IMGFMT_BGR15}, + {"bgr12", IMGFMT_BGR12}, {"bgr8", IMGFMT_BGR8}, {"bgr4", IMGFMT_BGR4}, {"bg4b", IMGFMT_BG4B}, @@ -1129,6 +1130,7 @@ static struct { {"rgb32", IMGFMT_RGB32}, {"rgb16", IMGFMT_RGB16}, {"rgb15", IMGFMT_RGB15}, + {"rgb12", IMGFMT_RGB12}, {"rgb8", IMGFMT_RGB8}, {"rgb4", IMGFMT_RGB4}, {"rg4b", IMGFMT_RG4B}, |