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 /libswscale | |
| 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 'libswscale')
| -rw-r--r-- | libswscale/tests/.gitignore | 2 | ||||
| -rw-r--r-- | libswscale/tests/colorspace.c (renamed from libswscale/colorspace-test.c) | 5 | ||||
| -rw-r--r-- | libswscale/tests/swscale.c (renamed from libswscale/swscale-test.c) | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libswscale/tests/.gitignore b/libswscale/tests/.gitignore new file mode 100644 index 0000000000..0ac3691ecd --- /dev/null +++ b/libswscale/tests/.gitignore @@ -0,0 +1,2 @@ +/colorspace +/swscale diff --git a/libswscale/colorspace-test.c b/libswscale/tests/colorspace.c index f6e0c920cd..d1eddc82bf 100644 --- a/libswscale/colorspace-test.c +++ b/libswscale/tests/colorspace.c @@ -23,10 +23,11 @@ #include <stdlib.h> #include <inttypes.h> -#include "swscale.h" -#include "rgb2rgb.h" #include "libavutil/mem.h" +#include "libswscale/swscale.h" +#include "libswscale/rgb2rgb.h" + #define SIZE 1000 #define srcByte 0x55 #define dstByte 0xBB diff --git a/libswscale/swscale-test.c b/libswscale/tests/swscale.c index 4d8d08bd1a..58c211453a 100644 --- a/libswscale/swscale-test.c +++ b/libswscale/tests/swscale.c @@ -31,7 +31,8 @@ #include "libavutil/crc.h" #include "libavutil/pixdesc.h" #include "libavutil/lfg.h" -#include "swscale.h" + +#include "libswscale/swscale.h" /* HACK Duplicated from swscale_internal.h. * Should be removed when a cleaner pixel format system exists. */ |