eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-04 14:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of code.dyne.org:veejay

Browse Source 
Conflicts:
	veejay-current/veejay-client/configure.ac
	veejay-current/veejay-server/configure.ac
	veejay-current/veejay-server/libel/vj-avcodec.c
	veejay-current/veejay-server/libel/vj-el.c
	veejay-current/veejay-server/libstream/v4l2utils.c
	veejay-current/veejay-server/libvje/effects/chameleon.c
This commit is contained in:
niels
2014-11-22 20:59:53 +01:00
parent 3057db6d5d 136a4bf5dc
commit 8d2ce16227
63 changed files with 1381 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veejay-current/veejay-server/libyuv/yuvconv.c
View File

@@ -577,7 +577,7 @@ void *yuv_fx_context_create( VJFrame *src, VJFrame *dst, int src_fmt, int dst_fm
void yuv_fx_context_process( void *ctx, VJFrame *src, VJFrame *dst )
{
sws_scale( ctx, src->data, src->stride,0,src->height,dst->data,dst->stride );
sws_scale( (struct SwsContext*) ctx, src->data, src->stride,0,src->height,dst->data,dst->stride );
}
void yuv_fx_context_destroy( void *ctx )
@@ -1274,10 +1274,8 @@ void yuv_convert_and_scale_rgb(void *sws , VJFrame *src, VJFrame *dst)
void yuv_convert_and_scale(void *sws , VJFrame *src, VJFrame *dst)
{
vj_sws *s = (vj_sws*) sws;
int src_stride[3];
int dst_stride[3];
int src_stride[3] = { src->width,0,0 };
int dst_stride[3] = { dst->width,0,0 };
/*
int n = 0;
if( src->format == PIX_FMT_RGBA || src->format == PIX_FMT_BGRA || src->format == PIX_FMT_ARGB ||