diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -1,4 +1,6 @@ ver 0.14.2 (2009/??/??) +* configure.ac: + - define HAVE_FFMPEG after all checks * decoders: - ffmpeg: added support for the tags comment, genre, year - ffmpeg: don't warn of empty packet output diff --git a/configure.ac b/configure.ac index a68d070ed..cbdd2a618 100644 --- a/configure.ac +++ b/configure.ac @@ -784,8 +784,7 @@ fi AM_CONDITIONAL(HAVE_MIKMOD, test x$enable_mod = xyes) if test x$enable_ffmpeg = xyes; then - PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil], - AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]), + PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],, enable_ffmpeg=no) fi @@ -808,6 +807,10 @@ if test x$enable_ffmpeg = xyes; then CPPCFLAGS=$old_CPPFLAGS 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) case $with_zeroconf in |