diff options
author | Austin Yuan <shengquan.yuan@gmail.com> | 2010-03-08 13:36:15 +0800 |
---|---|---|
committer | Austin Yuan <shengquan.yuan@gmail.com> | 2010-03-08 13:36:15 +0800 |
commit | 68b4274b0df867c4569194edb54256d603adea1c (patch) | |
tree | c9b2cf0fa8c1f7b4d42a4fb9d771b95fe5c07a86 /test | |
parent | 03d63fe65f302199da2b7ed5180dd8103104142f (diff) |
Remove IN_LIBVA defines, Thanks for the patch from Gwenole
Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 6 | ||||
-rw-r--r-- | test/basic/Makefile.am | 4 | ||||
-rw-r--r-- | test/basic/test.c | 4 | ||||
-rw-r--r-- | test/basic/test_common.c | 4 | ||||
-rw-r--r-- | test/decode/Makefile.am | 4 | ||||
-rw-r--r-- | test/decode/mpeg2vldemo.c | 4 | ||||
-rw-r--r-- | test/encode/Makefile.am | 4 | ||||
-rw-r--r-- | test/encode/h264encode.c | 7 | ||||
-rw-r--r-- | test/putsurface/Makefile.am | 4 | ||||
-rw-r--r-- | test/putsurface/putsurface.c | 6 | ||||
-rw-r--r-- | test/vainfo.c | 4 |
11 files changed, 19 insertions, 32 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 5734226..d7e1b1f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,11 +23,11 @@ bin_PROGRAMS = vainfo -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) -vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) +vainfo_LDADD = $(top_srcdir)/va/$(libvabackendlib) +vainfo_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib) vainfo_SOURCES = vainfo.c SUBDIRS = basic decode encode putsurface diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index 24de161..49a54a0 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -23,9 +23,9 @@ bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ test_07 test_08 test_09 test_10 test_11 -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) test_01_LDADD = $(TEST_LIBS) test_01_SOURCES = test_01.c diff --git a/test/basic/test.c b/test/basic/test.c index 2e98b12..a03a8b2 100644 --- a/test/basic/test.c +++ b/test/basic/test.c @@ -22,11 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef IN_LIBVA -#include <va_x11.h> -#else #include <va/va_x11.h> -#endif #include "assert.h" #include <stdarg.h> diff --git a/test/basic/test_common.c b/test/basic/test_common.c index 91774da..8287d1e 100644 --- a/test/basic/test_common.c +++ b/test/basic/test_common.c @@ -22,11 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef IN_LIBVA -#include <va_x11.h> -#else #include <va/va_x11.h> -#endif #include "assert.h" #include <stdarg.h> diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index 9283671..b100421 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = mpeg2vldemo -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) mpeg2vldemo_LDADD = $(TEST_LIBS) mpeg2vldemo_SOURCES = mpeg2vldemo.c diff --git a/test/decode/mpeg2vldemo.c b/test/decode/mpeg2vldemo.c index d62f1c2..7057675 100644 --- a/test/decode/mpeg2vldemo.c +++ b/test/decode/mpeg2vldemo.c @@ -47,8 +47,8 @@ #include <assert.h> -#include "va.h" -#include "va_x11.h" +#include <va/va.h> +#include <va/va_x11.h> #define CHECK_VASTATUS(va_status,func) \ if (va_status != VA_STATUS_SUCCESS) { \ diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 6d2d5a9..5866666 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = h264encode -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) h264encode_LDADD = $(TEST_LIBS) h264encode_SOURCES = h264encode.c diff --git a/test/encode/h264encode.c b/test/encode/h264encode.c index ca9f532..bb0cce9 100644 --- a/test/encode/h264encode.c +++ b/test/encode/h264encode.c @@ -26,7 +26,7 @@ * it is a real program to show how VAAPI encoding work, * It does H264 element stream level encoding on auto-generated YUV data * - * gcc -o h264encode h264encode -lva -lva-x11 -I/usr/include/va + * gcc -o h264encode h264encode -lva -lva-x11 * ./h264encode -w <width> -h <height> -n <frame_num> * */ @@ -44,9 +44,8 @@ #include <assert.h> -#include "va.h" -#include "va_x11.h" - +#include <va/va.h> +#include <va/va_x11.h> #define CHECK_VASTATUS(va_status,func) \ if (va_status != VA_STATUS_SUCCESS) { \ diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index b0e20ba..51edb25 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = putsurface -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) -lpthread +TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) -lpthread putsurface_LDADD = $(TEST_LIBS) putsurface_SOURCES = putsurface.c diff --git a/test/putsurface/putsurface.c b/test/putsurface/putsurface.c index 335368a..0de786c 100644 --- a/test/putsurface/putsurface.c +++ b/test/putsurface/putsurface.c @@ -23,7 +23,7 @@ */ -/* gcc -o putsurface putsurface.c -lva -lva-x11 -I/usr/include/va */ +/* gcc -o putsurface putsurface.c -lva -lva-x11 */ #include <stdio.h> #include <string.h> @@ -39,8 +39,8 @@ #include <sys/stat.h> #include <fcntl.h> -#include "va.h" -#include "va_x11.h" +#include <va/va.h> +#include <va/va_x11.h> #include <assert.h> diff --git a/test/vainfo.c b/test/vainfo.c index 79ee055..33d6ea4 100644 --- a/test/vainfo.c +++ b/test/vainfo.c @@ -22,11 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef IN_LIBVA -#include <va_x11.h> -#else #include <va/va_x11.h> -#endif #include <stdarg.h> #include <stdio.h> |