Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'

* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>

47 files changed, 146 insertions, 99 deletions

diff --git a/libavutil/Makefile b/libavutil/Makefile
index a35deb6..1f05215 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 d375095..6957666 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 0000000..c23c44b
--- /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 f93cf9d..511bf1e 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 2bdba8a..1291ad6 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 397d8c9..c92f220 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 3e29661..1242b3f 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 19ecd2b..88fd55c 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 3ad7cd7..2c2e004 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 f081c44..d7f381d 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 0540ccc..1716b59 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 e2269a7..ce3aa80 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 083872c..ea01271 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 35e7631..f02a54c 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 199aea1..9825d6b 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 99453af..ed04fad 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 e40b578..0039ba5 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 b42ab89..893ebb5 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 36240da..16efc8a 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 17a63cc..2a1afcc 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 71a9172..e4d7edf 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 0324081..3608bcc 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 9963efb..053324d 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 bb7edf5..4f2ad52 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 925f3df..5eeb63c 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 2b6f382..1425e02 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 12215c5..965b0f4 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 14d4764..8fe9461 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 e28fbe5..0147ab5 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 547f74b..42e4538 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 edc7a18..b8d6b1f 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 e41782b..568eb45 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 fa9c1c1..682b390 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 e56d618..2d9eb8f 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 cd7d4c5..7fbfeea 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 eebc524..ec4dc8f 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 182c8a6..ebe9b3e 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 455d9c4..caec07d 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 2a60bbe..58e5fce 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 7af2c04..a95b3a0 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 32ff508..f3b90fd 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 3293450..16788d4 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 9bf059b..605bb52 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 d1df0b6..7503228 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 be0586a9..74e0926 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 37a2802..37a2802 100644
--- a/libavutil/utf8-test.c
+++ b/libavutil/tests/utf8.c
diff --git a/libavutil/xtea-test.c b/libavutil/tests/xtea.c
index e8f3915..a974600 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