Skip to content

Commit

Permalink
Relax requirements for FFmpeg hwaccel
Browse files Browse the repository at this point in the history
It doesn't error out anymore since 5edd1f62ca1
  • Loading branch information
funman committed Feb 28, 2016
1 parent bfca1ad commit b8869f9
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
case "${avfork}" in
ffmpeg)
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
])
])
;;
esac
Expand Down Expand Up @@ -2405,7 +2407,9 @@ AS_IF([test "${enable_dxva2}" != "no"], [
case "${avfork}" in
ffmpeg)
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
])
])
;;
esac
Expand Down Expand Up @@ -3113,7 +3117,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
libav) av_vdpau_ver="55.26.0" ;;
ffmpeg) av_vdpau_ver="55.42.100"
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
])
])
;;
esac
Expand Down

0 comments on commit b8869f9

Please sign in to comment.