diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:21:18 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:21:18 +0300 |
| commit | 18657beb190b3e4acc6404c3b87e6eafbd22de3c (patch) | |
| tree | 727383b945b8d0239b180200e3f6e2dfe1f10766 /libmpcodecs | |
| parent | 1888e57af7e1ce51517ad9bdc2d201eaf84a98d2 (diff) | |
| parent | 8d0afdaa88f855deafe97bd94656b300e31ada35 (diff) | |
| download | mpv-18657beb190b3e4acc6404c3b87e6eafbd22de3c.tar.bz2 mpv-18657beb190b3e4acc6404c3b87e6eafbd22de3c.tar.xz | |
Merge svn changes up to r31145
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/img_format.c | 7 | ||||
| -rw-r--r-- | libmpcodecs/mp_image.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c index 9becd772da..df47ce043b 100644 --- a/libmpcodecs/img_format.c +++ b/libmpcodecs/img_format.c @@ -151,13 +151,18 @@ int mp_get_chroma_shift(int format, int *x_shift, int *y_shift) xs = 0; ys = 1; break; + case IMGFMT_Y8: + case IMGFMT_Y800: + xs = 31; + ys = 31; + break; default: err = 1; break; } if (x_shift) *x_shift = xs; if (y_shift) *y_shift = ys; - bpp = 8 + (16 >> (xs + ys)); + bpp = 8 + ((16 >> xs) >> ys); if (format == IMGFMT_420A) bpp += 8; bpp *= bpp_factor; diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 898f5fac96..f23918151d 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -153,8 +153,7 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ case IMGFMT_Y800: case IMGFMT_Y8: /* they're planar ones, but for easier handling use them as packed */ -// mpi->flags|=MP_IMGFLAG_PLANAR; - mpi->bpp=8; + mpi->flags&=~MP_IMGFLAG_PLANAR; mpi->num_planes=1; return; case IMGFMT_UYVY: |