Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Configure: require either libswresample or libavresample. Prefer libs…
…wresample.
  • Loading branch information
aballier committed Aug 14, 2012
1 parent 563ad42 commit f00b0c2
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions configure.in
Expand Up @@ -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))
Expand Down Expand Up @@ -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],
Expand Down

0 comments on commit f00b0c2

Please sign in to comment.