Permalink
Browse files

Configure: require either libswresample or libavresample. Prefer libs…

…wresample.
  • Loading branch information...
1 parent 563ad42 commit f00b0c2352e0477238706263746d63e328dfd3ed @aballier committed Aug 14, 2012
Showing with 10 additions and 0 deletions.
  1. +10 −0 configure.in
View
10 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],

0 comments on commit f00b0c2

Please sign in to comment.