diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2016-09-24 20:22:56 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-09-27 18:48:30 +0200 |
| commit | 0aebbbd024762d3c9c13f4bf0607710feee5e73a (patch) | |
| tree | 480d0a75c700758f404847656e3d1aa64d63fab8 /libswscale | |
| parent | 85406e7a8d5ad12db15ef9d713d0bc3d870fafee (diff) | |
| download | ffmpeg-0aebbbd024762d3c9c13f4bf0607710feee5e73a.tar.gz | |
pixfmt: Add yuv422p12 pixel format
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 4 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 9c0a32c4c6..76a4700122 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -816,6 +816,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P10LE: case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV420P12LE: + case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: @@ -838,6 +839,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV420P12BE: + case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: @@ -1036,6 +1038,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P10LE: case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV420P12LE: + case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: @@ -1062,6 +1065,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV420P12BE: + case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 87331ae818..31706ca4c2 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1158,9 +1158,11 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 && dstFormat != AV_PIX_FMT_P010LE && dstFormat != AV_PIX_FMT_P010BE && dstFormat != AV_PIX_FMT_YUV420P12LE && dstFormat != AV_PIX_FMT_YUV420P12BE && + dstFormat != AV_PIX_FMT_YUV422P12LE && dstFormat != AV_PIX_FMT_YUV422P12BE && srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21 && srcFormat != AV_PIX_FMT_P010LE && srcFormat != AV_PIX_FMT_P010BE && - srcFormat != AV_PIX_FMT_YUV420P12LE && srcFormat != AV_PIX_FMT_YUV420P12BE)) + srcFormat != AV_PIX_FMT_YUV420P12LE && srcFormat != AV_PIX_FMT_YUV420P12BE && + srcFormat != AV_PIX_FMT_YUV422P12LE && srcFormat != AV_PIX_FMT_YUV422P12BE)) { if (isPacked(c->srcFormat)) c->swscale = packedCopyWrapper; diff --git a/libswscale/utils.c b/libswscale/utils.c index 06b9c1c28b..dc442929b9 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -171,6 +171,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUV422P9LE] = { 1, 1 }, [AV_PIX_FMT_YUV422P10BE] = { 1, 1 }, [AV_PIX_FMT_YUV422P10LE] = { 1, 1 }, + [AV_PIX_FMT_YUV422P12BE] = { 1, 1 }, + [AV_PIX_FMT_YUV422P12LE] = { 1, 1 }, [AV_PIX_FMT_YUV444P9BE] = { 1, 1 }, [AV_PIX_FMT_YUV444P9LE] = { 1, 1 }, [AV_PIX_FMT_YUV444P10BE] = { 1, 1 }, |