diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 12:53:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:11:51 +0100 |
| commit | add7513e64e6db255e30fba544068ed2ab5e7b3e (patch) | |
| tree | 59bf00c7b1d6f75c5bc034500e3669cb76462396 /libswscale/input.c | |
| parent | 14f1fa56b2aef1f4b2036ebdc7c6665ef68052c0 (diff) | |
| parent | fa8fcab1e0d31074c0644c4ac5194474c6c26415 (diff) | |
| download | ffmpeg-add7513e64e6db255e30fba544068ed2ab5e7b3e.tar.gz | |
Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
x86: h264_chromamc_10bit: drop pointless PAVG %define
x86: mmx2 ---> mmxext in function names
swscale: do not forget to swap data in formats with different endianness
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/gradfun.c
libswscale/input.c
libswscale/utils.c
libswscale/x86/swscale.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
| -rw-r--r-- | libswscale/input.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 43a67aac90..d3aeb22151 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -935,6 +935,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) 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: @@ -945,7 +946,6 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: - case AV_PIX_FMT_YUV444P16LE: c->chrToYV12 = bswap16UV_c; break; #else @@ -1186,6 +1186,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P16LE: case AV_PIX_FMT_YUV444P16LE: + case AV_PIX_FMT_GRAY16LE: + c->lumToYV12 = bswap16Y_c; + break; case AV_PIX_FMT_YUVA444P9LE: case AV_PIX_FMT_YUVA422P9LE: case AV_PIX_FMT_YUVA420P9LE: @@ -1195,8 +1198,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: - case AV_PIX_FMT_GRAY16LE: c->lumToYV12 = bswap16Y_c; + c->alpToYV12 = bswap16Y_c; break; #else case AV_PIX_FMT_YUV444P9BE: @@ -1215,6 +1218,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUV422P16BE: case AV_PIX_FMT_YUV444P16BE: + case AV_PIX_FMT_GRAY16BE: + c->lumToYV12 = bswap16Y_c; + break; case AV_PIX_FMT_YUVA444P9BE: case AV_PIX_FMT_YUVA422P9BE: case AV_PIX_FMT_YUVA420P9BE: @@ -1224,8 +1230,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_YUVA420P16BE: case AV_PIX_FMT_YUVA422P16BE: case AV_PIX_FMT_YUVA444P16BE: - case AV_PIX_FMT_GRAY16BE: c->lumToYV12 = bswap16Y_c; + c->alpToYV12 = bswap16Y_c; break; #endif case AV_PIX_FMT_YUYV422: |