diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-04-02 00:39:58 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-04-02 11:39:26 +0200 |
| commit | 0ca0924c10d9617a5793964bf79655424ef32b68 (patch) | |
| tree | 5bcddafc256736c4e2b5dcc5361b1d96ef1fcd92 | |
| parent | c61114834018336d39ea4efee705f3dd973f4d15 (diff) | |
| download | ffmpeg-0ca0924c10d9617a5793964bf79655424ef32b68.tar.gz | |
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 61f0d4705d..3a956f4f8a 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1051,11 +1051,13 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR48) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR555) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR565) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB48) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGBA64) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_XYZ12)) c->swscale = packed_16bpc_bswap; diff --git a/libswscale/utils.c b/libswscale/utils.c index 7534be9366..e438c88d0d 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -133,8 +133,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUVA444P16LE]= { 1, 1 }, [AV_PIX_FMT_RGB48BE] = { 1, 1 }, [AV_PIX_FMT_RGB48LE] = { 1, 1 }, - [AV_PIX_FMT_RGBA64BE] = { 0, 0 }, - [AV_PIX_FMT_RGBA64LE] = { 0, 0 }, + [AV_PIX_FMT_RGBA64BE] = { 0, 0, 1 }, + [AV_PIX_FMT_RGBA64LE] = { 0, 0, 1 }, [AV_PIX_FMT_RGB565BE] = { 1, 1 }, [AV_PIX_FMT_RGB565LE] = { 1, 1 }, [AV_PIX_FMT_RGB555BE] = { 1, 1 }, @@ -156,8 +156,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_Y400A] = { 1, 0 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 }, - [AV_PIX_FMT_BGRA64BE] = { 0, 0 }, - [AV_PIX_FMT_BGRA64LE] = { 0, 0 }, + [AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 }, + [AV_PIX_FMT_BGRA64LE] = { 0, 0, 1 }, [AV_PIX_FMT_YUV420P9BE] = { 1, 1 }, [AV_PIX_FMT_YUV420P9LE] = { 1, 1 }, [AV_PIX_FMT_YUV420P10BE] = { 1, 1 }, |