Common subdirectories: libcook.org//.svn and libcook/.svn diff -rub libcook.org//Makefile.test libcook/Makefile.test --- libcook.org//Makefile.test Sat May 15 09:35:44 2010 +++ libcook/Makefile.test Sat May 15 14:24:18 2010 @@ -1,4 +1,5 @@ -CFLAGS = -Wall -O3 +CC = gcc +CFLAGS = -I. -Wall -O3 OBJS = main.o bitstream.o cook.o rm.o cooktest: $(OBJS) gcc -o cooktest $(OBJS) diff -rub libcook.org//bitstream.h libcook/bitstream.h --- libcook.org//bitstream.h Sat May 15 09:35:44 2010 +++ libcook/bitstream.h Sun May 16 17:32:18 2010 @@ -25,8 +25,8 @@ #ifndef AVCODEC_BITSTREAM_H #define AVCODEC_BITSTREAM_H - -#include +#include +//#include #include #include #include diff -rub libcook.org//bswap.h libcook/bswap.h --- libcook.org//bswap.h Sat May 15 09:35:44 2010 +++ libcook/bswap.h Sun May 16 17:32:43 2010 @@ -25,8 +25,8 @@ #ifndef AVUTIL_BSWAP_H #define AVUTIL_BSWAP_H - -#include +#include +//#include //#include "ffmpeg_config.h" //#include "common.h" diff -rub libcook.org//cook.h libcook/cook.h --- libcook.org//cook.h Sat May 15 09:35:44 2010 +++ libcook/cook.h Sun May 16 17:31:43 2010 @@ -21,8 +21,8 @@ */ #ifndef _COOK_H #define _COOK_H - -#include +#include +//#include #include "bitstream.h" #include "rm.h" #include "cookdata_fixpoint.h" diff -rub libcook.org//cookdata_fixpoint.h libcook/cookdata_fixpoint.h --- libcook.org//cookdata_fixpoint.h Sat May 15 09:34:52 2010 +++ libcook/cookdata_fixpoint.h Sun May 16 17:32:59 2010 @@ -26,7 +26,8 @@ * fixed point data types and constants */ -#include +#include +//#include typedef int32_t FIXP; /* Fixed point variable type */ typedef uint16_t FIXPU; /* Fixed point fraction 0<=x<1 */ diff -rub libcook.org//main.c libcook/main.c --- libcook.org//main.c Sat May 15 09:35:44 2010 +++ libcook/main.c Sun May 16 17:29:34 2010 @@ -18,7 +18,6 @@ * KIND, either express or implied. * ****************************************************************************/ -#include #include #include #include diff -rub libcook.org//rm.c libcook/rm.c --- libcook.org//rm.c Sat May 15 09:35:44 2010 +++ libcook/rm.c Sun May 16 17:33:30 2010 @@ -21,7 +21,8 @@ ****************************************************************************/ #include #include -#include +#include +//#include #include #include #include @@ -153,7 +154,6 @@ int skipped = 0; uint32_t version; struct real_object_t obj; - memset(&obj,0,sizeof(obj)); uint32_t header_size; uint16_t flavor; uint32_t coded_framesize; @@ -173,6 +173,7 @@ uint16_t unknown10; uint8_t unknown11; + memset(&obj,0,sizeof(obj)); read_uint32be(fd, &version); skipped += 4; @@ -257,7 +258,6 @@ int real_parse_header(int fd, RMContext *rmctx) { struct real_object_t obj; - memset(&obj,0,sizeof(obj)); int res; int skipped; off_t curpos; @@ -292,6 +292,7 @@ uint32_t next_data_off; uint8_t header_end; + memset(&obj,0,sizeof(obj)); curpos = lseek(fd, 0, SEEK_SET); res = real_read_object_header(fd, &obj); diff -rub libcook.org//rm.h libcook/rm.h --- libcook.org//rm.h Sat May 15 09:35:44 2010 +++ libcook/rm.h Sun May 16 17:29:54 2010 @@ -22,8 +22,8 @@ #define _RM_H #include -#include - +//#include +#include typedef struct rm_packet { uint8_t data[30000]; /* Reordered data. No malloc, hence the size */