Skip to content

M
mpd
Commit bee688e9 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

configure.ac: define HAVE_FFMPEG after all checks

Don't define HAVE_FFMPEG if the ffmpeg libraries were found via pkg-config, but ffmpeg support was disabled because avcodec_decode_audio2() is not available.
parent d9ce8d83
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
NEWS
View file @ bee688e9
...@@ -35,6 +35,8 @@ ver 0.15 - (200?/??/??) ...@@ -35,6 +35,8 @@ ver 0.15 - (200?/??/??)
ver 0.14.2 (2009/??/??) ver 0.14.2 (2009/??/??)
* configure.ac:
- define HAVE_FFMPEG after all checks
* decoders: * decoders:
- ffmpeg: added support for the tags comment, genre, year - ffmpeg: added support for the tags comment, genre, year
- ffmpeg: don't warn of empty packet output - ffmpeg: don't warn of empty packet output
......
configure.ac
View file @ bee688e9
...@@ -975,8 +975,7 @@ fi ...@@ -975,8 +975,7 @@ fi
AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = xyes) AM_CONDITIONAL(HAVE_MODPLUG, test x$enable_modplug = xyes)
if test x$enable_ffmpeg = xyes; then if test x$enable_ffmpeg = xyes; then
PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil], PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]),
enable_ffmpeg=no) enable_ffmpeg=no)
fi fi
...@@ -999,6 +998,10 @@ if test x$enable_ffmpeg = xyes; then ...@@ -999,6 +998,10 @@ if test x$enable_ffmpeg = xyes; then
CPPCFLAGS=$old_CPPFLAGS CPPCFLAGS=$old_CPPFLAGS
fi fi
if test x$enable_ffmpeg = xyes; then
AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]),
fi
AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes) AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment