xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'

Browse Source 
* commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414':
  swscale: Consistently order input YUV pixel formats

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-21 08:24:34 +01:00
commit fa8db3f597
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
libswscale/input.c
View File

@ -1049,60 +1049,60 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->readChrPlanar = planar_rgb_to_uv; c->readChrPlanar = planar_rgb_to_uv;
break; break;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
case AV_PIX_FMT_YUV444P9LE:
case AV_PIX_FMT_YUV422P9LE:
case AV_PIX_FMT_YUV420P9LE: 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_YUV422P10LE:
case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV440P10LE:
case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV444P10LE:
case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV420P12LE:
case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV422P12LE:
case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV440P12LE:
case AV_PIX_FMT_YUV444P12LE: case AV_PIX_FMT_YUV444P12LE:
case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV420P14LE:
case AV_PIX_FMT_YUV422P14LE: case AV_PIX_FMT_YUV422P14LE:
case AV_PIX_FMT_YUV444P14LE: case AV_PIX_FMT_YUV444P14LE:
case AV_PIX_FMT_YUV420P14LE:
case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV420P16LE:
case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV422P16LE:
case AV_PIX_FMT_YUV444P16LE: case AV_PIX_FMT_YUV444P16LE:
case AV_PIX_FMT_YUVA444P9LE:
case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA420P9LE: case AV_PIX_FMT_YUVA420P9LE:
case AV_PIX_FMT_YUVA444P10LE: case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA422P10LE: case AV_PIX_FMT_YUVA444P9LE:
case AV_PIX_FMT_YUVA420P10LE: case AV_PIX_FMT_YUVA420P10LE:
case AV_PIX_FMT_YUVA422P10LE:
case AV_PIX_FMT_YUVA444P10LE:
case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA420P16LE:
case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA422P16LE:
case AV_PIX_FMT_YUVA444P16LE: case AV_PIX_FMT_YUVA444P16LE:
c->chrToYV12 = bswap16UV_c; c->chrToYV12 = bswap16UV_c;
break; break;
#else #else
case AV_PIX_FMT_YUV444P9BE:
case AV_PIX_FMT_YUV422P9BE:
case AV_PIX_FMT_YUV420P9BE: 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_YUV440P10BE:
case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV444P10BE:
case AV_PIX_FMT_YUV422P10BE: case AV_PIX_FMT_YUV420P12BE:
case AV_PIX_FMT_YUV420P10BE: case AV_PIX_FMT_YUV422P12BE:
case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV440P12BE:
case AV_PIX_FMT_YUV444P12BE: 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_YUV420P14BE:
case AV_PIX_FMT_YUV422P14BE:
case AV_PIX_FMT_YUV444P14BE:
case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV420P16BE:
case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV422P16BE:
case AV_PIX_FMT_YUV444P16BE: case AV_PIX_FMT_YUV444P16BE:
case AV_PIX_FMT_YUVA444P9BE:
case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA420P9BE: case AV_PIX_FMT_YUVA420P9BE:
case AV_PIX_FMT_YUVA444P10BE: case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA422P10BE: case AV_PIX_FMT_YUVA444P9BE:
case AV_PIX_FMT_YUVA420P10BE: case AV_PIX_FMT_YUVA420P10BE:
case AV_PIX_FMT_YUVA422P10BE:
case AV_PIX_FMT_YUVA444P10BE:
case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA420P16BE:
case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA422P16BE:
case AV_PIX_FMT_YUVA444P16BE: 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; c->readLumPlanar = planar_rgb_to_y;
break; break;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
case AV_PIX_FMT_YUV444P9LE:
case AV_PIX_FMT_YUV422P9LE:
case AV_PIX_FMT_YUV420P9LE: case AV_PIX_FMT_YUV420P9LE:
case AV_PIX_FMT_YUV444P10LE: case AV_PIX_FMT_YUV422P9LE:
case AV_PIX_FMT_YUV440P10LE: case AV_PIX_FMT_YUV444P9LE:
case AV_PIX_FMT_YUV422P10LE:
case AV_PIX_FMT_YUV420P10LE: case AV_PIX_FMT_YUV420P10LE:
case AV_PIX_FMT_YUV444P12LE: case AV_PIX_FMT_YUV422P10LE:
case AV_PIX_FMT_YUV440P12LE: case AV_PIX_FMT_YUV440P10LE:
case AV_PIX_FMT_YUV422P12LE: case AV_PIX_FMT_YUV444P10LE:
case AV_PIX_FMT_YUV420P12LE: case AV_PIX_FMT_YUV420P12LE:
case AV_PIX_FMT_YUV444P14LE: case AV_PIX_FMT_YUV422P12LE:
case AV_PIX_FMT_YUV422P14LE: case AV_PIX_FMT_YUV440P12LE:
case AV_PIX_FMT_YUV444P12LE:
case AV_PIX_FMT_YUV420P14LE: case AV_PIX_FMT_YUV420P14LE:
case AV_PIX_FMT_YUV422P14LE:
case AV_PIX_FMT_YUV444P14LE:
case AV_PIX_FMT_YUV420P16LE: case AV_PIX_FMT_YUV420P16LE:
case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV422P16LE:
case AV_PIX_FMT_YUV444P16LE: case AV_PIX_FMT_YUV444P16LE:
@ -1369,12 +1369,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_P016LE: case AV_PIX_FMT_P016LE:
c->lumToYV12 = bswap16Y_c; c->lumToYV12 = bswap16Y_c;
break; break;
case AV_PIX_FMT_YUVA444P9LE:
case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA420P9LE: case AV_PIX_FMT_YUVA420P9LE:
case AV_PIX_FMT_YUVA444P10LE: case AV_PIX_FMT_YUVA422P9LE:
case AV_PIX_FMT_YUVA422P10LE: case AV_PIX_FMT_YUVA444P9LE:
case AV_PIX_FMT_YUVA420P10LE: case AV_PIX_FMT_YUVA420P10LE:
case AV_PIX_FMT_YUVA422P10LE:
case AV_PIX_FMT_YUVA444P10LE:
case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA420P16LE:
case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA422P16LE:
case AV_PIX_FMT_YUVA444P16LE: case AV_PIX_FMT_YUVA444P16LE:
@ -1382,20 +1382,20 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->alpToYV12 = bswap16Y_c; c->alpToYV12 = bswap16Y_c;
break; break;
#else #else
case AV_PIX_FMT_YUV444P9BE:
case AV_PIX_FMT_YUV422P9BE:
case AV_PIX_FMT_YUV420P9BE: case AV_PIX_FMT_YUV420P9BE:
case AV_PIX_FMT_YUV444P10BE: case AV_PIX_FMT_YUV422P9BE:
case AV_PIX_FMT_YUV440P10BE: case AV_PIX_FMT_YUV444P9BE:
case AV_PIX_FMT_YUV422P10BE:
case AV_PIX_FMT_YUV420P10BE: case AV_PIX_FMT_YUV420P10BE:
case AV_PIX_FMT_YUV444P12BE: case AV_PIX_FMT_YUV422P10BE:
case AV_PIX_FMT_YUV440P12BE: case AV_PIX_FMT_YUV440P10BE:
case AV_PIX_FMT_YUV422P12BE: case AV_PIX_FMT_YUV444P10BE:
case AV_PIX_FMT_YUV420P12BE: case AV_PIX_FMT_YUV420P12BE:
case AV_PIX_FMT_YUV444P14BE: case AV_PIX_FMT_YUV422P12BE:
case AV_PIX_FMT_YUV422P14BE: case AV_PIX_FMT_YUV440P12BE:
case AV_PIX_FMT_YUV444P12BE:
case AV_PIX_FMT_YUV420P14BE: case AV_PIX_FMT_YUV420P14BE:
case AV_PIX_FMT_YUV422P14BE:
case AV_PIX_FMT_YUV444P14BE:
case AV_PIX_FMT_YUV420P16BE: case AV_PIX_FMT_YUV420P16BE:
case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV422P16BE:
case AV_PIX_FMT_YUV444P16BE: case AV_PIX_FMT_YUV444P16BE:
@ -1407,12 +1407,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_P016BE: case AV_PIX_FMT_P016BE:
c->lumToYV12 = bswap16Y_c; c->lumToYV12 = bswap16Y_c;
break; break;
case AV_PIX_FMT_YUVA444P9BE:
case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA420P9BE: case AV_PIX_FMT_YUVA420P9BE:
case AV_PIX_FMT_YUVA444P10BE: case AV_PIX_FMT_YUVA422P9BE:
case AV_PIX_FMT_YUVA422P10BE: case AV_PIX_FMT_YUVA444P9BE:
case AV_PIX_FMT_YUVA420P10BE: case AV_PIX_FMT_YUVA420P10BE:
case AV_PIX_FMT_YUVA422P10BE:
case AV_PIX_FMT_YUVA444P10BE:
case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA420P16BE:
case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA422P16BE:
case AV_PIX_FMT_YUVA444P16BE: case AV_PIX_FMT_YUVA444P16BE: