diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-05-05 09:38:15 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-05-06 12:04:31 -0400 |
| commit | 711d8812adc18f989584e224c82bcf6d2207a7ae (patch) | |
| tree | 2e0d3a156e13323ed760cf2fa226efd1b404c723 | |
| parent | 57f970a7046f9a420e1d2c0683c8f719abafb7ef (diff) | |
| download | ffmpeg-711d8812adc18f989584e224c82bcf6d2207a7ae.tar.gz | |
swscale: add yuv440p10/12 pixfmts.
| -rw-r--r-- | libswscale/input.c | 8 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 7b3b7060e6..1f04fc2752 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -931,9 +931,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV420P9LE: case AV_PIX_FMT_YUV422P10LE: + case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV422P12LE: + case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV444P12LE: case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV422P14LE: @@ -958,9 +960,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV444P9BE: case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV444P12BE: case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P12BE: @@ -1197,9 +1201,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV420P9LE: case AV_PIX_FMT_YUV444P10LE: + case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV422P10LE: case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV444P12LE: + case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV444P14LE: @@ -1229,9 +1235,11 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV420P9BE: case AV_PIX_FMT_YUV444P10BE: + case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV420P10BE: case AV_PIX_FMT_YUV444P12BE: + case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV420P12BE: case AV_PIX_FMT_YUV444P14BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 490290f795..b426fa188b 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1694,6 +1694,8 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P14) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P16) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P10) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P9) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P10) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P12) || diff --git a/libswscale/utils.c b/libswscale/utils.c index 45e4b7cc8e..f9f4ec6cb7 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -119,6 +119,10 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GRAY16LE] = { 1, 1 }, [AV_PIX_FMT_YUV440P] = { 1, 1 }, [AV_PIX_FMT_YUVJ440P] = { 1, 1 }, + [AV_PIX_FMT_YUV440P10LE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P10BE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P12LE] = { 1, 1 }, + [AV_PIX_FMT_YUV440P12BE] = { 1, 1 }, [AV_PIX_FMT_YUVA420P] = { 1, 1 }, [AV_PIX_FMT_YUVA422P] = { 1, 1 }, [AV_PIX_FMT_YUVA444P] = { 1, 1 }, |