26 files changed, 31 insertions, 12 deletions
diff --git a/src/audio_dec/Makefile.am b/src/audio_dec/Makefile.am
index ee653dc83..8c141a429 100644
--- a/src/audio_dec/Makefile.am
+++ b/src/audio_dec/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 2bce2f66d..0ea22c00d 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 92d49a3e5..3b133c412 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = ffmpeg
 
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
index 020a04622..536f4d7f6 100644
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 2d9320267..9fda6adfa 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 92776f973..bdc30df30 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -1853,7 +1853,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size,
   uint8_t          *data;
   uint8_t           flags;
   int               gap, lacing, num_len;
-  int               timecode_diff;
+  int16_t           timecode_diff;
   int64_t           pts, xduration;
   int               decoder_flags = 0;
 
@@ -1863,7 +1863,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size,
   data += num_len;
 
   /* timecode_diff is signed */
-  timecode_diff = parse_int16(data);
+  timecode_diff = (int16_t)parse_int16(data);
   data += 2;
 
   flags = *data;
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index f8e88974b..ef7bd3e10 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 1fc5d1a39..ddeb61a06 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 # REVISIT: This second line here bothers me more than just a little bit
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 0f2bee57e..feacc0edf 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1208,6 +1208,12 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff
     return NULL;  
   }
 
+  buf = fifo->buffer_pool_alloc (fifo);
+  if (todo < 0 || todo > buf->size) {
+    buf->free_buffer(buf);
+    return NULL;
+  }
+
   if( this->scr_tunning == -2 )
     speed = this->speed_before_pause;
 
@@ -1231,7 +1237,6 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff
 
   pvr_event_handler(this);
   
-  buf = fifo->buffer_pool_alloc (fifo);
   buf->content = buf->mem;
     
   pthread_mutex_lock(&this->lock);
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 2b47415fd..ca2c624a2 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am
index 7072039dd..301ad9b23 100644
--- a/src/libreal/Makefile.am
+++ b/src/libreal/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 7c0dcd78d..061bd7731 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 xineplug_LTLIBRARIES = xineplug_decode_spu.la
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 26b340524..dfc877126 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am
index c2df5c21d..275fa121d 100644
--- a/src/post/audio/Makefile.am
+++ b/src/post/audio/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am
index 498a9a59f..54ab83572 100644
--- a/src/post/deinterlace/Makefile.am
+++ b/src/post/deinterlace/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 22b4af79f..240eee62c 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(VISIBILITY_FLAG)
diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am
index 106d480c3..50a0a3d0a 100644
--- a/src/post/mosaico/Makefile.am
+++ b/src/post/mosaico/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 99f8b14bd..f706e4a7b 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(VISIBILITY_FLAG)
diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index bea89ac49..35e9a0785 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/spu_dec/Makefile.am b/src/spu_dec/Makefile.am
index 98048fe01..807883fb1 100644
--- a/src/spu_dec/Makefile.am
+++ b/src/spu_dec/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_srcdir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/vdr/Makefile.am b/src/vdr/Makefile.am
index fe5ae3a52..09435a87b 100644
--- a/src/vdr/Makefile.am
+++ b/src/vdr/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am
index bbafba88d..f6984a8a2 100644
--- a/src/video_dec/Makefile.am
+++ b/src/video_dec/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = \
 	libmpeg2 \
 	libmpeg2new
 
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/video_dec/image.c b/src/video_dec/image.c
index 8ef8329cf..3413bb96f 100644
--- a/src/video_dec/image.c
+++ b/src/video_dec/image.c
@@ -50,15 +50,6 @@
 #include <xine/xineutils.h>
 #include "bswap.h"
 
-/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels 
- * But upstream did not update their deprecated compat stuff.
- * So do a fun hack to make it work.
- * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org>
- */
-#if MagickLibVersion >= 0x645
-#define MagickGetImagePixels MagickGetAuthenticPixels
-#endif
-
 typedef struct {
   video_decoder_class_t   decoder_class;
 
diff --git a/src/video_dec/libmpeg2/Makefile.am b/src/video_dec/libmpeg2/Makefile.am
index 56751daf8..f0dd252eb 100644
--- a/src/video_dec/libmpeg2/Makefile.am
+++ b/src/video_dec/libmpeg2/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/video_dec/libmpeg2new/Makefile.am b/src/video_dec/libmpeg2new/Makefile.am
index bc322169d..f79b8aba9 100644
--- a/src/video_dec/libmpeg2new/Makefile.am
+++ b/src/video_dec/libmpeg2new/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 0d3934849..bc6191b5d 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_builddir)/misc/Makefile.plugins
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS    = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)