Browse Source

avcodec/vaapi: remove legacy checks (fixes #26489)

This stuff is removed in AVCODEC ABI 59, and it is no longer used as of
VLC 4.0.
pull/134/head
Rémi Denis-Courmont 5 years ago
committed by Hugo Beauzée-Luyssen
parent
commit
1ee376ac54
  1. 19
      configure.ac
  2. 4
      modules/codec/Makefile.am
  3. 1
      modules/codec/avcodec/vaapi.c

19
configure.ac

@ -2539,25 +2539,6 @@ AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"])
AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"])
AM_CONDITIONAL([HAVE_VAAPI_WL], [test "${have_vaapi_wl}" = "yes"])
have_avcodec_vaapi="no"
AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
AC_CHECK_HEADERS([libavcodec/vaapi.h], [
AC_MSG_NOTICE([VA API acceleration activated])
have_avcodec_vaapi="yes"
],[
AS_IF([test -n "${enable_libva}"], [
AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
], [
AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
])
])
VLC_RESTORE_FLAGS
])
AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"])
dnl
dnl dxva2 needs avcodec
dnl

4
modules/codec/Makefile.am

@ -395,9 +395,11 @@ libvaapi_plugin_la_SOURCES = \
libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS)
if HAVE_AVCODEC_VAAPI
if HAVE_AVCODEC
if HAVE_VAAPI
codec_LTLIBRARIES += libvaapi_plugin.la
endif
endif
libd3d9_common_la_SOURCES = video_chroma/d3d9_fmt.c video_chroma/d3d9_fmt.h \
video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h

1
modules/codec/avcodec/vaapi.c

@ -42,7 +42,6 @@
# include <va/va_drm.h>
#endif
#include <libavcodec/avcodec.h>
#include <libavcodec/vaapi.h>
#include <libavutil/hwcontext_vaapi.h>
#include "avcodec.h"

Loading…
Cancel
Save