diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index b0792121d8..b635b7d00a 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -377,7 +377,7 @@ static int init(int rate_hz, int channels, int format, int flags)
 
       default:
 	fprintf(stderr, "%d channels are not supported\n", channels);
-	exit (0);
+	return(0);
       }
 
       alsa_device = devstr;
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index b0792121d8..b635b7d00a 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -377,7 +377,7 @@ static int init(int rate_hz, int channels, int format, int flags)
 
       default:
 	fprintf(stderr, "%d channels are not supported\n", channels);
-	exit (0);
+	return(0);
       }
 
       alsa_device = devstr;
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c
index 814ecf2efd..23a3e4749c 100644
--- a/libvo/vo_zr.c
+++ b/libvo/vo_zr.c
@@ -304,7 +304,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 	framenum = 0;
 	if (format != IMGFMT_YV12 && format != IMGFMT_YUY2) {
 		printf("vo_zr called with wrong format");
-		exit(1);
+		return 1;
 	}
 	for (i = 0; i < zr_count; i++) {
 		zr_info_t *zr = &zr_info[i];
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 908ae5fd73..922fedbb20 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -35,7 +35,6 @@
 #include "../libmpcodecs/mp_image.h"
 
 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
 
 static VDL_HANDLE vidix_handler = NULL;
 static uint8_t *vidix_mem = NULL;
@@ -205,8 +204,6 @@ static uint32_t vidix_draw_slice_410_fast(uint8_t *image[], int stride[], int w,
     uint8_t *src;
     uint8_t *dest;
 
-    UNUSED(w);
-    UNUSED(stride);
     dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
     dest += dstrides.y*y + x;
     src = image[0];
@@ -250,16 +247,8 @@ static uint32_t vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,in
 
 uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
-	UNUSED(image);
-	UNUSED(stride);
-	UNUSED(w);
-	UNUSED(h);
-	UNUSED(x);
-	UNUSED(y);
-	printf("vosub_vidix: Error unoptimized draw_slice was called\nExiting...");
-	vidix_term();
-	exit( EXIT_FAILURE );
-	return 0;
+    printf("vosub_vidix: dummy vidix_draw_slice() was called\n");
+    return -1;
 }
 
 static uint32_t  vidix_draw_image(mp_image_t *mpi){
@@ -275,7 +264,7 @@ static uint32_t  vidix_draw_image(mp_image_t *mpi){
 
 uint32_t vidix_draw_frame(uint8_t *image[])
 {
-  printf("vosub_vidix: vidix_draw_frame() was called!!!!\n");
+  printf("vosub_vidix: dummy vidix_draw_frame() was called\n");
   return -1;
 }