aboutsummaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorClément Bœsch2016-06-22 13:44:29 +0200
committerClément Bœsch2016-06-22 13:44:34 +0200
commit5d48e4eafa6c4559683892b8638d10508125f3cf (patch)
tree0d5becbd08d6ae319497dd32cbe9b67f4670cc5e /libswresample
parent989a614b707dcff8abdffe28dc24ec64a83b2837 (diff)
parenta6a750c7ef240b72ce01e9653343a0ddf247d196 (diff)
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 'libswresample')
-rw-r--r--libswresample/tests/.gitignore1
-rw-r--r--libswresample/tests/swresample.c (renamed from libswresample/swresample-test.c)3
2 files changed, 3 insertions, 1 deletions
diff --git a/libswresample/tests/.gitignore b/libswresample/tests/.gitignore
new file mode 100644
index 0000000000..2dc986bd0e
--- /dev/null
+++ b/libswresample/tests/.gitignore
@@ -0,0 +1 @@
+/swresample
diff --git a/libswresample/swresample-test.c b/libswresample/tests/swresample.c
index 0aa47c8d28..9ba7735d16 100644
--- a/libswresample/swresample-test.c
+++ b/libswresample/tests/swresample.c
@@ -23,7 +23,8 @@
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
-#include "swresample.h"
+
+#include "libswresample/swresample.h"
#undef time
#include "time.h"