summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-05-16 02:21:20 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-05-16 02:21:20 +0100
commit9cc1ad12d7a936227d82f49a829713ca025a6bd6 (patch)
tree3928d0df4cfc3bbfe33c40570ffd5e979f45ef8a /m4
parent713cbfc4fd926c1596bfa4f093fae308316004c2 (diff)
downloadxine-lib-9cc1ad12d7a936227d82f49a829713ca025a6bd6.tar.gz
xine-lib-9cc1ad12d7a936227d82f49a829713ca025a6bd6.tar.bz2
Fix up "pp" post-proc plugin and A/V decoding for ffmpeg 0.7.
Diffstat (limited to 'm4')
-rw-r--r--m4/decoders.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index ea3bf98d2..38a4b59b3 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -94,7 +94,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
dnl style for headers. The new style would be preferred actually...
AC_CHECK_HEADERS([ffmpeg/avutil.h])
AC_CHECK_HEADERS([libavutil/avutil.h])
- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
+ AC_CHECK_HEADERS([libavutil/sha1.h])
+ AC_CHECK_HEADERS([libavutil/sha.h])
+ if test "$ac_cv_header_ffmpeg_avutil_h$ac_cv_header_libavutil_avutil_h" = "yesyes" || test "$ac_cv_header_libavutil_sha1_h$ac_cv_header_libavutil_sha_h" = "yesyes"; then
AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])
fi