Mercurial > mplayer.hg
changeset 2775:8e3875816f6d
added missing #include <malloc.h>
#include "config.h" moved as 1st #include since it defines HAVE_foo_h for
later conditional inclusions
| author | pl |
|---|---|
| date | Fri, 09 Nov 2001 02:17:02 +0000 |
| parents | 039568c6947d |
| children | 6694f0d029f1 |
| files | dec_video.c dll_init.c libmpdemux/video.c libmpeg2/decode.c libvo/vo_vesa.c postproc/postprocess.c postproc/postprocess_template.c |
| diffstat | 7 files changed, 27 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/dec_video.c Fri Nov 09 02:02:58 2001 +0000 +++ b/dec_video.c Fri Nov 09 02:17:02 2001 +0000 @@ -1,9 +1,13 @@ + +#include "config.h" #include <stdio.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdlib.h> #include <unistd.h> -#include "config.h" #include "mp_msg.h" #include "help_mp.h"
--- a/dll_init.c Fri Nov 09 02:02:58 2001 +0000 +++ b/dll_init.c Fri Nov 09 02:17:02 2001 +0000 @@ -1,9 +1,13 @@ + +#include "config.h" #include <stdio.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdlib.h> #include <unistd.h> -#include "config.h" #include "mp_msg.h" #include "help_mp.h"
--- a/libmpdemux/video.c Fri Nov 09 02:02:58 2001 +0000 +++ b/libmpdemux/video.c Fri Nov 09 02:17:02 2001 +0000 @@ -1,10 +1,14 @@ // read video frame +#include "config.h" + #include <stdio.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdlib.h> #include <unistd.h> -#include "config.h" #include "mp_msg.h" #include "help_mp.h"
--- a/libmpeg2/decode.c Fri Nov 09 02:02:58 2001 +0000 +++ b/libmpeg2/decode.c Fri Nov 09 02:17:02 2001 +0000 @@ -5,7 +5,12 @@ #define PACKAGE "mpeg2dec" #define VERSION "0.2.0-release" +#include "config.h" + #include <stdio.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -15,7 +20,6 @@ #include <setjmp.h> -#include "config.h" #include "video_out.h" #include <inttypes.h>
--- a/libvo/vo_vesa.c Fri Nov 09 02:02:58 2001 +0000 +++ b/libvo/vo_vesa.c Fri Nov 09 02:17:02 2001 +0000 @@ -15,20 +15,20 @@ note: triple buffering requires VBE 3.0 - need volunteers. - refresh rate support (need additional info from mplayer) */ +#include "config.h" + #include <stdio.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> +#endif #include <stdlib.h> #include <string.h> #include <stddef.h> #include <limits.h> -#include "config.h" #include "video_out.h" #include "video_out_internal.h" -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "fastmemcpy.h" #include "sub.h" #include "linux/vbelib.h"
--- a/postproc/postprocess.c Fri Nov 09 02:02:58 2001 +0000 +++ b/postproc/postprocess.c Fri Nov 09 02:17:02 2001 +0000 @@ -70,11 +70,11 @@ //Changelog: use the CVS log +#include "../config.h" #include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "../config.h" #ifdef HAVE_MALLOC_H #include <malloc.h> #endif
--- a/postproc/postprocess_template.c Fri Nov 09 02:02:58 2001 +0000 +++ b/postproc/postprocess_template.c Fri Nov 09 02:17:02 2001 +0000 @@ -70,11 +70,11 @@ //Changelog: use the CVS log +#include "../config.h" #include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "../config.h" #ifdef HAVE_MALLOC_H #include <malloc.h> #endif