Mercurial > mplayer.hg
changeset 2080:f91ad6d23ce9
gcc3 warning fixed
| author | arpi |
|---|---|
| date | Thu, 04 Oct 2001 18:30:30 +0000 |
| parents | 38281c32f7da |
| children | efcab819ac24 |
| files | Gui/bitmap.c Gui/bitmap/bitmap.c Gui/bitmap/bmp/bmp.c Gui/timer.h libao2/ao_oss.c libmpeg2/decode.c |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/bitmap.c Thu Oct 04 18:03:58 2001 +0000 +++ b/Gui/bitmap.c Thu Oct 04 18:30:30 2001 +0000 @@ -1,6 +1,7 @@ +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> +#include <string.h> #include "bitmap.h" #include "../error.h"
--- a/Gui/bitmap/bitmap.c Thu Oct 04 18:03:58 2001 +0000 +++ b/Gui/bitmap/bitmap.c Thu Oct 04 18:30:30 2001 +0000 @@ -1,6 +1,7 @@ +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> +#include <string.h> #include "bitmap.h" #include "../error.h"
--- a/Gui/bitmap/bmp/bmp.c Thu Oct 04 18:03:58 2001 +0000 +++ b/Gui/bitmap/bmp/bmp.c Thu Oct 04 18:30:30 2001 +0000 @@ -21,8 +21,9 @@ 50.53 : Res */ +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> +#include <string.h> #include "bmp.h" #include "../bitmap.h"
--- a/Gui/timer.h Thu Oct 04 18:03:58 2001 +0000 +++ b/Gui/timer.h Thu Oct 04 18:30:30 2001 +0000 @@ -9,4 +9,4 @@ extern void timerInit( void ); extern void timerDone( void ); -#endif; \ No newline at end of file +#endif
--- a/libao2/ao_oss.c Thu Oct 04 18:03:58 2001 +0000 +++ b/libao2/ao_oss.c Thu Oct 04 18:30:30 2001 +0000 @@ -93,11 +93,8 @@ close(fd); return CONTROL_OK; } - else - return CONTROL_ERROR; } return CONTROL_ERROR; - default: } return CONTROL_UNKNOWN; }
--- a/libmpeg2/decode.c Thu Oct 04 18:03:58 2001 +0000 +++ b/libmpeg2/decode.c Thu Oct 04 18:30:30 2001 +0000 @@ -115,7 +115,7 @@ #else for(i=0;i<3;i++){ #endif - base = memalign(64,buff_size); + base = (unsigned char *)memalign(64,buff_size); frames[i].base[0] = base; frames[i].base[1] = base + frame_size * 5 / 4; frames[i].base[2] = base + frame_size;