diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-06-29 11:39:06 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-29 11:39:06 +0300 |
| commit | a77e5f07ed513233314c18f3e45490fdfa11f6ba (patch) | |
| tree | a369f5e54f1b91729712272f1f73ad3f0e7d7d66 /libmpcodecs/mp_image.c | |
| parent | 9caae9b385a6de3f4dae98bebb1be64a997c1472 (diff) | |
| parent | 27b88a09c5319deb62221b8cd0ecc14cd1136e4a (diff) | |
| download | mpv-a77e5f07ed513233314c18f3e45490fdfa11f6ba.tar.bz2 mpv-a77e5f07ed513233314c18f3e45490fdfa11f6ba.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'libmpcodecs/mp_image.c')
| -rw-r--r-- | libmpcodecs/mp_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 4d2892cf81..88702dde60 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -123,9 +123,9 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ } mpi->flags|=MP_IMGFLAG_YUV; mpi->num_planes=3; - if (mp_get_chroma_shift(out_fmt, NULL, NULL)) { + if (mp_get_chroma_shift(out_fmt, NULL, NULL, NULL)) { mpi->flags|=MP_IMGFLAG_PLANAR; - mpi->bpp = mp_get_chroma_shift(out_fmt, &mpi->chroma_x_shift, &mpi->chroma_y_shift); + mpi->bpp = mp_get_chroma_shift(out_fmt, &mpi->chroma_x_shift, &mpi->chroma_y_shift, NULL); mpi->chroma_width = mpi->width >> mpi->chroma_x_shift; mpi->chroma_height = mpi->height >> mpi->chroma_y_shift; } |