diff options
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | src/gen7_mfd.c | 7 | ||||
| -rw-r--r-- | src/i965_drv_video.c | 4 |
3 files changed, 0 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index 9948178..5717ce2 100644 --- a/configure.ac +++ b/configure.ac @@ -90,29 +90,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> - #include <va/va_dec_jpeg.h>], - [VAPictureParameterBufferJPEG pic_param; - VASliceParameterBufferJPEG slice_param; - VAIQMatrixParameterBufferJPEG 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 a1ed73d..ff1c15f 100644 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -26,9 +26,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1944,7 +1941,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, @@ -2728,7 +2724,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, @@ -2762,11 +2757,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 05ba908..a097819 100644 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -1141,9 +1141,7 @@ i965_create_buffer_internal(VADriverContextP ctx, case VAEncMiscParameterBufferType: case VAProcPipelineParameterBufferType: case VAProcFilterParameterBufferType: -#ifdef HAVE_JPEG_DECODING case VAHuffmanTableBufferType: -#endif /* Ok */ break; @@ -1540,11 +1538,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; |