diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2015-09-09 12:19:21 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2015-09-09 12:35:20 +0800 |
| commit | d67fd0eeccc1f178bf628ed7b6ba57b7975e9995 (patch) | |
| tree | 23598051c31cba7e1eecfdae48bcc895dee6757b | |
| parent | bae95b257043c8376b222cba2fc19d639c6c73c6 (diff) | |
Replace --enable-wrapper with --enable-hybrid-codec
hybrid-codec is more meaningful.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit 2d42512bd6b7382c5effe21a5f9999742d98db88)
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/i965_drv_video.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 6f1a66a..993a529 100644 --- a/configure.ac +++ b/configure.ac @@ -56,10 +56,10 @@ AC_ARG_ENABLE([wayland], [build with VA/Wayland API support @<:@default=yes@:>@])], [], [enable_wayland="yes"]) -AC_ARG_ENABLE([wrapper], - [AC_HELP_STRING([--enable-wrapper], - [build with hybrid_wrapper support @<:@default=no@:>@])], - [], [enable_wrapper="no"]) +AC_ARG_ENABLE([hybrid-codec], + [AC_HELP_STRING([--enable-hybrid-codec], + [build with hybrid codec support @<:@default=no@:>@])], + [], [enable_hybrid_codec="no"]) AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -112,10 +112,8 @@ if test "$USE_DRM" = "yes"; then fi AM_CONDITIONAL(USE_DRM, test "$USE_DRM" = "yes") -USE_WRAPPER="no" -if test "$enable_wrapper" = "yes"; then - USE_WRAPPER="yes" - AC_DEFINE([HAVE_USE_WRAPPER], [1], [Defined to 1 if hybrid_wrapper is needed]) +if test "$enable_hybrid_codec" = "yes"; then + AC_DEFINE([HAVE_HYBRID_CODEC], [1], [Defined to 1 if hybrid codec is needed]) fi VA_VERSION=`$PKG_CONFIG --modversion libva` diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index 76fbbbd..62f934f 100644 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -6179,7 +6179,7 @@ error: * to initialize/load the wrapper context of backend driver. * Otherwise it is not loaded. */ -#if HAVE_USE_WRAPPER +#if HAVE_HYBRID_CODEC static VAStatus i965_initialize_wrapper(VADriverContextP ctx, const char *driver_name) @@ -6329,7 +6329,7 @@ i965_Init(VADriverContextP ctx) if (i965->codec_info && i965->codec_info->preinit_hw_codec) i965->codec_info->preinit_hw_codec(ctx, i965->codec_info); -#if HAVE_USE_WRAPPER +#if HAVE_HYBRID_CODEC i965_initialize_wrapper(ctx, "hybrid"); #endif |