har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix seek_test compilation for out-of-tree builds.

Browse Source 
Originally committed as revision 9135 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-05-27 13:36:02 +00:00
parent 197b07f360
commit dd4ca89143
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/Makefile
View File

@ -73,11 +73,8 @@ asynth1.sw: audiogen$(EXESUF)
%$(EXESUF): %.c %$(EXESUF): %.c
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
LIBAV = ../libavformat/libavformat.a ../libavcodec/libavcodec.a ../libavutil/libavutil.a seek_test$(EXESUF): seek_test.c
$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -o $@ $< $(BUILD_ROOT)/libavformat/libavformat.a $(BUILD_ROOT)/libavcodec/libavcodec.a $(BUILD_ROOT)/libavutil/libavutil.a $(EXTRALIBS)
#FIXME cleanup shit below
seek_test$(EXESUF): seek_test.c $(LIBAV)
$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -o $@ $< $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a $(EXTRALIBS)
distclean clean: distclean clean:
rm -rf vsynth1 vsynth2 data asynth1.sw *~ rm -rf vsynth1 vsynth2 data asynth1.sw *~

13
tests/tiny_psnr.c
View File

@ -49,19 +49,7 @@ uint64_t exp16_table[21]={
195360063, 195360063,
582360139072LL, 582360139072LL,
}; };
#if 1
// 16.16 fixpoint exp()
static unsigned int exp16(unsigned int a){
int i;
int out= 1<<16;
for(i=19;i>=0;i--){
if(a&(1<<i))
out= (out*exp16_table[i] + (1<<15))>>16;
}
return out;
}
// 16.16 fixpoint log() // 16.16 fixpoint log()
static int64_t log16(uint64_t a){ static int64_t log16(uint64_t a){
int i; int i;
@ -80,7 +68,6 @@ static int64_t log16(uint64_t a){
return out; return out;
} }
#endif
static uint64_t int_sqrt(uint64_t a) static uint64_t int_sqrt(uint64_t a)
{ {
uint64_t ret=0; uint64_t ret=0;