]>
Commit | Line | Data |
---|---|---|
abbb3899 JP |
1 | From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001 |
2 | From: Danny Milosavljevic <dannym@scratchpost.org> | |
3 | Date: Mon, 11 Feb 2019 16:07:12 +0100 | |
4 | Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer | |
5 | frame formats in the chroma_table | |
6 | ||
7 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | |
8 | --- | |
9 | modules/codec/vpx.c | 3 ++- | |
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
11 | ||
12 | diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c | |
13 | index f03c7fae62..59b3acdef7 100644 | |
14 | --- a/modules/codec/vpx.c | |
15 | +++ b/modules/codec/vpx.c | |
16 | @@ -117,6 +117,7 @@ static const struct | |
17 | { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, | |
18 | ||
19 | { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, | |
20 | +#if VPX_IMAGE_ABI_VERSION < 5 | |
21 | { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, | |
22 | { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, | |
23 | { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, | |
24 | @@ -129,7 +130,7 @@ static const struct | |
25 | ||
26 | { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, | |
27 | { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, | |
28 | - | |
29 | +#endif | |
30 | { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, | |
31 | { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, | |
32 | ||
33 | -- | |
34 | 2.18.1 | |
35 |