Mercurial > mplayer.hg
changeset 10605:3136605e6cab
1000l
| author | alex |
|---|---|
| date | Thu, 14 Aug 2003 01:25:42 +0000 |
| parents | a70a6c12bce5 |
| children | f9c1b97a71cb |
| files | libao2/ao_alsa1x.c libao2/ao_alsa9.c libvo/vo_zr.c libvo/vosub_vidix.c |
| diffstat | 4 files changed, 6 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_alsa1x.c Thu Aug 14 01:15:41 2003 +0000 +++ b/libao2/ao_alsa1x.c Thu Aug 14 01:25:42 2003 +0000 @@ -377,7 +377,7 @@ default: fprintf(stderr, "%d channels are not supported\n", channels); - exit (0); + return(0); } alsa_device = devstr;
--- a/libao2/ao_alsa9.c Thu Aug 14 01:15:41 2003 +0000 +++ b/libao2/ao_alsa9.c Thu Aug 14 01:25:42 2003 +0000 @@ -377,7 +377,7 @@ default: fprintf(stderr, "%d channels are not supported\n", channels); - exit (0); + return(0); } alsa_device = devstr;
--- a/libvo/vo_zr.c Thu Aug 14 01:15:41 2003 +0000 +++ b/libvo/vo_zr.c Thu Aug 14 01:25:42 2003 +0000 @@ -304,7 +304,7 @@ 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];
--- a/libvo/vosub_vidix.c Thu Aug 14 01:15:41 2003 +0000 +++ b/libvo/vosub_vidix.c Thu Aug 14 01:25:42 2003 +0000 @@ -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 @@ 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 @@ 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 @@ 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; }