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_1bpp.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_1bpp.c')
| -rw-r--r-- | libmpcodecs/vf_1bpp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c index ee8ecfbadc..915411e96f 100644 --- a/libmpcodecs/vf_1bpp.c +++ b/libmpcodecs/vf_1bpp.c @@ -45,6 +45,8 @@ static const unsigned int bgr_list[]={ IMGFMT_444P, IMGFMT_YUY2, + IMGFMT_BGR12, + IMGFMT_RGB12, IMGFMT_BGR15, IMGFMT_RGB15, IMGFMT_BGR16, @@ -150,6 +152,10 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ case IMGFMT_YUY2: convert(mpi,dmpi,0x8000,0x80ff,2); break; + case IMGFMT_BGR12: + case IMGFMT_RGB12: + convert(mpi,dmpi,0,0x0fff,2); + break; case IMGFMT_BGR15: case IMGFMT_RGB15: convert(mpi,dmpi,0,0x7fff,2); |