diff options
author | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 13:44:29 +0200 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 13:44:34 +0200 |
commit | 5d48e4eafa6c4559683892b8638d10508125f3cf (patch) | |
tree | 0d5becbd08d6ae319497dd32cbe9b67f4670cc5e /libavutil | |
parent | 989a614b707dcff8abdffe28dc24ec64a83b2837 (diff) | |
parent | a6a750c7ef240b72ce01e9653343a0ddf247d196 (diff) | |
download | ffmpeg-5d48e4eafa6c4559683892b8638d10508125f3cf.tar.gz |
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/Makefile | 2 | ||||
-rw-r--r-- | libavutil/des.c | 2 | ||||
-rw-r--r-- | libavutil/tests/.gitignore | 44 | ||||
-rw-r--r-- | libavutil/tests/adler32.c (renamed from libavutil/adler32-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/aes.c (renamed from libavutil/aes-test.c) | 8 | ||||
-rw-r--r-- | libavutil/tests/atomic.c (renamed from libavutil/atomic-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/avstring.c (renamed from libavutil/avstring-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/base64.c (renamed from libavutil/base64-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/blowfish.c (renamed from libavutil/blowfish-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/bprint.c (renamed from libavutil/bprint-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/camellia.c (renamed from libavutil/camellia-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/cast5.c (renamed from libavutil/cast5-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/color_utils.c (renamed from libavutil/color_utils-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/cpu.c (renamed from libavutil/cpu-test.c) | 5 | ||||
-rw-r--r-- | libavutil/tests/crc.c (renamed from libavutil/crc-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/des.c (renamed from libavutil/des-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/dict.c (renamed from libavutil/dict-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/display.c (renamed from libavutil/display-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/error.c (renamed from libavutil/error-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/eval.c (renamed from libavutil/eval-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/fifo.c (renamed from libavutil/fifo-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/file.c (renamed from libavutil/file-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/float_dsp.c (renamed from libavutil/float_dsp-test.c) | 14 | ||||
-rw-r--r-- | libavutil/tests/hash.c (renamed from libavutil/hash-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/hmac.c (renamed from libavutil/hmac-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/lfg.c (renamed from libavutil/lfg-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/lls.c (renamed from libavutil/lls-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/log.c (renamed from libavutil/log-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/lzo.c (renamed from libavutil/lzo-test.c) | 8 | ||||
-rw-r--r-- | libavutil/tests/md5.c (renamed from libavutil/md5-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/murmur3.c (renamed from libavutil/murmur3-test.c) | 6 | ||||
-rw-r--r-- | libavutil/tests/opt.c (renamed from libavutil/opt-test.c) | 16 | ||||
-rw-r--r-- | libavutil/tests/parseutils.c (renamed from libavutil/parseutils-test.c) | 8 | ||||
-rw-r--r-- | libavutil/tests/pca.c (renamed from libavutil/pca-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/pixdesc.c (renamed from libavutil/pixdesc-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/pixelutils.c (renamed from libavutil/pixelutils-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/random_seed.c (renamed from libavutil/random_seed-test.c) | 2 | ||||
-rw-r--r-- | libavutil/tests/rational.c (renamed from libavutil/rational-test.c) | 5 | ||||
-rw-r--r-- | libavutil/tests/ripemd.c (renamed from libavutil/ripemd-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/sha.c (renamed from libavutil/sha-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/sha512.c (renamed from libavutil/sha512-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/softfloat.c (renamed from libavutil/softfloat-test.c) | 7 | ||||
-rw-r--r-- | libavutil/tests/tea.c (renamed from libavutil/tea-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/tree.c (renamed from libavutil/tree-test.c) | 8 | ||||
-rw-r--r-- | libavutil/tests/twofish.c (renamed from libavutil/twofish-test.c) | 4 | ||||
-rw-r--r-- | libavutil/tests/utf8.c (renamed from libavutil/utf8-test.c) | 0 | ||||
-rw-r--r-- | libavutil/tests/xtea.c (renamed from libavutil/xtea-test.c) | 4 |
47 files changed, 146 insertions, 99 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index a35deb6fec..1f05215ee5 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -221,4 +221,4 @@ TOOLS = crypto_bench ffhash ffeval ffescape tools/crypto_bench$(EXESUF): ELIBS += $(if $(VERSUS),$(subst +, -l,+$(VERSUS)),) tools/crypto_bench$(EXESUF): CFLAGS += -DUSE_EXT_LIBS=0$(if $(VERSUS),$(subst +,+USE_,+$(VERSUS)),) -$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2 +$(SUBDIR)tests/lzo$(EXESUF): ELIBS = -llzo2 diff --git a/libavutil/des.c b/libavutil/des.c index d375095273..6957666184 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -104,7 +104,7 @@ static const uint8_t S_boxes[8][32] = { #else /** * This table contains the results of applying both the S-box and P-shuffle. - * It can be regenerated by compiling des-test.c with "-DCONFIG_SMALL -DGENTABLES". + * It can be regenerated by compiling tests/des.c with "-DCONFIG_SMALL -DGENTABLES". */ static const uint32_t S_boxes_P_shuffle[8][64] = { { 0x00808200, 0x00000000, 0x00008000, 0x00808202, 0x00808002, 0x00008202, 0x00000002, 0x00008000, diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore new file mode 100644 index 0000000000..c23c44b53b --- /dev/null +++ b/libavutil/tests/.gitignore @@ -0,0 +1,44 @@ +/adler32 +/aes +/atomic +/avstring +/base64 +/blowfish +/bprint +/camellia +/cast5 +/color_utils +/cpu +/crc +/des +/dict +/display +/error +/eval +/fifo +/file +/float_dsp +/hash +/hmac +/lfg +/lls +/log +/lzo +/md5 +/murmur3 +/opt +/parseutils +/pca +/pixdesc +/pixelutils +/random_seed +/rational +/ripemd +/sha +/sha512 +/softfloat +/tea +/tree +/twofish +/utf8 +/xtea diff --git a/libavutil/adler32-test.c b/libavutil/tests/adler32.c index f93cf9d449..511bf1e401 100644 --- a/libavutil/adler32-test.c +++ b/libavutil/tests/adler32.c @@ -19,9 +19,9 @@ // LCOV_EXCL_START #include <string.h> -#include "log.h" -#include "timer.h" -#include "adler32.h" +#include "libavutil/log.h" +#include "libavutil/timer.h" +#include "libavutil/adler32.h" #define LEN 7001 diff --git a/libavutil/aes-test.c b/libavutil/tests/aes.c index 2bdba8ada2..1291ad6633 100644 --- a/libavutil/aes-test.c +++ b/libavutil/tests/aes.c @@ -19,10 +19,10 @@ // LCOV_EXCL_START #include <string.h> -#include "aes.h" -#include "lfg.h" -#include "log.h" -#include "mem.h" +#include "libavutil/aes.h" +#include "libavutil/lfg.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char **argv) { diff --git a/libavutil/atomic-test.c b/libavutil/tests/atomic.c index 397d8c9285..c92f220a7a 100644 --- a/libavutil/atomic-test.c +++ b/libavutil/tests/atomic.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "atomic.h" -#include "avassert.h" +#include "libavutil/atomic.h" +#include "libavutil/avassert.h" int main(void) { diff --git a/libavutil/avstring-test.c b/libavutil/tests/avstring.c index 3e29661e96..1242b3fe8d 100644 --- a/libavutil/avstring-test.c +++ b/libavutil/tests/avstring.c @@ -18,9 +18,9 @@ #include <stdio.h> -#include "common.h" -#include "mem.h" -#include "avstring.h" +#include "libavutil/common.h" +#include "libavutil/mem.h" +#include "libavutil/avstring.h" int main(void) { diff --git a/libavutil/base64-test.c b/libavutil/tests/base64.c index 19ecd2bee1..88fd55c220 100644 --- a/libavutil/base64-test.c +++ b/libavutil/tests/base64.c @@ -20,9 +20,9 @@ #include <stdint.h> #include <stdio.h> -#include "common.h" -#include "base64.h" -#include "timer.h" +#include "libavutil/common.h" +#include "libavutil/base64.h" +#include "libavutil/timer.h" #define MAX_DATA_SIZE 1024 #define MAX_ENCODED_SIZE 2048 diff --git a/libavutil/blowfish-test.c b/libavutil/tests/blowfish.c index 3ad7cd7665..2c2e004830 100644 --- a/libavutil/blowfish-test.c +++ b/libavutil/tests/blowfish.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include "blowfish.h" +#include "libavutil/blowfish.h" #define NUM_VARIABLE_KEY_TESTS 34 diff --git a/libavutil/bprint-test.c b/libavutil/tests/bprint.c index f081c4485e..d7f381dd52 100644 --- a/libavutil/bprint-test.c +++ b/libavutil/tests/bprint.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "bprint.c" +#include "libavutil/bprint.c" #undef printf diff --git a/libavutil/camellia-test.c b/libavutil/tests/camellia.c index 0540ccc15d..1716b59a38 100644 --- a/libavutil/camellia-test.c +++ b/libavutil/tests/camellia.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "camellia.h" -#include "log.h" +#include "libavutil/camellia.h" +#include "libavutil/log.h" int main(int argc, char *argv[]) { diff --git a/libavutil/cast5-test.c b/libavutil/tests/cast5.c index e2269a767b..ce3aa80b5b 100644 --- a/libavutil/cast5-test.c +++ b/libavutil/tests/cast5.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "cast5.h" -#include "log.h" +#include "libavutil/cast5.h" +#include "libavutil/log.h" int main(int argc, char** argv) { diff --git a/libavutil/color_utils-test.c b/libavutil/tests/color_utils.c index 083872c3e4..ea0127158b 100644 --- a/libavutil/color_utils-test.c +++ b/libavutil/tests/color_utils.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "color_utils.c" +#include "libavutil/color_utils.c" int main(int argc, char *argv[]) { diff --git a/libavutil/cpu-test.c b/libavutil/tests/cpu.c index 35e7631eaa..f02a54cbbb 100644 --- a/libavutil/cpu-test.c +++ b/libavutil/tests/cpu.c @@ -19,8 +19,9 @@ #include <stdio.h> #include "config.h" -#include "cpu.h" -#include "avstring.h" + +#include "libavutil/cpu.h" +#include "libavutil/avstring.h" #if HAVE_UNISTD_H #include <unistd.h> diff --git a/libavutil/crc-test.c b/libavutil/tests/crc.c index 199aea1ef9..9825d6bec9 100644 --- a/libavutil/crc-test.c +++ b/libavutil/tests/crc.c @@ -19,7 +19,7 @@ #include <stdint.h> #include <stdio.h> -#include "crc.h" +#include "libavutil/crc.h" int main(void) { diff --git a/libavutil/des-test.c b/libavutil/tests/des.c index 99453af6a7..ed04fad519 100644 --- a/libavutil/des-test.c +++ b/libavutil/tests/des.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "des.c" +#include "libavutil/des.c" #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "time.h" +#include "libavutil/time.h" static uint64_t rand64(void) { diff --git a/libavutil/dict-test.c b/libavutil/tests/dict.c index e40b57885f..0039ba5ff9 100644 --- a/libavutil/dict-test.c +++ b/libavutil/tests/dict.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dict.c" +#include "libavutil/dict.c" static void print_dict(const AVDictionary *m) { diff --git a/libavutil/display-test.c b/libavutil/tests/display.c index b42ab893a8..893ebb5543 100644 --- a/libavutil/display-test.c +++ b/libavutil/tests/display.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "display.c" +#include "libavutil/display.c" static void print_matrix(int32_t matrix[9]) { diff --git a/libavutil/error-test.c b/libavutil/tests/error.c index 36240daa4e..16efc8ac45 100644 --- a/libavutil/error-test.c +++ b/libavutil/tests/error.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "error.c" +#include "libavutil/error.c" #undef printf diff --git a/libavutil/eval-test.c b/libavutil/tests/eval.c index 17a63cc25d..2a1afcc4dc 100644 --- a/libavutil/eval-test.c +++ b/libavutil/tests/eval.c @@ -20,9 +20,9 @@ #include <stdio.h> #include <string.h> -#include "libm.h" -#include "timer.h" -#include "eval.h" +#include "libavutil/libm.h" +#include "libavutil/timer.h" +#include "libavutil/eval.h" static const double const_values[] = { M_PI, diff --git a/libavutil/fifo-test.c b/libavutil/tests/fifo.c index 71a9172a45..e4d7edf212 100644 --- a/libavutil/fifo-test.c +++ b/libavutil/tests/fifo.c @@ -18,7 +18,7 @@ #include <stdio.h> -#include "fifo.h" +#include "libavutil/fifo.h" int main(void) { diff --git a/libavutil/file-test.c b/libavutil/tests/file.c index 0324081fb9..3608bcccbe 100644 --- a/libavutil/file-test.c +++ b/libavutil/tests/file.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "file.c" +#include "libavutil/file.c" #undef printf diff --git a/libavutil/float_dsp-test.c b/libavutil/tests/float_dsp.c index 9963efb32c..053324dd38 100644 --- a/libavutil/float_dsp-test.c +++ b/libavutil/tests/float_dsp.c @@ -30,13 +30,13 @@ #include "compat/getopt.c" #endif -#include "common.h" -#include "cpu.h" -#include "internal.h" -#include "lfg.h" -#include "log.h" -#include "random_seed.h" -#include "float_dsp.h" +#include "libavutil/common.h" +#include "libavutil/cpu.h" +#include "libavutil/internal.h" +#include "libavutil/lfg.h" +#include "libavutil/log.h" +#include "libavutil/random_seed.h" +#include "libavutil/float_dsp.h" #define LEN 240 diff --git a/libavutil/hash-test.c b/libavutil/tests/hash.c index bb7edf592b..4f2ad52ad6 100644 --- a/libavutil/hash-test.c +++ b/libavutil/tests/hash.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <string.h> -#include "hash.h" +#include "libavutil/hash.h" #define SRC_BUF_SIZE 64 #define DST_BUF_SIZE (AV_HASH_MAX_SIZE * 8) diff --git a/libavutil/hmac-test.c b/libavutil/tests/hmac.c index 925f3dfef6..5eeb63ce05 100644 --- a/libavutil/hmac-test.c +++ b/libavutil/tests/hmac.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hmac.c" +#include "libavutil/hmac.c" #include <stdio.h> #include <string.h> diff --git a/libavutil/lfg-test.c b/libavutil/tests/lfg.c index 2b6f3828dc..1425e026b4 100644 --- a/libavutil/lfg-test.c +++ b/libavutil/tests/lfg.c @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "log.h" -#include "timer.h" -#include "lfg.h" +#include "libavutil/log.h" +#include "libavutil/timer.h" +#include "libavutil/lfg.h" int main(void) { diff --git a/libavutil/lls-test.c b/libavutil/tests/lls.c index 12215c5257..965b0f458d 100644 --- a/libavutil/lls-test.c +++ b/libavutil/tests/lls.c @@ -19,9 +19,9 @@ #include <limits.h> #include <stdio.h> -#include "internal.h" -#include "lfg.h" -#include "lls.h" +#include "libavutil/internal.h" +#include "libavutil/lfg.h" +#include "libavutil/lls.h" int main(void) { diff --git a/libavutil/log-test.c b/libavutil/tests/log.c index 14d476436f..8fe9461c1b 100644 --- a/libavutil/log-test.c +++ b/libavutil/tests/log.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "log.c" +#include "libavutil/log.c" #include <string.h> diff --git a/libavutil/lzo-test.c b/libavutil/tests/lzo.c index e28fbe53fc..0147ab5c1d 100644 --- a/libavutil/lzo-test.c +++ b/libavutil/tests/lzo.c @@ -20,9 +20,11 @@ #include <stdio.h> #include <lzo/lzo1x.h> -#include "log.h" -#include "lzo.h" -#include "mem.h" + +#include "libavutil/log.h" +#include "libavutil/lzo.h" +#include "libavutil/mem.h" + #define MAXSZ (10*1024*1024) /* Define one of these to 1 if you wish to benchmark liblzo diff --git a/libavutil/md5-test.c b/libavutil/tests/md5.c index 547f74b880..42e4538e0a 100644 --- a/libavutil/md5-test.c +++ b/libavutil/tests/md5.c @@ -19,7 +19,7 @@ #include <stdint.h> #include <stdio.h> -#include "md5.h" +#include "libavutil/md5.h" static void print_md5(uint8_t *md5) { diff --git a/libavutil/murmur3-test.c b/libavutil/tests/murmur3.c index edc7a18bbe..b8d6b1feee 100644 --- a/libavutil/murmur3-test.c +++ b/libavutil/tests/murmur3.c @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "intreadwrite.h" -#include "mem.h" -#include "murmur3.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" +#include "libavutil/murmur3.h" int main(void) { diff --git a/libavutil/opt-test.c b/libavutil/tests/opt.c index e41782bacf..568eb45668 100644 --- a/libavutil/opt-test.c +++ b/libavutil/tests/opt.c @@ -19,14 +19,14 @@ #include <limits.h> #include <stdio.h> -#include "common.h" -#include "channel_layout.h" -#include "error.h" -#include "log.h" -#include "mem.h" -#include "rational.h" -#include "opt.h" -#include "pixdesc.h" +#include "libavutil/common.h" +#include "libavutil/channel_layout.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" +#include "libavutil/rational.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" typedef struct TestContext { const AVClass *class; diff --git a/libavutil/parseutils-test.c b/libavutil/tests/parseutils.c index fa9c1c1d05..682b3907cf 100644 --- a/libavutil/parseutils-test.c +++ b/libavutil/tests/parseutils.c @@ -17,14 +17,14 @@ */ #define TEST -#include "parseutils.c" +#include "libavutil/parseutils.c" #include <stdint.h> #include <stdio.h> -#include "common.h" -#include "log.h" -#include "rational.h" +#include "libavutil/common.h" +#include "libavutil/log.h" +#include "libavutil/rational.h" static uint32_t randomv = MKTAG('L','A','V','U'); diff --git a/libavutil/pca-test.c b/libavutil/tests/pca.c index e56d6185b1..2d9eb8f56a 100644 --- a/libavutil/pca-test.c +++ b/libavutil/tests/pca.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "pca.c" -#include "lfg.h" +#include "libavutil/pca.c" +#include "libavutil/lfg.h" #undef printf #include <stdio.h> diff --git a/libavutil/pixdesc-test.c b/libavutil/tests/pixdesc.c index cd7d4c5f7b..7fbfeea96c 100644 --- a/libavutil/pixdesc-test.c +++ b/libavutil/tests/pixdesc.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "pixdesc.c" +#include "libavutil/pixdesc.c" int main(void){ int i; diff --git a/libavutil/pixelutils-test.c b/libavutil/tests/pixelutils.c index eebc524c87..ec4dc8fe8f 100644 --- a/libavutil/pixelutils-test.c +++ b/libavutil/tests/pixelutils.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "pixelutils.c" +#include "libavutil/pixelutils.c" #define W1 320 #define H1 240 diff --git a/libavutil/random_seed-test.c b/libavutil/tests/random_seed.c index 182c8a6dd6..ebe9b3e7dd 100644 --- a/libavutil/random_seed-test.c +++ b/libavutil/tests/random_seed.c @@ -19,7 +19,7 @@ */ #define TEST 1 -#include "random_seed.c" +#include "libavutil/random_seed.c" #undef printf #define N 256 diff --git a/libavutil/rational-test.c b/libavutil/tests/rational.c index 455d9c42b2..caec07d7cb 100644 --- a/libavutil/rational-test.c +++ b/libavutil/tests/rational.c @@ -19,9 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "rational.c" - -#include "integer.h" +#include "libavutil/rational.c" +#include "libavutil/integer.h" int main(void) { diff --git a/libavutil/ripemd-test.c b/libavutil/tests/ripemd.c index 2a60bbe613..58e5fce344 100644 --- a/libavutil/ripemd-test.c +++ b/libavutil/tests/ripemd.c @@ -21,8 +21,8 @@ #include <stdio.h> -#include "mem.h" -#include "ripemd.h" +#include "libavutil/mem.h" +#include "libavutil/ripemd.h" int main(void) { diff --git a/libavutil/sha-test.c b/libavutil/tests/sha.c index 7af2c04c69..a95b3a001f 100644 --- a/libavutil/sha-test.c +++ b/libavutil/tests/sha.c @@ -18,8 +18,8 @@ #include <stdio.h> -#include "mem.h" -#include "sha.h" +#include "libavutil/mem.h" +#include "libavutil/sha.h" int main(void) { diff --git a/libavutil/sha512-test.c b/libavutil/tests/sha512.c index 32ff50862e..f3b90fdf49 100644 --- a/libavutil/sha512-test.c +++ b/libavutil/tests/sha512.c @@ -23,8 +23,8 @@ #include <stdio.h> -#include "mem.h" -#include "sha512.h" +#include "libavutil/mem.h" +#include "libavutil/sha512.h" int main(void) { diff --git a/libavutil/softfloat-test.c b/libavutil/tests/softfloat.c index 3293450df8..16788d4da9 100644 --- a/libavutil/softfloat-test.c +++ b/libavutil/tests/softfloat.c @@ -19,9 +19,10 @@ */ #include <inttypes.h> -#include "softfloat.h" -#include "common.h" -#include "log.h" + +#include "libavutil/softfloat.h" +#include "libavutil/common.h" +#include "libavutil/log.h" #include <stdio.h> diff --git a/libavutil/tea-test.c b/libavutil/tests/tea.c index 9bf059b980..605bb524af 100644 --- a/libavutil/tea-test.c +++ b/libavutil/tests/tea.c @@ -24,8 +24,8 @@ #include <stdio.h> -#include "common.h" -#include "tea.h" +#include "libavutil/common.h" +#include "libavutil/tea.h" #define TEA_NUM_TESTS 4 diff --git a/libavutil/tree-test.c b/libavutil/tests/tree.c index d1df0b6c87..7503228970 100644 --- a/libavutil/tree-test.c +++ b/libavutil/tests/tree.c @@ -16,13 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tree.c" +#include "libavutil/tree.c" #include <stdint.h> -#include "common.h" -#include "lfg.h" -#include "log.h" +#include "libavutil/common.h" +#include "libavutil/lfg.h" +#include "libavutil/log.h" static int check(AVTreeNode *t) { diff --git a/libavutil/twofish-test.c b/libavutil/tests/twofish.c index be0586a9a1..74e0926eaf 100644 --- a/libavutil/twofish-test.c +++ b/libavutil/tests/twofish.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "log.h" -#include "twofish.h" +#include "libavutil/log.h" +#include "libavutil/twofish.h" #include <stdio.h> #include <stdlib.h> diff --git a/libavutil/utf8-test.c b/libavutil/tests/utf8.c index 37a2802b5f..37a2802b5f 100644 --- a/libavutil/utf8-test.c +++ b/libavutil/tests/utf8.c diff --git a/libavutil/xtea-test.c b/libavutil/tests/xtea.c index e8f39150d9..a974600a25 100644 --- a/libavutil/xtea-test.c +++ b/libavutil/tests/xtea.c @@ -21,8 +21,8 @@ #include <stdlib.h> #include <string.h> -#include "intreadwrite.h" -#include "xtea.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/xtea.h" #define XTEA_NUM_TESTS 6 |