Index: /branches/zorg/include/mpcdec/config_types.h.in
===================================================================
--- /branches/zorg/include/mpcdec/config_types.h.in	(revision 24)
+++ /branches/zorg/include/mpcdec/config_types.h.in	(revision 25)
@@ -48,3 +48,7 @@
 typedef @SIZE64@ mpc_int64_t;
 
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
 #endif // __MUSEPACK_CONFIG_TYPES_H__
Index: /branches/zorg/src/mpc_decoder.c
===================================================================
--- /branches/zorg/src/mpc_decoder.c	(revision 24)
+++ /branches/zorg/src/mpc_decoder.c	(revision 25)
@@ -489,6 +489,4 @@
 
     d->DecodedFrames++;
-    if(d->DecodedFrames>13500)
-        printf("%u\n", d->DecodedFrames);
 
     if (d->Use_SeekTable) {
Index: /branches/zorg/src/synth_filter.c
===================================================================
--- /branches/zorg/src/synth_filter.c	(revision 24)
+++ /branches/zorg/src/synth_filter.c	(revision 25)
@@ -335,4 +335,5 @@
         V -= 64;
         Calculate_New_V ( Y, V );
+        if(OutData)
         {
             MPC_SAMPLE_FORMAT * Data = OutData;
@@ -366,5 +367,5 @@
 
     Synthese_Filter_float_internal(
-        OutData,
+        OutData? OutData +1: NULL,
         (MPC_SAMPLE_FORMAT *)(d->V_L + MPC_V_MEM),
         (MPC_SAMPLE_FORMAT *)(d->Y_L [0]));
@@ -374,5 +375,5 @@
 
     Synthese_Filter_float_internal(
-        OutData + 1,
+        OutData? OutData +1: NULL,
         (MPC_SAMPLE_FORMAT *)(d->V_R + MPC_V_MEM),
         (MPC_SAMPLE_FORMAT *)(d->Y_R [0]));