Re: [libav-devel] [PATCH 11/14] Move back the function pointers in rgb2rgb.c

[Luca Barbato]

On 04/12/2011 11:26 PM, Alexander Strange wrote:
> 
> On Apr 11, 2011, at 5:07 AM, Luca Barbato wrote:
> 
>> This unbreak darwin.
> 
> When was it broken?

Apparently having the pointers on a separate file upsets it. this patch
and the one causing the issue got dropped in the new patchset.

lu

-- 

Luca Barbato
Gentoo/linux
http://dev.gentoo.org/~lu_zero

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 11/14] Move back the function pointers in rgb2rgb.c

[Alexander Strange]

On Apr 11, 2011, at 5:07 AM, Luca Barbato wrote:

> This unbreak darwin.

When was it broken?

> ---
> libswscale/Makefile|2 +-
> libswscale/rgb2rgb.c   |   65 ++
> libswscale/swscale_functions.c |   67 
> 3 files changed, 66 insertions(+), 68 deletions(-)
> delete mode 100644 libswscale/swscale_functions.c
> 
> diff --git a/libswscale/Makefile b/libswscale/Makefile
> index b8f233f..816f7a8 100644
> --- a/libswscale/Makefile
> +++ b/libswscale/Makefile
> @@ -5,7 +5,7 @@ FFLIBS = avutil
> 
> HEADERS = swscale.h
> 
> -OBJS = options.o rgb2rgb.o swscale.o swscale_functions.o utils.o yuv2rgb.o
> +OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o
> 
> OBJS-$(ARCH_BFIN)  +=  bfin/internal_bfin.o \
>bfin/swscale_bfin.o  \
> diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
> index 9e27e82..cb78bf0 100644
> --- a/libswscale/rgb2rgb.c
> +++ b/libswscale/rgb2rgb.c
> @@ -29,6 +29,71 @@
> #include "swscale.h"
> #include "swscale_internal.h"
> 
> +void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb32to16)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb32to15)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb15to16)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb15to32)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb16to15)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb16to32)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb24to16)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb24to15)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
> +void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
> +
> +void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t 
> *vsrc, uint8_t *dst,
> +   long width, long height,
> +   long lumStride, long chromStride, long dstStride);
> +void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t 
> *vsrc, uint8_t *dst,
> +   long width, long height,
> +   long lumStride, long chromStride, long dstStride);
> +void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const 
> uint8_t *vsrc, uint8_t *dst,
> +  long width, long height,
> +  long lumStride, long chromStride, long dstStride);
> +void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const 
> uint8_t *vsrc, uint8_t *dst,
> +  long width, long height,
> +  long lumStride, long chromStride, long dstStride);
> +void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t 
> *vdst,
> +   long width, long height,
> +   long lumStride, long chromStride, long srcStride);
> +void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, 
> uint8_t *vdst,
> +long width, long height,
> +long lumStride, long chromStride, long srcStride);
> +void (*planar2x)(const uint8_t *src, uint8_t *dst, long width, long height,
> + long srcStride, long dstStride);
> +void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t 
> *dst,
> +long width, long height, long src1Stride,
> +long src2Stride, long dstStride);
> +void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
> +uint8_t *dst1, uint8_t *dst2,
> +long width, long height,
> +long srcStride1, long srcStride2,
> +long dstStride1, long dstStride2);
> +void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t 
> *src3,
> + uint8_t *dst,
> + long width, long height,
> + long srcStride1, long srcStride2,
> + long srcStride3, long dstStride);
> +void (*uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const 
> uint8_t *src,
> + long width, long height,
> + long lumStride, long chromStride, long srcStride);
> +void (*uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const 
> uint8_t *src,
> +

Re: [libav-devel] [PATCH 11/14] Move back the function pointers in rgb2rgb.c

[Kostya]

On Mon, Apr 11, 2011 at 11:07:44AM +0200, Luca Barbato wrote:
> This unbreak darwin.

unbreakS
Also maybe you should merge it with patch 1 then?
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel