summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-01 23:58:48 +0200
committerwm4 <wm4@nowhere>2013-05-04 01:32:23 +0200
commit16d40828aecf4028acadeeecaf0294756298f970 (patch)
treed566497e3c090d5d1387381bc4f8c71f167904c2 /video
parent767cbb77ed62023002374185810ea0c1fd9d41b8 (diff)
downloadmpv-16d40828aecf4028acadeeecaf0294756298f970.tar.bz2
mpv-16d40828aecf4028acadeeecaf0294756298f970.tar.xz
video: fix setting XYZ flag
Commit 9e0b68a didn't really do this correctly, failure at basic logic.
Diffstat (limited to 'video')
-rw-r--r--video/img_format.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/video/img_format.c b/video/img_format.c
index 46b5d7a250..06fd8e7799 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -194,12 +194,12 @@ static struct mp_imgfmt_desc get_avutil_fmt(enum PixelFormat fmt)
desc.plane_bits = planedepth[0];
- if (!(pd->flags & PIX_FMT_RGB) && fmt != PIX_FMT_MONOBLACK &&
- fmt != PIX_FMT_PAL8)
+ if (mpfmt == IMGFMT_XYZ12_LE || mpfmt == IMGFMT_XYZ12_BE) {
+ desc.flags |= MP_IMGFLAG_XYZ;
+ } else if (!(pd->flags & PIX_FMT_RGB) && fmt != PIX_FMT_MONOBLACK &&
+ fmt != PIX_FMT_PAL8)
{
desc.flags |= MP_IMGFLAG_YUV;
- } else if (mpfmt == IMGFMT_XYZ12_LE || mpfmt == IMGFMT_XYZ12_BE) {
- desc.flags |= MP_IMGFLAG_XYZ;
} else {
desc.flags |= MP_IMGFLAG_RGB;
}