oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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.
This commit is contained in:
Max Kellermann 2009-02-09 22:22:06 +01:00
parent d9ce8d8342
commit bee688e99a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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

7
configure.ac
View File

@ -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
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)