diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2016-10-12 21:30:34 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-10 00:33:12 +0100 |
commit | 2c7d8cbd666d8d9a78f9919ab4ccad6402427bd5 (patch) | |
tree | 09d8ae29d35847fcde8ad9d4894d93e59c03b910 /libswscale | |
parent | 873d06c76ea5379076a90329b234e77b54525263 (diff) | |
download | ffmpeg-2c7d8cbd666d8d9a78f9919ab4ccad6402427bd5.tar.gz |
swscale: Add the GBRAP12 output
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/output.c | 2 | ||||
-rw-r--r-- | libswscale/utils.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index a05fed8afa..6ef5cb40d1 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2405,6 +2405,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRP16BE: case AV_PIX_FMT_GBRP16LE: case AV_PIX_FMT_GBRAP: + case AV_PIX_FMT_GBRAP12BE: + case AV_PIX_FMT_GBRAP12LE: *yuv2anyX = yuv2gbrp_full_X_c; break; } diff --git a/libswscale/utils.c b/libswscale/utils.c index 0aef672041..6e57ad324c 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -222,8 +222,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRAP10BE] = { 1, 0 }, [AV_PIX_FMT_GBRP12LE] = { 1, 1 }, [AV_PIX_FMT_GBRP12BE] = { 1, 1 }, - [AV_PIX_FMT_GBRAP12LE] = { 1, 0 }, - [AV_PIX_FMT_GBRAP12BE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP12LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRP14LE] = { 1, 1 }, [AV_PIX_FMT_GBRP14BE] = { 1, 1 }, [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, |