diff --git a/configure.in b/configure.in index 2db2d70252a4b..401067de7c421 100644 --- a/configure.in +++ b/configure.in @@ -1412,6 +1412,13 @@ if test "$use_external_ffmpeg" = "yes"; then # libavcore is optional PKG_CHECK_EXISTS([libavcore], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavcore") + # one of libswresample or libavresample is needed + PKG_CHECK_EXISTS([libswresample], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libswresample", + [PKG_CHECK_EXISTS([libavresample], + FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavresample", + AC_MSG_ERROR([You need either libswresample + or libavresample.]))]) + PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES], [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"], AC_MSG_ERROR($missing_library)) @@ -1445,6 +1452,9 @@ if test "$use_external_ffmpeg" = "yes"; then AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,) AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,) + # Check for libswresample or libavresample headers. + AC_CHECK_HEADERS([libswresample/swresample.h libavresample/avresample.h]) + # Check if AVFilterBufferRefVideoProps AVRational member is named # 'pixel_aspect' or 'sample_aspect_ratio'. AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],