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/vf_tile.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 'libmpcodecs/vf_tile.c')
-rw-r--r-- | libmpcodecs/vf_tile.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c index 9192f5bf5f..0930a00c87 100644 --- a/libmpcodecs/vf_tile.c +++ b/libmpcodecs/vf_tile.c @@ -197,16 +197,18 @@ static void uninit(struct vf_instance* vf) free(vf->priv); } -/* rgb/bgr 15->32 supported & some Yxxx */ +/* rgb/bgr 12->32 supported & some Yxxx */ static int query_format(struct vf_instance* vf, unsigned int fmt) { switch (fmt) { - /* rgb 15 -> 32 bit */ + /* rgb 12...32 bit */ + case IMGFMT_RGB12: case IMGFMT_RGB15: case IMGFMT_RGB16: case IMGFMT_RGB24: case IMGFMT_RGB32: - /* bgr 15 -> 32 bit */ + /* bgr 12...32 bit */ + case IMGFMT_BGR12: case IMGFMT_BGR15: case IMGFMT_BGR16: case IMGFMT_BGR24: |