4 files changed, 13 insertions, 11 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index ff4f69cbc..f8e88974b 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -45,4 +45,4 @@ xineplug_vo_out_dxr3_la_SOURCES = \
 	video_out_dxr3.c 
 
 xineplug_vo_out_dxr3_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEG_CFLAGS)
-xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LDFLAGS) -lm
+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LIBS) -lm
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index f637a4566..cd9180eb6 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -44,7 +44,7 @@
 #include <math.h>
 #include <unistd.h>
 
-#include <libavutil/mem.h>
+#include <mem.h>
 
 #define LOG_MODULE "dxr3_mpeg_encoder"
 /* #define LOG_VERBOSE */
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
index d9ee921cc..06eee8c17 100644
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -62,7 +62,15 @@ typedef struct lavc_data_s {
 } lavc_data_t;
 
 
-int dxr3_lavc_init(dxr3_driver_t *drv)
+static int dxr3_lavc_close(dxr3_driver_t *drv) {
+  drv->enc->on_unneeded(drv);
+  free(drv->enc);
+  drv->enc = NULL;
+
+  return 1;
+}
+
+int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *plugin)
 {
   lavc_data_t* this;
   avcodec_init();
@@ -84,14 +92,6 @@ int dxr3_lavc_init(dxr3_driver_t *drv)
   return 1;
 }
 
-static int dxr3_lavc_close(dxr3_driver_t *drv) {
-  drv->enc->on_unneeded(drv);
-  free(drv->enc);
-  drv->enc = NULL;
-
-  return 1;
-}
-
 /* helper function */
 static int lavc_prepare_frame(lavc_data_t *this, dxr3_driver_t *drv, dxr3_frame_t *frame);
 
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 20cee345b..70937cfd0 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -66,6 +66,8 @@
 #include "dxr3.h"
 #include "video_out_dxr3.h"
 
+#include <mem.h>
+
 /* the amount of extra time we give the card for decoding */
 #define DECODE_PIPE_PREBUFFER 10000