diff --git a/veejay-current/plugin-packs/lvdcrop/plugins/lvd_cropscale.c b/veejay-current/plugin-packs/lvdcrop/plugins/lvd_cropscale.c
index c2da3a39..5f246aed 100644
--- a/veejay-current/plugin-packs/lvdcrop/plugins/lvd_cropscale.c
+++ b/veejay-current/plugin-packs/lvdcrop/plugins/lvd_cropscale.c
@@ -13,6 +13,8 @@
 LIVIDO_PLUGIN
 #include	"utils.h"
 #include	"livido-utils.c"
+#include	"avcommon.h"
+
 #define RUP8(num)(((num)+8)&~8)
 
 #include <libavutil/cpu.h>
diff --git a/veejay-current/plugin-packs/lvdshared/plugins/Makefile.am b/veejay-current/plugin-packs/lvdshared/plugins/Makefile.am
index 9e4f2a5c..ea4df31f 100644
--- a/veejay-current/plugin-packs/lvdshared/plugins/Makefile.am
+++ b/veejay-current/plugin-packs/lvdshared/plugins/Makefile.am
@@ -5,11 +5,10 @@ lvd_shmout_la_SOURCES = lvd_shmout.c
 
 INCLUDES=$(FFMPEG_CFLAGS) -I$(top_srcdir)/lvdshm
 AM_CFLAGS=-I@top_srcdir@/include $(OPTCFLAGS) -DSILENT
-AM_LDFLAGS=-module -avoid-version -lm -export-dynamic -lgmic -lstdc++ -DDYNAMIC -rdynamic $(FFMPEG_LIBS)
+AM_LDFLAGS=-module -avoid-version -lm -export-dynamic -lstdc++ -DDYNAMIC -rdynamic $(FFMPEG_LIBS)
 AM_LIBTOOLFLAGS = --tag=disable-static
 
 lividoplugindir = @libdir@/livido-plugins
-liblvdgmicdir= @libdir@/livido-plugins
 
 install-lividopluginLTLIBRARIES:$(lividoplugin_LTLIBRARIES)
 	mkdir -p $(DESTDIR)/$(lividoplugindir)
diff --git a/veejay-current/plugin-packs/lvdshared/plugins/lvd_shmin.c b/veejay-current/plugin-packs/lvdshared/plugins/lvd_shmin.c
index 40658291..3392f5ab 100644
--- a/veejay-current/plugin-packs/lvdshared/plugins/lvd_shmin.c
+++ b/veejay-current/plugin-packs/lvdshared/plugins/lvd_shmin.c
@@ -41,6 +41,7 @@
 LIVIDO_PLUGIN
 #include	"utils.h"
 #include	"livido-utils.c"
+#include	"avcommon.h"
 
 typedef struct
 {
diff --git a/veejay-current/sendVIMS/Makefile.defs b/veejay-current/sendVIMS/Makefile.defs
index e9f5d4ad..4af1171d 100644
--- a/veejay-current/sendVIMS/Makefile.defs
+++ b/veejay-current/sendVIMS/Makefile.defs
@@ -1,3 +1,3 @@
 CC = cc
 PREFIX = /usr/local/
-OPTI_CFLAGS = -O3 -fomit-frame-pointer -ffast-math -funroll-loops -fPIC
+OPTI_CFLAGS = -fPIC -O3 -fomit-frame-pointer -ffast-math -funroll-loops
diff --git a/veejay-current/veejay-client/src/sequence.c b/veejay-current/veejay-client/src/sequence.c
index 2e79a7b4..8b567534 100644
--- a/veejay-current/veejay-client/src/sequence.c
+++ b/veejay-current/veejay-client/src/sequence.c
@@ -25,6 +25,7 @@
 #include <veejay/vims.h>
 #include <veejay/vj-client.h>
 #include <veejay/vj-msg.h>
+#include <veejay/avcommon.h>
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <sys/time.h>
diff --git a/veejay-current/veejay-client/src/utils.c b/veejay-current/veejay-client/src/utils.c
index 2cbae205..1b1bc5c4 100644
--- a/veejay-current/veejay-client/src/utils.c
+++ b/veejay-current/veejay-client/src/utils.c
@@ -76,8 +76,8 @@ void	generator_to_arr( char *line, int *array)
 
 		while(*end == ' ') {
 			*end++;
-			if(*end == NULL)
-				break;
+			if(end == NULL)
+			     break;
 		}
 
 		p = end;
diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
index 8f2c2770..15176044 100644
--- a/veejay-current/veejay-client/src/vj-api.c
+++ b/veejay-current/veejay-client/src/vj-api.c
@@ -43,6 +43,8 @@
 #include <veejay/vj-client.h>
 #include <veejay/vj-msg.h>
 #include <veejay/vims.h>
+#include <veejay/avcommon.h>
+#include <veejay/vevo.h>
 #include <src/vj-api.h>
 #include <fcntl.h>
 #include "mpegconsts.h"
@@ -72,7 +74,6 @@
 #include <libavutil/pixfmt.h>
 #include <veejay/vevo.h>
 #include <veejay/libvevo.h>
-#include <veejay/vevo.h>
 #include <src/vmidi.h>
 //if gtk2_6 is not defined, 2.4 is assumed.
 #ifdef GTK_CHECK_VERSION
@@ -4479,7 +4480,7 @@ void	load_effectlist_info()
 				char *newName = vj_calloc( len );
 				veejay_memcpy(newName,ec->description+6, len-6 );
 				gtk_list_store_set( store3,&iter, FX_STRING, newName, -1 );
-				vevo_property_set( fx_list_, newName, LIVIDO_ATOM_TYPE_INT,1,&(ec->id));
+				vevo_property_set( fx_list_, newName, VEVO_ATOM_TYPE_INT,1,&(ec->id));
 				free(newName);
 			}
 			else 
@@ -4489,14 +4490,14 @@ void	load_effectlist_info()
 				{
 					gtk_list_store_append( store2, &iter );
 					gtk_list_store_set( store2, &iter, FX_STRING, name, -1 );
-					vevo_property_set( fx_list_, name, LIVIDO_ATOM_TYPE_INT, 1, &(ec->id));
+					vevo_property_set( fx_list_, name, VEVO_ATOM_TYPE_INT, 1, &(ec->id));
 				}
 				else
 				{
 					// tree_effectlist
 					gtk_list_store_append( store, &iter );
 					gtk_list_store_set( store, &iter, FX_STRING, name, -1 );
-					vevo_property_set( fx_list_, name, LIVIDO_ATOM_TYPE_INT, 1, &(ec->id));
+					vevo_property_set( fx_list_, name, VEVO_ATOM_TYPE_INT, 1, &(ec->id));
 				}
 			}
 		}
diff --git a/veejay-current/veejay-server/libel/Makefile.am b/veejay-current/veejay-server/libel/Makefile.am
index f47ab0ef..0fb26eca 100644
--- a/veejay-current/veejay-server/libel/Makefile.am
+++ b/veejay-current/veejay-server/libel/Makefile.am
@@ -22,5 +22,4 @@ VJEL_LIB_FILE = libel.la
 noinst_LTLIBRARIES = $(VJEL_LIB_FILE)
 libel_la_SOURCES = vj-mmap.c elcache.c avilib.c lav_io.c vj-dv.c rawdv.c pixbuf.c vj-avcodec.c avhelper.c vj-el.c
 
-EXTRA_DIST = avilib.h elcache.h lav_io.h pixbuf.h \
-                     rawdv.h vj-avcodec.h vj-dv.h vj-el.h vj-mmap.h
+pkginclude_HEADERS=avcommon.h
diff --git a/veejay-current/veejay-server/libel/avcommon.h b/veejay-current/veejay-server/libel/avcommon.h
index 5650f81a..ff0fea2e 100644
--- a/veejay-current/veejay-server/libel/avcommon.h
+++ b/veejay-current/veejay-server/libel/avcommon.h
@@ -12,5 +12,87 @@
 #ifndef PIX_FMT_YUVA444P
 #define PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P
 #endif
+#ifndef PIX_FMT_YUVA420P
+#define PIX_FMT_YUVA420P AV_PIX_FMT_YUVA420P
+#endif
+#ifndef PIX_FMT_YUV422P
+#define PIX_FMT_YUV422P AV_PIX_FMT_YUV422P
+#endif
+#ifndef PIX_FMT_YUVJ422P
+#define PIX_FMT_YUVJ422P AV_PIX_FMT_YUVJ422P
+#endif
+#ifndef PIX_FMT_YUV420P
+#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
+#endif
+#ifndef PIX_FMT_YUVJ420P
+#define PIX_FMT_YUVJ420P AV_PIX_FMT_YUVJ420P
+#endif
+#ifndef PIX_FMT_YUV444P
+#define PIX_FMT_YUV444P AV_PIX_FMT_YUV444P
+#endif
+#ifndef PIX_FMT_RGB24
+#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24
+#endif
+#ifndef PIX_FMT_YUVJ444P
+#define PIX_FMT_YUVJ444P AV_PIX_FMT_YUVJ444P
+#endif
+#ifndef PIX_FMT_YUVJ422P
+#define PIX_FMT_YUVJ422P AV_PIX_FMT_YUVJ422P
+#endif
+#ifndef PIX_FMT_RGB32
+#define PIX_FMT_RGB32 AV_PIX_FMT_RGB32
+#endif
+#ifndef PIX_FMT_BGR32
+#define PIX_FMT_BGR32 AV_PIX_FMT_BGR32
+#endif
+#ifndef PIX_FMT_RGBA
+#define PIX_FMT_RGBA AV_PIX_FMT_RGBA
+#endif
+#ifndef PIX_FMT_BGRA
+#define PIX_FMT_BGRA AV_PIX_FMT_BGRA
+#endif
+#ifndef PIX_FMT_BGR24
+#define PIX_FMT_BGR24 AV_PIX_FMT_BGR24
+#endif
+#ifndef PIX_FMT_GRAY8
+#define PIX_FMT_GRAY8 AV_PIX_FMT_GRAY8
+#endif
+#ifndef PIX_FMT_RB32_1
+#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
+#endif
+#ifndef PIX_FMT_YUYV422
+#define PIX_FMT_YUYV422 AV_PIX_FMT_YUYV422
+#endif
+#ifndef PIX_FMT_UYVY422
+#define PIX_FMT_UYVY422 AV_PIX_FMT_UYVY422
+#endif
+#ifndef PIX_FMT_ARGB
+#define PIX_FMT_ARGB AV_PIX_FMT_ARGB
+#endif
+#ifndef PIX_FMT_ABGR
+#define PIX_FMT_ABGR AV_PIX_FMT_ABGR
+#endif
+#ifndef PIX_FMT_YUV411P
+#define PIX_FMT_YUV411P AV_PIX_FMT_YUV411P
+#endif
+/* these have been removed but lets keep backwards compat */
+#ifndef SWS_CPU_CAPS_MMX 
+#define SWS_CPU_CAPS_MMX 0x80000000
+#endif
+#ifndef SWS_CPU_CAPS_MMXEXT
+#define SWS_CPU_CAPS_MMXEXT 0x2000000
+#endif
+#ifndef SWS_CPU_CAPS_MMX2
+#define SWS_CPU_CAPS_MMX2 0x2000000
+#endif
+#ifndef SWS_CPU_CAPS_3DNOW
+#define SWS_CPU_CAPS_3DNOW 0x20000000
+#endif
+#ifndef SWS_CPU_CAPS_ALTIVEC
+#define SWS_CPU_CAPS_ALTIVEC 0x1000000
+#endif
+#ifndef SWS_CPU_CAPS_SSE2
+#define SWS_CPU_CAPS_SSE2 0x02000000
+#endif
 #endif
 #endif
diff --git a/veejay-current/veejay-server/libel/avhelper.c b/veejay-current/veejay-server/libel/avhelper.c
index 392d8452..c8ded0dc 100644
--- a/veejay-current/veejay-server/libel/avhelper.c
+++ b/veejay-current/veejay-server/libel/avhelper.c
@@ -281,7 +281,7 @@ further:
 	}
 
 	veejay_memset( &(x->pkt), 0, sizeof(AVPacket));
-	AVFrame *f = avcodec_alloc_frame();
+	AVFrame *f = avhelper_alloc_frame();
 	x->output = yuv_yuv_template( NULL,NULL,NULL, wid, hei, dst_pixfmt );
 
 	int got_picture = 0;
@@ -313,7 +313,7 @@ further:
 
 	x->pixfmt = x->codec_ctx->pix_fmt;
 	x->codec_id = x->codec_ctx->codec_id;
-	x->frame = avcodec_alloc_frame();
+	x->frame = avhelper_alloc_frame();
 	x->input = yuv_yuv_template( NULL,NULL,NULL, x->codec_ctx->width,x->codec_ctx->height, x->pixfmt );
 
 	sws_template sws_tem;
@@ -337,6 +337,19 @@ further:
 	return (void*) x;
 }
 
+#define LIBAVUTIL_VERSION_CHECK( a, b, c, d, e ) \
+    ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+      (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
+
+void	*avhelper_alloc_frame()
+{
+#if LIBAVUTIL_VERSION_CHECK(55,20,0,13,100)
+	return av_frame_alloc();
+#else
+	return avcodec_alloc_frame();
+#endif
+}
+
 void	avhelper_close_decoder( void *ptr ) 
 {
 	el_decoder_t *e = (el_decoder_t*) ptr;
diff --git a/veejay-current/veejay-server/libel/avhelper.h b/veejay-current/veejay-server/libel/avhelper.h
index b5d6860e..d1e558d7 100644
--- a/veejay-current/veejay-server/libel/avhelper.h
+++ b/veejay-current/veejay-server/libel/avhelper.h
@@ -26,6 +26,8 @@
 #define CODEC_ID_YUV420F 996
 #define CODEC_ID_YUVLZO 900
 
+void	*avhelper_alloc_frame();
+
 int 	avhelper_get_codec_by_id(int id);
 
 int	avhelper_get_codec_by_name( const char *compr );
diff --git a/veejay-current/veejay-server/libel/lav_io.c b/veejay-current/veejay-server/libel/lav_io.c
index c2dae40e..638cb95b 100644
--- a/veejay-current/veejay-server/libel/lav_io.c
+++ b/veejay-current/veejay-server/libel/lav_io.c
@@ -44,6 +44,7 @@
 #include <veejay/vims.h>
 #include <liblzo/lzo.h>
 #include <libvjmem/vjmem.h>
+#include <libel/avcommon.h>
 #define QUICKTIME_MJPG_TAG 0x6d6a7067
 extern int vj_el_get_decoder_from_fourcc( const char *fourcc );
 extern int get_ffmpeg_pixfmt(int p);
diff --git a/veejay-current/veejay-server/libel/vj-el.c b/veejay-current/veejay-server/libel/vj-el.c
index 2275f71d..6f9287b4 100644
--- a/veejay-current/veejay-server/libel/vj-el.c
+++ b/veejay-current/veejay-server/libel/vj-el.c
@@ -36,6 +36,7 @@
 #include <libel/vj-avcodec.h>
 #include <libel/elcache.h>
 #include <libel/pixbuf.h>
+#include <libel/avcommon.h>
 #include <limits.h>
 #include <mjpegtools/mpegconsts.h>
 #include <mjpegtools/mpegtimecode.h>
@@ -327,7 +328,7 @@ vj_decoder *_el_new_decoder( void *ctx, int id , int width, int height, float fp
         {
 		d->codec = avhelper_get_codec(ctx);
 		d->context = avhelper_get_codec_ctx(ctx);
-		d->frame = avcodec_alloc_frame();
+		d->frame = avhelper_alloc_frame();
 		d->img = (VJFrame*) vj_calloc(sizeof(VJFrame));
 		d->img->width = width;
 		d->img->height = height;
diff --git a/veejay-current/veejay-server/libplugger/Makefile.am b/veejay-current/veejay-server/libplugger/Makefile.am
index 53097978..5917c2fb 100644
--- a/veejay-current/veejay-server/libplugger/Makefile.am
+++ b/veejay-current/veejay-server/libplugger/Makefile.am
@@ -10,5 +10,5 @@ AM_CFLAGS = $(OP_CFLAGS) $(FREEFRAME_CFLAGS)
 LIBVJPLUG_LIB_FILE = libvjplug.la
 noinst_LTLIBRARIES = $(LIBVJPLUG_LIB_FILE)
 
-libvjplug_la_SOURCES = defaults.c utility.c weed-utils.c freeframe-loader.c frei0r-loader.c livido-loader.c plugload.c
+libvjplug_la_SOURCES = defaults.c utility.c freeframe-loader.c frei0r-loader.c livido-loader.c plugload.c
 
diff --git a/veejay-current/veejay-server/libplugger/freeframe-loader.c b/veejay-current/veejay-server/libplugger/freeframe-loader.c
index 16976fe3..12b4ea6c 100644
--- a/veejay-current/veejay-server/libplugger/freeframe-loader.c
+++ b/veejay-current/veejay-server/libplugger/freeframe-loader.c
@@ -39,6 +39,7 @@
 #define V_BITS 24
 #include <libplugger/freeframe-loader.h>
 #include <libvje/vje.h>
+#include <libel/avcommon.h>
 
 typedef struct
 {
diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.c b/veejay-current/veejay-server/libplugger/frei0r-loader.c
index 895eebeb..04a0ff63 100644
--- a/veejay-current/veejay-server/libplugger/frei0r-loader.c
+++ b/veejay-current/veejay-server/libplugger/frei0r-loader.c
@@ -40,8 +40,9 @@
 #include <stdio.h>
 #include <libplugger/portdef.h>
 #include <libplugger/defaults.h>
-
 #include <libplugger/specs/frei0r.h>
+#include <libel/avcommon.h>
+
 #define    RUP8(num)(((num)+8)&~8)
 #define _VJ_MAX_PARAMS 32
 
diff --git a/veejay-current/veejay-server/libplugger/weed-utils.c b/veejay-current/veejay-server/libplugger/weed-utils.c
deleted file mode 100644
index 65a3bc10..00000000
--- a/veejay-current/veejay-server/libplugger/weed-utils.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <config.h>
-#include <libavutil/pixfmt.h>
-#include <libplugger/specs/mini-weed.h>
-static struct {
-	int weed_palette;
-	int pixfmt;
-} weed_palette_table[] = {
-	{WEED_PALETTE_YUV422P,	PIX_FMT_YUVJ422P},
-	{WEED_PALETTE_YUV420P,	PIX_FMT_YUVJ420P},
-	{WEED_PALETTE_I420,		PIX_FMT_YUVJ420P},
-	{WEED_PALETTE_YVU420P,	PIX_FMT_YUV420P},
-	{WEED_PALETTE_YV12,		PIX_FMT_YUV420P},
-	{WEED_PALETTE_RGB24,	PIX_FMT_RGB24},
-	{WEED_PALETTE_BGR24,	PIX_FMT_BGR24},
-//	{WEED_PALETTE_ARGB,		PIX_FMT_ARGB},
-//	{WEED_PALETTE_BGRA,		PIX_FMT_BGRA},
-	{-1,					-1},
-};
-
-int	weed_palette2_pixfmt(int w, int subtype) {
-	int i;
-	for( i = 0; weed_palette_table[i].weed_palette != -1 ; i ++ ) {
-		if( weed_palette_table[i].weed_palette == w ) {
-			if(subtype == WEED_YUV_SUBSPACE_YCBCR || subtype == WEED_YUV_SUBSPACE_BT709 ) {
-				if( w == WEED_PALETTE_YUV422P ) {
-					return PIX_FMT_YUV422P;
-				} else {
-					return PIX_FMT_YUV420P;
-				}
-			}
-			return weed_palette_table[i].pixfmt;
-		}
-	}
-	return -1;
-}
-
diff --git a/veejay-current/veejay-server/libstream/v4l2utils.c b/veejay-current/veejay-server/libstream/v4l2utils.c
index 1e15ed17..47157a89 100644
--- a/veejay-current/veejay-server/libstream/v4l2utils.c
+++ b/veejay-current/veejay-server/libstream/v4l2utils.c
@@ -78,6 +78,7 @@
 #include <libavcodec/avcodec.h>
 #include <libel/av.h>
 #include <libel/avhelper.h>
+#include <libel/avcommon.h>
 #define        RUP8(num)(((num)+8)&~8)
 
 //#include <pthread.h>
@@ -573,7 +574,7 @@ static	int	v4l2_setup_avcodec_capture( v4l2info *v, int wid, int hei, int codec_
 #endif
 	v->c->width= wid;
 	v->c->height= hei;
-	v->picture = avcodec_alloc_frame();
+	v->picture = avhelper_alloc_frame();
 	v->picture->width = wid;
 	v->picture->height = hei;
 	v->picture->data[0] = vj_malloc( sizeof(uint8_t) * RUP8(wid * hei + wid));
diff --git a/veejay-current/veejay-server/libstream/vj-net.c b/veejay-current/veejay-server/libstream/vj-net.c
index b38b8ba5..5c8b8dee 100644
--- a/veejay-current/veejay-server/libstream/vj-net.c
+++ b/veejay-current/veejay-server/libstream/vj-net.c
@@ -34,6 +34,7 @@
 #include <liblzo/lzo.h>
 #include <time.h>
 #include <libyuv/yuvconv.h>
+#include <libel/avcommon.h>
 
 #define        RUP8(num)(((num)+8)&~8)
 
diff --git a/veejay-current/veejay-server/libstream/vj-vloopback.c b/veejay-current/veejay-server/libstream/vj-vloopback.c
index e874176f..d075e36f 100644
--- a/veejay-current/veejay-server/libstream/vj-vloopback.c
+++ b/veejay-current/veejay-server/libstream/vj-vloopback.c
@@ -51,6 +51,7 @@
 #include <libvjmsg/vj-msg.h>
 #include <veejay/vims.h>
 #include <libavutil/pixfmt.h>
+#include <libel/avcommon.h>
 #define VLOOPBACK_MMAP 0 	// commented out
 #define VLOOPBACK_PIPE 1
 #define VLOOPBACK_N_BUFS 2
diff --git a/veejay-current/veejay-server/libvje/effects/alphatransition.h b/veejay-current/veejay-server/libvje/effects/alphatransition.h
index 99ec294d..f79aae1b 100644
--- a/veejay-current/veejay-server/libvje/effects/alphatransition.h
+++ b/veejay-current/veejay-server/libvje/effects/alphatransition.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
 
-#ifndef MASKTRANSITION_H
-#define MASKTRANSITION_H
+#ifndef ALPHATRANSITION_H
+#define ALPHATRANSITION_H
 #include <libvje/vje.h>
 #include <sys/types.h>
 #include <stdint.h>
 
-void masktransition_apply( VJFrame *frame, VJFrame *frame2, int index, int duration, int dir, int threshold);
-vj_effect *masktransition_init(int w, int h);
+void alphatransition_apply( VJFrame *frame, VJFrame *frame2, int index, int duration, int dir, int threshold);
+vj_effect *alphatransition_init(int w, int h);
 #endif
diff --git a/veejay-current/veejay-server/libvje/effects/colorhis.c b/veejay-current/veejay-server/libvje/effects/colorhis.c
index d29e110a..5dd67985 100644
--- a/veejay-current/veejay-server/libvje/effects/colorhis.c
+++ b/veejay-current/veejay-server/libvje/effects/colorhis.c
@@ -25,6 +25,7 @@
 #include <libavutil/pixfmt.h>
 #include <libyuv/yuvconv.h>
 #include <veejay/vims.h>
+#include <libel/avcommon.h>
 #include "common.h"
 vj_effect *colorhis_init(int w, int h)
 {
diff --git a/veejay-current/veejay-server/libvje/effects/common.h b/veejay-current/veejay-server/libvje/effects/common.h
index 84cbd8ff..4ee4c2bd 100644
--- a/veejay-current/veejay-server/libvje/effects/common.h
+++ b/veejay-current/veejay-server/libvje/effects/common.h
@@ -72,7 +72,7 @@ extern void veejay_msg(int type, const char format[], ...);
 #define do_emms         __asm__ __volatile__ ( "emms":::"memory" )
 #endif
 
-#ifndef ARCH_X86
+#ifndef ARCH_X86_64
 # define sin_cos(si, co, x)     si = sin(x); co = cos(x)
 # define fast_sqrt( res,x ) res = sqrt(x) 
 # define fast_sin(res,x ) res = sin(x)
@@ -344,7 +344,6 @@ void veejay_distance_transform8( uint8_t *plane, int w, int h, uint32_t *output)
 
 uint8_t veejay_component_labeling_8(int w, int h, uint8_t *I , uint32_t *M, uint32_t *XX, uint32_t *YY,uint32_t *xsize, uint32_t *ysize, int blob);
 
-
 void vj_diff_plane( uint8_t *A, uint8_t *B, uint8_t *O, int threshold, int len );
 void binarify_1src( uint8_t *dst, uint8_t *src, uint8_t threshold,int reverse, int w, int h );
 void binarify( uint8_t *bm, uint8_t *bg, uint8_t *src,int threshold,int reverse, const int len);
diff --git a/veejay-current/veejay-server/libvje/effects/picinpic.c b/veejay-current/veejay-server/libvje/effects/picinpic.c
index cea7621d..11868dee 100644
--- a/veejay-current/veejay-server/libvje/effects/picinpic.c
+++ b/veejay-current/veejay-server/libvje/effects/picinpic.c
@@ -29,6 +29,7 @@
 #include "picinpic.h"
 #include <libyuv/yuvconv.h>
 #include <libavutil/pixfmt.h>
+#include <libel/avcommon.h>
 #include "common.h" 
 extern void    vj_get_yuv444_template(VJFrame *src, int w, int h);
 typedef struct
diff --git a/veejay-current/veejay-server/libvje/effects/randnoise.h b/veejay-current/veejay-server/libvje/effects/randnoise.h
index 6379d92a..bccf7658 100644
--- a/veejay-current/veejay-server/libvje/effects/randnoise.h
+++ b/veejay-current/veejay-server/libvje/effects/randnoise.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
 
-#ifndef NEGATION_H
-#define NEGATION_H
+#ifndef RANDNOISE_H
+#define RANDNOISE_H
 #include <libvje/vje.h>
 #include <sys/types.h>
 #include <stdint.h>
diff --git a/veejay-current/veejay-server/libvje/vj-effect.c b/veejay-current/veejay-server/libvje/vj-effect.c
index 8218bc03..7aacddfa 100644
--- a/veejay-current/veejay-server/libvje/vj-effect.c
+++ b/veejay-current/veejay-server/libvje/vj-effect.c
@@ -26,6 +26,7 @@
 #include <libvje/vje.h>
 #include <libvje/internal.h>
 #include <libavutil/pixfmt.h>
+#include <libel/avcommon.h>
 #include "effects/fibdownscale.h"
 #include "effects/magicoverlays.h"
 #include "effects/negation.h"
diff --git a/veejay-current/veejay-server/libvjnet/vj-client.c b/veejay-current/veejay-server/libvjnet/vj-client.c
index f072ca0d..15d6d026 100644
--- a/veejay-current/veejay-server/libvjnet/vj-client.c
+++ b/veejay-current/veejay-server/libvjnet/vj-client.c
@@ -40,6 +40,7 @@
 #include <libavutil/pixfmt.h>
 #include <pthread.h>
 #include <liblzo/lzo.h>
+#include <libel/avcommon.h>
 #define VJC_OK 0
 #define VJC_NO_MEM 1
 #define VJC_SOCKET 2
diff --git a/veejay-current/veejay-server/libyuv/yuvconv.c b/veejay-current/veejay-server/libyuv/yuvconv.c
index 13f98b2f..cd07be64 100644
--- a/veejay-current/veejay-server/libyuv/yuvconv.c
+++ b/veejay-current/veejay-server/libyuv/yuvconv.c
@@ -1442,7 +1442,7 @@ int	yuv_sws_get_cpu_flags(void)
 
 	return cpu_flags;
 }
-
+/*
 void	yuv_deinterlace(
 		uint8_t *data[3],
 		const int width,
@@ -1491,7 +1491,7 @@ void 	rgb_deinterlace(
 	q.linesize[2] = 0;
 	avpicture_deinterlace( &p,&q, out_pix_fmt, width, height );
 }
-
+*/
 
 static struct
 {	
diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c
index 1580aa05..3090c48c 100644
--- a/veejay-current/veejay-server/veejay/liblavplayvj.c
+++ b/veejay-current/veejay-server/veejay/liblavplayvj.c
@@ -83,6 +83,7 @@
 #include <veejay/vj-lib.h>
 #include <libel/vj-avcodec.h>
 #include <libel/pixbuf.h>
+#include <libel/avcommon.h>
 #ifdef HAVE_JACK
 #include <veejay/vj-jack.h>
 #endif
diff --git a/veejay-current/veejay-server/veejay/vj-composite.c b/veejay-current/veejay-server/veejay/vj-composite.c
index d030c884..ca4f0503 100644
--- a/veejay-current/veejay-server/veejay/vj-composite.c
+++ b/veejay-current/veejay-server/veejay/vj-composite.c
@@ -45,6 +45,8 @@
 #ifdef HAVE_GL
 #include <veejay/gl.h>
 #endif
+#include <libel/avcommon.h>
+
 typedef struct
 {
 	uint8_t *proj_plane[4];
diff --git a/veejay-current/veejay-server/veejay/vj-misc.c b/veejay-current/veejay-server/veejay/vj-misc.c
index be3e0f66..d42f17ce 100644
--- a/veejay-current/veejay-server/veejay/vj-misc.c
+++ b/veejay-current/veejay-server/veejay/vj-misc.c
@@ -41,6 +41,7 @@
 #include <libvje/vje.h>
 #include <libyuv/yuvconv.h>
 #include <libavutil/pixfmt.h>
+#include <libel/avcommon.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <pthread.h>
diff --git a/veejay-current/veejay-server/veejay/vj-sdl.c b/veejay-current/veejay-server/veejay/vj-sdl.c
index e85e5c38..f7459e9f 100644
--- a/veejay-current/veejay-server/veejay/vj-sdl.c
+++ b/veejay-current/veejay-server/veejay/vj-sdl.c
@@ -37,6 +37,7 @@
 #include <libel/vj-avcodec.h>
 #include <libyuv/yuvconv.h>
 #include <veejay/libveejay.h>
+#include <libel/avcommon.h>
 #include <string.h>
 #include <stdlib.h>
 //extern void *(* veejay_memcpy)(void *to, const void *from, size_t len) ;
diff --git a/veejay-current/veejay-server/veejay/vj-shm.c b/veejay-current/veejay-server/veejay/vj-shm.c
index abc31d6c..1e7e77a3 100644
--- a/veejay-current/veejay-server/veejay/vj-shm.c
+++ b/veejay-current/veejay-server/veejay/vj-shm.c
@@ -39,7 +39,7 @@
 #include <libavutil/pixfmt.h>
 #include <libavutil/avutil.h>
 #include <libplugger/specs/livido.h>
-
+#include <libel/avcommon.h>
 #define HEADER_LENGTH 4096
 #ifndef PATH_MAX
 #define PATH_MAX 1024
diff --git a/veejay-current/veejay-server/veejay/vj-task.c b/veejay-current/veejay-server/veejay/vj-task.c
index fee56298..5cca6f0a 100644
--- a/veejay-current/veejay-server/veejay/vj-task.c
+++ b/veejay-current/veejay-server/veejay/vj-task.c
@@ -52,7 +52,8 @@
 #include <libavutil/pixfmt.h>
 #include <veejay/vj-task.h>
 #include <libvje/vje.h>
- 
+#include <libel/avcommon.h>
+
 //@ job description
 static	vj_task_arg_t *vj_task_args[MAX_WORKERS];
 
diff --git a/veejay-current/veejay-server/veejay/vj-viewport.c b/veejay-current/veejay-server/veejay/vj-viewport.c
index d342b73c..19fa04b9 100644
--- a/veejay-current/veejay-server/veejay/vj-viewport.c
+++ b/veejay-current/veejay-server/veejay/vj-viewport.c
@@ -42,7 +42,8 @@
 #include <veejay/vj-viewport-cfg.h>
 #include <veejay/vj-viewport.h>
 #include <math.h>
-#include <assert.h>
+#include <libel/avcommon.h>
+
 #define X0 0
 #define Y0 1
 #define X1 2