diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2012-07-26 07:02:39 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2012-07-26 07:02:39 +0800 |
| commit | add58558fba10523b4fda216aaf65c80451a7aac (patch) | |
| tree | b1593372383d61a1fb62c6b9e8f4c3009c5cf8c3 | |
| parent | b70b40930fa29304d360389ec9c4c9b1a5661216 (diff) | |
| download | libva-intel-driver-add58558fba10523b4fda216aaf65c80451a7aac.tar.gz | |
Revert "Fix build with older VA-API (libva)."
This reverts commit bcca7d23de29423b0d7d9954bfb21cc9bf3834f5.
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | src/gen7_mfd.c | 4 | ||||
| -rw-r--r-- | src/i965_drv_video.c | 4 |
3 files changed, 0 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index e86403f6..da1f84cb 100644 --- a/configure.ac +++ b/configure.ac @@ -89,28 +89,6 @@ fi AC_MSG_RESULT([$LIBVA_DRIVERS_PATH]) AC_SUBST(LIBVA_DRIVERS_PATH) -dnl Check for JPEG decoding API -AC_CACHE_CHECK([for JPEG decoding API], ac_cv_have_jpeg_decoding_api, [ - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS" - saved_LIBS="$LIBS" - LIBS="$CFLAGS $LIBVA_DEPS_LIBS" - AC_TRY_COMPILE( - [#include <va/va.h>], - [VAPictureParameterBufferJPEG pic_param; - VASliceParameterBufferJPEG slice_param; - VAIQMatrixBufferJPEG iq_matrix;], - [ac_cv_have_jpeg_decoding_api="yes"], - [ac_cv_have_jpeg_decoding_api="no"] - ) - CFLAGS="$saved_CFLAGS" - LIBS="$saved_LIBS" -]) -if test "$ac_cv_have_jpeg_decoding_api" = "yes"; then - AC_DEFINE(HAVE_JPEG_DECODING, 1, - [Defined to 1 if VA-API exposes JPEG decoding]) -fi - AC_OUTPUT([ Makefile debian.upstream/Makefile diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index d631e279..5120f3f5 100644 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -1918,7 +1918,6 @@ gen7_mfd_vc1_decode_picture(VADriverContextP ctx, intel_batchbuffer_flush(batch); } -#ifdef HAVE_JPEG_DECODING static void gen7_mfd_jpeg_decode_init(VADriverContextP ctx, struct decode_state *decode_state, @@ -2705,7 +2704,6 @@ gen7_mfd_jpeg_decode_picture(VADriverContextP ctx, intel_batchbuffer_end_atomic(batch); intel_batchbuffer_flush(batch); } -#endif static void gen7_mfd_decode_picture(VADriverContextP ctx, @@ -2739,11 +2737,9 @@ gen7_mfd_decode_picture(VADriverContextP ctx, gen7_mfd_vc1_decode_picture(ctx, decode_state, gen7_mfd_context); break; -#ifdef HAVE_JPEG_DECODING case VAProfileJPEGBaseline: gen7_mfd_jpeg_decode_picture(ctx, decode_state, gen7_mfd_context); break; -#endif default: assert(0); diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index 3d852483..2ea22ee3 100644 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -984,9 +984,7 @@ i965_create_buffer_internal(VADriverContextP ctx, case VAEncSequenceParameterBufferType: case VAEncPictureParameterBufferType: case VAEncSliceParameterBufferType: -#ifdef HAVE_JPEG_DECODING case VAHuffmanTableBufferType: -#endif /* Ok */ break; @@ -1334,11 +1332,9 @@ i965_decoder_render_picture(VADriverContextP ctx, vaStatus = I965_RENDER_DECODE_BUFFER(slice_data); break; -#ifdef HAVE_JPEG_DECODING case VAHuffmanTableBufferType: vaStatus = I965_RENDER_DECODE_BUFFER(huffman_table); break; -#endif default: vaStatus = VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE; |