@@ -86,6 +86,8 @@ int main(int argc, char **argv)

             FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */

             FUNC(6, 6, rgb48tobgr48_nobswap),

             FUNC(6, 6, rgb48tobgr48_bswap),

+            FUNC(8, 6, rgb64to48_nobswap),

+            FUNC(8, 6, rgb64to48_bswap),

             FUNC(8, 6, rgb64tobgr48_nobswap),

             FUNC(8, 6, rgb64tobgr48_bswap),

             FUNC(0, 0, NULL)

@@ -369,3 +369,21 @@ void rgb64tobgr48_ ## need_bswap(const uint8_t *src,                    \

 DEFINE_RGB64TOBGR48(nobswap, 0)

 DEFINE_RGB64TOBGR48(bswap, 1)

+

+#define DEFINE_RGB64TO48(need_bswap, swap)                              \

+void rgb64to48_ ## need_bswap(const uint8_t *src,                       \

+                              uint8_t *dst, int src_size)               \

+{                                                                       \

+    uint16_t *d = (uint16_t *)dst;                                      \

+    uint16_t *s = (uint16_t *)src;                                      \

+    int i, num_pixels = src_size >> 3;                                  \

+                                                                        \

+    for (i = 0; i < num_pixels; i++) {                                  \

+        d[3 * i    ] = swap ? av_bswap16(s[4 * i    ]) : s[4 * i    ];  \

+        d[3 * i + 1] = swap ? av_bswap16(s[4 * i + 1]) : s[4 * i + 1];  \

+        d[3 * i + 2] = swap ? av_bswap16(s[4 * i + 2]) : s[4 * i + 2];  \

+    }                                                                   \

+}

+

+DEFINE_RGB64TO48(nobswap, 0)

+DEFINE_RGB64TO48(bswap, 1)

@@ -56,6 +56,8 @@ void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);

 void   rgb64tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size);

 void rgb48tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);

 void   rgb48tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size);

+void    rgb64to48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);

+void      rgb64to48_bswap(const uint8_t *src, uint8_t *dst, int src_size);

 void    rgb24to32(const uint8_t *src, uint8_t *dst, int src_size);

 void    rgb32to24(const uint8_t *src, uint8_t *dst, int src_size);

 void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size);

@@ -582,6 +582,14 @@ static rgbConvFn findRgbConvFn(SwsContext *c)

               || CONV_IS(BGRA64LE, RGB48BE)

               || CONV_IS(RGBA64BE, BGR48LE)

               || CONV_IS(BGRA64BE, RGB48LE)) conv = rgb64tobgr48_bswap;

+        else if (CONV_IS(RGBA64LE, RGB48LE)

+              || CONV_IS(BGRA64LE, BGR48LE)

+              || CONV_IS(RGBA64BE, RGB48BE)

+              || CONV_IS(BGRA64BE, BGR48BE)) conv = rgb64to48_nobswap;

+        else if (CONV_IS(RGBA64LE, RGB48BE)

+              || CONV_IS(BGRA64LE, BGR48BE)

+              || CONV_IS(RGBA64BE, RGB48LE)

+              || CONV_IS(BGRA64BE, BGR48LE)) conv = rgb64to48_bswap;

     } else

     /* BGR -> BGR */

     if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) ||