From 6c1c04ba2160e1716a5c860104ea1ea6156e7cfd Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 4 Dec 2012 09:22:57 +0100 Subject: Fix compilation with Libav Libav doesn't have 12/14 bit planar formats. --- video/fmt-conversion.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'video/fmt-conversion.c') diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index cd223fd525..23c40bb1ac 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -82,24 +82,12 @@ static const struct { {IMGFMT_420P9_BE, PIX_FMT_YUV420P9BE}, {IMGFMT_420P10_LE, PIX_FMT_YUV420P10LE}, {IMGFMT_420P10_BE, PIX_FMT_YUV420P10BE}, - {IMGFMT_420P12_LE, PIX_FMT_YUV420P12LE}, - {IMGFMT_420P12_BE, PIX_FMT_YUV420P12BE}, - {IMGFMT_420P14_LE, PIX_FMT_YUV420P14LE}, - {IMGFMT_420P14_BE, PIX_FMT_YUV420P14BE}, {IMGFMT_422P10_LE, PIX_FMT_YUV422P10LE}, {IMGFMT_422P10_BE, PIX_FMT_YUV422P10BE}, - {IMGFMT_422P12_LE, PIX_FMT_YUV422P12LE}, - {IMGFMT_422P12_BE, PIX_FMT_YUV422P12BE}, - {IMGFMT_422P14_LE, PIX_FMT_YUV422P14LE}, - {IMGFMT_422P14_BE, PIX_FMT_YUV422P14BE}, {IMGFMT_444P9_BE , PIX_FMT_YUV444P9BE}, {IMGFMT_444P9_LE , PIX_FMT_YUV444P9LE}, {IMGFMT_444P10_BE, PIX_FMT_YUV444P10BE}, {IMGFMT_444P10_LE, PIX_FMT_YUV444P10LE}, - {IMGFMT_444P12_BE, PIX_FMT_YUV444P12BE}, - {IMGFMT_444P12_LE, PIX_FMT_YUV444P12LE}, - {IMGFMT_444P14_BE, PIX_FMT_YUV444P14BE}, - {IMGFMT_444P14_LE, PIX_FMT_YUV444P14LE}, {IMGFMT_422P16_LE, PIX_FMT_YUV422P16LE}, {IMGFMT_422P16_BE, PIX_FMT_YUV422P16BE}, {IMGFMT_422P9_LE, PIX_FMT_YUV422P9LE}, @@ -117,6 +105,19 @@ static const struct { // ffmpeg only #if LIBAVUTIL_VERSION_MICRO >= 100 + {IMGFMT_420P12_LE, PIX_FMT_YUV420P12LE}, + {IMGFMT_420P12_BE, PIX_FMT_YUV420P12BE}, + {IMGFMT_420P14_LE, PIX_FMT_YUV420P14LE}, + {IMGFMT_420P14_BE, PIX_FMT_YUV420P14BE}, + {IMGFMT_422P12_LE, PIX_FMT_YUV422P12LE}, + {IMGFMT_422P12_BE, PIX_FMT_YUV422P12BE}, + {IMGFMT_422P14_LE, PIX_FMT_YUV422P14LE}, + {IMGFMT_422P14_BE, PIX_FMT_YUV422P14BE}, + {IMGFMT_444P12_BE, PIX_FMT_YUV444P12BE}, + {IMGFMT_444P12_LE, PIX_FMT_YUV444P12LE}, + {IMGFMT_444P14_BE, PIX_FMT_YUV444P14BE}, + {IMGFMT_444P14_LE, PIX_FMT_YUV444P14LE}, + {IMGFMT_BGR0, PIX_FMT_BGR0}, #endif -- cgit v1.2.3