6 files changed, 38 insertions, 10 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 9c498ff84..e32f2d2f4 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
 include $(top_srcdir)/lib/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) \
-              $(AVUTIL_CFLAGS) $(PTHREAD_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE
+              $(AVUTIL_CFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
 
 XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
 
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 15b5ff952..7601e5d7f 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -781,6 +781,14 @@ static const video_db_t video_db[] = {
   BUF_VIDEO_VMNC,
   "VMware Screen Codec"
 },
+{
+  {
+    ME_FOURCC('S','N','O','W'),
+    0
+  },
+  BUF_VIDEO_SNOW,
+  "Snow"
+},
 { { 0 }, 0, "last entry" }
 };
 
@@ -1142,11 +1150,32 @@ static const audio_db_t audio_db[] = {
 },
 {
   {
-    0
+    ME_FOURCC('W', 'V', 'P', 'K'),
   },
   BUF_AUDIO_WAVPACK,
   "Wavpack"
 },
+{
+  {
+    ME_FOURCC('s', 'a', 'm', 'r'),
+  },
+  BUF_AUDIO_AMR_NB,
+  "AMR narrow band"
+},
+{
+  {
+    ME_FOURCC('s', 'a', 'w', 'b'),
+  },
+  BUF_AUDIO_AMR_WB,
+  "AMR wide band"
+},
+{
+  {
+    ME_FOURCC('T', 'T', 'A', '1'),
+  },
+  BUF_AUDIO_TTA,
+  "True Audio Lossless"
+},
 { { 0 }, 0, "last entry" }
 };
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 2ff9f494f..7f0497e78 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -602,7 +602,7 @@ static void collect_plugins(xine_t *this, char *path){
 #if defined(__hpux)
 	  if(!strstr(str, ".sl")
 #elif defined(__CYGWIN__) || defined(WIN32)
-	  if(!strstr(str, ".dll")
+          if(!strstr(str, ".dll") || strstr(str, ".dll.a")
 #else
 	  if(!strstr(str, ".so")
 #endif
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index f0fe25e29..a789b50d4 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -239,7 +239,7 @@ static osd_object_t *XINE_MALLOC osd_new_object (osd_renderer_t *this, int width
   
   osd->width = width;
   osd->height = height;
-  osd->area = xine_xmalloc( width * height );
+  osd->area = calloc(width, height);
   
   osd->x1 = width;
   osd->y1 = height;
diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c
index 3315e2aa3..4c485035b 100644
--- a/src/xine-engine/post.c
+++ b/src/xine-engine/post.c
@@ -30,13 +30,10 @@
 
 
 void _x_post_init(post_plugin_t *post, int num_audio_inputs, int num_video_inputs) {
-  int audio_inputs_size = (num_audio_inputs + 1) * sizeof(xine_audio_port_t *);
-  int video_inputs_size = (num_video_inputs + 1) * sizeof(xine_video_port_t *);
-  
   post->input  = xine_list_new();
   post->output = xine_list_new();
-  post->xine_post.audio_input = (xine_audio_port_t **)xine_xmalloc(audio_inputs_size);
-  post->xine_post.video_input = (xine_video_port_t **)xine_xmalloc(video_inputs_size);
+  post->xine_post.audio_input = calloc(num_audio_inputs + 1, sizeof(xine_audio_port_t *));
+  post->xine_post.video_input = calloc(num_video_inputs + 1, sizeof(xine_video_port_t *));
 }
 
 
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 07da930fb..217272a97 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -730,6 +730,8 @@ uint32_t xine_get_stream_info (xine_stream_t *stream, int info) {
   case XINE_STREAM_INFO_IGNORE_AUDIO:
   case XINE_STREAM_INFO_IGNORE_SPU:
   case XINE_STREAM_INFO_VIDEO_HAS_STILL:
+  case XINE_STREAM_INFO_SKIPPED_FRAMES:
+  case XINE_STREAM_INFO_DISCARDED_FRAMES:
   case XINE_STREAM_INFO_VIDEO_AFD:
   case XINE_STREAM_INFO_DVD_TITLE_NUMBER:
   case XINE_STREAM_INFO_DVD_TITLE_COUNT: