diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-05-27 13:36:02 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-05-27 13:36:02 +0000 |
| commit | dd4ca8914344cb14ef6529a2637e156726f8847d (patch) | |
| tree | e4c42861fc634b19a4bcfa17dc1458a7827b28db /tests | |
| parent | 197b07f360cc692fcfd36007af9a3190c9928b96 (diff) | |
| download | ffmpeg-dd4ca8914344cb14ef6529a2637e156726f8847d.tar.gz | |
Fix seek_test compilation for out-of-tree builds.
Originally committed as revision 9135 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 7 | ||||
| -rw-r--r-- | tests/tiny_psnr.c | 13 |
2 files changed, 2 insertions, 18 deletions
diff --git a/tests/Makefile b/tests/Makefile index 29f9f2a8bd..075af1ff33 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -73,11 +73,8 @@ asynth1.sw: audiogen$(EXESUF) %$(EXESUF): %.c $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -LIBAV = ../libavformat/libavformat.a ../libavcodec/libavcodec.a ../libavutil/libavutil.a - -#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) +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) distclean clean: rm -rf vsynth1 vsynth2 data asynth1.sw *~ diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index 91225f2b3e..af37803b6c 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -49,19 +49,7 @@ uint64_t exp16_table[21]={ 195360063, 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() static int64_t log16(uint64_t a){ int i; @@ -80,7 +68,6 @@ static int64_t log16(uint64_t a){ return out; } -#endif static uint64_t int_sqrt(uint64_t a) { uint64_t ret=0; |