diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-21 08:24:34 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-21 08:24:39 +0100 |
commit | fa8db3f5975e4729bde7034315e9512367c0fdd0 (patch) | |
tree | 2e8d7c0ac5b1d6ad35a0374142a042b626236474 /libswscale | |
parent | 4b192ffdbe226461d8a07fd36d655ec13b2c7582 (diff) | |
parent | de8e096c7eda2bce76efd0a1c1c89d37348c2414 (diff) | |
download | ffmpeg-streaming-fa8db3f5975e4729bde7034315e9512367c0fdd0.zip ffmpeg-streaming-fa8db3f5975e4729bde7034315e9512367c0fdd0.tar.gz |
Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'
* commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414':
swscale: Consistently order input YUV pixel formats
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/input.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index f32f896..04a5190 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1049,60 +1049,60 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->readChrPlanar = planar_rgb_to_uv; break; #if HAVE_BIGENDIAN - case AV_PIX_FMT_YUV444P9LE: - case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV420P9LE: + case AV_PIX_FMT_YUV422P9LE: + case AV_PIX_FMT_YUV444P9LE: + case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV422P10LE: case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV444P10LE: - case AV_PIX_FMT_YUV420P10LE: + case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV444P12LE: - case AV_PIX_FMT_YUV420P12LE: + case AV_PIX_FMT_YUV420P14LE: case AV_PIX_FMT_YUV422P14LE: case AV_PIX_FMT_YUV444P14LE: - case AV_PIX_FMT_YUV420P14LE: case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: - case AV_PIX_FMT_YUVA444P9LE: - case AV_PIX_FMT_YUVA422P9LE: case AV_PIX_FMT_YUVA420P9LE: - case AV_PIX_FMT_YUVA444P10LE: - case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA422P9LE: + case AV_PIX_FMT_YUVA444P9LE: case AV_PIX_FMT_YUVA420P10LE: + case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA444P10LE: case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: c->chrToYV12 = bswap16UV_c; break; #else - case AV_PIX_FMT_YUV444P9BE: - case AV_PIX_FMT_YUV422P9BE: case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV422P9BE: + case AV_PIX_FMT_YUV444P9BE: + case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV444P10BE: - case AV_PIX_FMT_YUV422P10BE: - case AV_PIX_FMT_YUV420P10BE: + case AV_PIX_FMT_YUV420P12BE: + case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV444P12BE: - case AV_PIX_FMT_YUV422P12BE: - case AV_PIX_FMT_YUV420P12BE: - case AV_PIX_FMT_YUV444P14BE: - case AV_PIX_FMT_YUV422P14BE: case AV_PIX_FMT_YUV420P14BE: + case AV_PIX_FMT_YUV422P14BE: + case AV_PIX_FMT_YUV444P14BE: case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: - case AV_PIX_FMT_YUVA444P9BE: - case AV_PIX_FMT_YUVA422P9BE: case AV_PIX_FMT_YUVA420P9BE: - case AV_PIX_FMT_YUVA444P10BE: - case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA422P9BE: + case AV_PIX_FMT_YUVA444P9BE: case AV_PIX_FMT_YUVA420P10BE: + case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA444P10BE: case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA444P16BE: @@ -1344,20 +1344,20 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->readLumPlanar = planar_rgb_to_y; break; #if HAVE_BIGENDIAN - case AV_PIX_FMT_YUV444P9LE: - 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_YUV422P9LE: + case AV_PIX_FMT_YUV444P9LE: case AV_PIX_FMT_YUV420P10LE: - case AV_PIX_FMT_YUV444P12LE: - case AV_PIX_FMT_YUV440P12LE: - case AV_PIX_FMT_YUV422P12LE: + case AV_PIX_FMT_YUV422P10LE: + case AV_PIX_FMT_YUV440P10LE: + case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV420P12LE: - case AV_PIX_FMT_YUV444P14LE: - case AV_PIX_FMT_YUV422P14LE: + case AV_PIX_FMT_YUV422P12LE: + case AV_PIX_FMT_YUV440P12LE: + case AV_PIX_FMT_YUV444P12LE: case AV_PIX_FMT_YUV420P14LE: + case AV_PIX_FMT_YUV422P14LE: + case AV_PIX_FMT_YUV444P14LE: case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: @@ -1369,12 +1369,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_P016LE: c->lumToYV12 = bswap16Y_c; break; - case AV_PIX_FMT_YUVA444P9LE: - case AV_PIX_FMT_YUVA422P9LE: case AV_PIX_FMT_YUVA420P9LE: - case AV_PIX_FMT_YUVA444P10LE: - case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA422P9LE: + case AV_PIX_FMT_YUVA444P9LE: case AV_PIX_FMT_YUVA420P10LE: + case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA444P10LE: case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: @@ -1382,20 +1382,20 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->alpToYV12 = bswap16Y_c; break; #else - case AV_PIX_FMT_YUV444P9BE: - 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_YUV422P9BE: + case AV_PIX_FMT_YUV444P9BE: case AV_PIX_FMT_YUV420P10BE: - case AV_PIX_FMT_YUV444P12BE: - case AV_PIX_FMT_YUV440P12BE: - case AV_PIX_FMT_YUV422P12BE: + case AV_PIX_FMT_YUV422P10BE: + case AV_PIX_FMT_YUV440P10BE: + case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV420P12BE: - case AV_PIX_FMT_YUV444P14BE: - case AV_PIX_FMT_YUV422P14BE: + case AV_PIX_FMT_YUV422P12BE: + case AV_PIX_FMT_YUV440P12BE: + case AV_PIX_FMT_YUV444P12BE: case AV_PIX_FMT_YUV420P14BE: + case AV_PIX_FMT_YUV422P14BE: + case AV_PIX_FMT_YUV444P14BE: case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: @@ -1407,12 +1407,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_P016BE: c->lumToYV12 = bswap16Y_c; break; - case AV_PIX_FMT_YUVA444P9BE: - case AV_PIX_FMT_YUVA422P9BE: case AV_PIX_FMT_YUVA420P9BE: - case AV_PIX_FMT_YUVA444P10BE: - case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA422P9BE: + case AV_PIX_FMT_YUVA444P9BE: case AV_PIX_FMT_YUVA420P10BE: + case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA444P10BE: case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA444P16BE: |