diff options
| author | Brad Smith <brad@comstyle.com> | 2011-05-17 02:05:22 +0000 |
|---|---|---|
| committer | Brad Smith <brad@comstyle.com> | 2011-05-17 02:05:22 +0000 |
| commit | 597429a7d24b55dec3570598f9509e8aa635cf04 (patch) | |
| tree | f18d59929cf936207b2687ee29162ce13f25488e /m4 | |
| parent | f5e7f8e8d41fd9fa6f8e3fdc7930134eef9855a3 (diff) | |
| download | xine-lib-597429a7d24b55dec3570598f9509e8aa635cf04.tar.gz xine-lib-597429a7d24b55dec3570598f9509e8aa635cf04.tar.bz2 | |
Fix build with relatively recent copies of FFmpeg
Relatively recent copies of FFmpeg before the major API clean up have both
the old SHA1 API and the new SHA (1/2) API so the recently added autoconf
check will reject perfectly valid copies of FFmpeg. Also tweak the
input_cdda code to make sure to use the new API and not include the compat
macros if both the old and new API are around.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 38a4b59b3..f1d9a9403 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -96,7 +96,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ AC_CHECK_HEADERS([libavutil/avutil.h]) 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 + if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!]) fi |