Mercurial > audlegacy
changeset 255:ad1e65c6a854 trunk
[svn] Create some proper headers and include them. No more implicit declarations.
| author | chainsaw |
|---|---|
| date | Sun, 04 Dec 2005 07:37:06 -0800 |
| parents | 5de006f3d342 |
| children | 84aabc053b6e |
| files | Plugins/Input/wma/libffwma/Makefile.am Plugins/Input/wma/libffwma/asf.c Plugins/Input/wma/libffwma/avformat.h Plugins/Input/wma/libffwma/avio.c Plugins/Input/wma/libffwma/cutils.h Plugins/Input/wma/libffwma/file.c Plugins/Input/wma/libffwma/futils.c Plugins/Input/wma/libffwma/parser.c Plugins/Input/wma/libffwma/utils.h |
| diffstat | 9 files changed, 33 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/wma/libffwma/Makefile.am Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/Makefile.am Sun Dec 04 07:37:06 2005 -0800 @@ -4,10 +4,9 @@ asf.c avcodec.h avformat.h \ avi.h avio.c avio.h aviobuf.c \ bswap.h common.c common.h \ - cutils.c dsputil.c dsputil.h \ + cutils.c cutils.h dsputil.c dsputil.h \ fft.c file.c futils.c mdct.c \ os_support.c os_support.h \ - parser.c simple_idct.c \ - simple_idct.h utils.c wmadata.h \ - wmadec.c + parser.c simple_idct.c simple_idct.h \ + utils.h utils.c wmadata.h wmadec.c libffwma_la_CFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c
--- a/Plugins/Input/wma/libffwma/asf.c Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/asf.c Sun Dec 04 07:37:06 2005 -0800 @@ -19,6 +19,7 @@ #include "avcodec.h" #include "avformat.h" #include "avi.h" +#include "utils.h" #include <assert.h> #define MPA_FRAME_SIZE 1152
--- a/Plugins/Input/wma/libffwma/avformat.h Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/avformat.h Sun Dec 04 07:37:06 2005 -0800 @@ -591,11 +591,6 @@ #include "os_support.h" -int strstart(const char *str, const char *val, const char **ptr); -int stristart(const char *str, const char *val, const char **ptr); -void pstrcpy(char *buf, int buf_size, const char *str); -char *pstrcat(char *buf, int buf_size, const char *s); - void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem); #ifdef __GNUC__ @@ -613,10 +608,6 @@ } while(0) #endif -time_t mktimegm(struct tm *tm); -const char *small_strptime(const char *p, const char *fmt, - struct tm *dt); - struct in_addr; int resolve_host(struct in_addr *sin_addr, const char *hostname);
--- a/Plugins/Input/wma/libffwma/avio.c Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/avio.c Sun Dec 04 07:37:06 2005 -0800 @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" +#include "cutils.h" static int default_interrupt_cb(void);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Input/wma/libffwma/cutils.h Sun Dec 04 07:37:06 2005 -0800 @@ -0,0 +1,14 @@ +#ifndef _CUTILS_H +#define _CUTILS_H + +int strstart(const char *str, const char *val, const char **ptr); +int stristart(const char *str, const char *val, const char **ptr); +void pstrcpy(char *buf, int buf_size, const char *str); +char *pstrcat(char *buf, int buf_size, const char *s); + +time_t mktimegm(struct tm *tm); +const char *small_strptime(const char *p, const char *fmt, + struct tm *dt); + +#endif +
--- a/Plugins/Input/wma/libffwma/file.c Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/file.c Sun Dec 04 07:37:06 2005 -0800 @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" +#include "cutils.h" #include <fcntl.h> #include <unistd.h> #include <sys/ioctl.h>
--- a/Plugins/Input/wma/libffwma/futils.c Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/futils.c Sun Dec 04 07:37:06 2005 -0800 @@ -18,6 +18,8 @@ */ #include "avformat.h" #include "avcodec.h" +#include "cutils.h" +#include "utils.h" #undef NDEBUG #include <assert.h> @@ -1282,6 +1284,7 @@ return (val != 0); } +#if 0 /* Dead code; compiler assures me it isn't used anywhere */ static int try_decode_frame(AVStream *st, const uint8_t *data, int size) { int16_t *samples; @@ -1313,7 +1316,7 @@ avcodec_close(&st->codec); return ret; } - +#endif /* absolute maximum size we read until we abort */ #define MAX_READ_SIZE 5000000
--- a/Plugins/Input/wma/libffwma/parser.c Sun Dec 04 06:48:27 2005 -0800 +++ b/Plugins/Input/wma/libffwma/parser.c Sun Dec 04 07:37:06 2005 -0800 @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avcodec.h" +#include "utils.h" AVCodecParser *av_first_parser = NULL;