ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Tue Mar 21 08:24:34 2017 +0100| [fa8db3f5975e4729bde7034315e9512367c0fdd0] | committer: Clément Bœsch
Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414' * commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414': swscale: Consistently order input YUV pixel formats Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa8db3f5975e4729bde7034315e9512367c0fdd0 --- libswscale/input.c | 98 +++++++++++++++++++++++++++--------------------------- 1 file 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: ====================================================================== diff --cc libswscale/input.c index f32f896,69c6729..04a5190 --- a/libswscale/input.c +++ b/libswscale/input.c @@@ -1049,60 -809,42 +1049,60 @@@ av_cold void ff_sws_init_input_funcs(Sw 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,37 -1027,24 +1344,37 @@@ 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: + + case AV_PIX_FMT_GRAY10LE: + case AV_PIX_FMT_GRAY12LE: case AV_PIX_FMT_GRAY16LE: + + 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,37 -1052,24 +1382,37 @@@ 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: + + case AV_PIX_FMT_GRAY10BE: + case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16BE: + + 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: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
