aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-10-12 21:30:34 +0200
committerLuca Barbato <lu_zero@gentoo.org>2016-10-12 21:33:34 +0200
commit881477c77bb10c3c62fda111b0f1f3554968bc78 (patch)
tree52acc2826456f8f24b6d3e5957b7cdf18650bc90 /libswscale
parent81f1f6c3f62b1dd5e7433583929d46958522ceb3 (diff)
downloadffmpeg-881477c77bb10c3c62fda111b0f1f3554968bc78.tar.gz
swscale: Add the GBRAP12 output
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/output.c2
-rw-r--r--libswscale/utils.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/libswscale/output.c b/libswscale/output.c
index a8845f56ac..d0c303c3a8 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -1457,6 +1457,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
case AV_PIX_FMT_GBRP10LE:
case AV_PIX_FMT_GBRP12BE:
case AV_PIX_FMT_GBRP12LE:
+ case AV_PIX_FMT_GBRAP12BE:
+ case AV_PIX_FMT_GBRAP12LE:
case AV_PIX_FMT_GBRP16BE:
case AV_PIX_FMT_GBRP16LE:
case AV_PIX_FMT_GBRAP:
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 5c7d6316ca..1c3bbb3305 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -189,8 +189,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GBRP16LE] = { 1, 0 },
[AV_PIX_FMT_GBRP16BE] = { 1, 0 },
[AV_PIX_FMT_GBRAP] = { 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_GBRAP16LE] = { 1, 0 },
[AV_PIX_FMT_GBRAP16BE] = { 1, 0 },
[AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 },