VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
+ VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
fi
CFLAGS="${CFLAGS_save}"
-RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings old-style-definition missing-prototypes volatile-register-var])
+RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var])
RDC_PROG_CC_FLAGS_IFELSE([-pipe])
dnl This helps detect broken plugins with undefined symbols
VLC_ADD_PLUGINS([converter_fixed mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
+VLC_ADD_PLUGINS([spatializer])
VLC_ADD_PLUGINS([playlist export nsc xtag])
VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
VLC_ADD_LDFLAGS([ffmpeg],[-lz])
fi])
+ AC_ARG_WITH(ffmpeg-amrnb,
+ [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_amrnb" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lamrnb])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-amrwb,
+ [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support],
+ [
+ if test "$with_ffmpeg_amrwb" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lamrwb])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-x264,
+ [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_x264" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lx264])
+ fi])
+
+ AC_ARG_WITH(ffmpeg-a52,
+ [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
+ [
+ if test "$with_ffmpeg_a52" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-la52])
+ fi])
+
dnl
dnl test for --with-ffmpeg-tree
dnl
fi
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
-
- if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_zlib}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lz])
- fi
- fi
- if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_mp3lame}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
- fi
- fi
- if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_faac}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaac])
- fi
- fi
- if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then
- if test "${with_ffmpeg_dts}" != "yes"; then
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
- AC_CHECK_LIB(dts_pic, dts_free,
- [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ],
- [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
- LDFLAGS="${LDFLAGS_save}"
- fi
- fi
- if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc])
- fi
- if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaad])
- fi
- if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore])
- fi
-
+
+ dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc
+ PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH"
+ PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR"
+ export PKG_CONFIG_PATH=""
+ export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}"
+
+ PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [
+ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS})
+ VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})]
+ ,[])
+ AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}"
+ ],[
+ unset PKG_CONFIG_PATH
+ ])
+ AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[
+ export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}"
+ ],[
+ unset PKG_CONFIG_LIBDIR
+ ])
+
VLC_ADD_BUILTINS([ffmpeg])
if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi
- if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil])
- fi
-
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec])
-
- if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
- AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.])
- VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a])
- VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat])
- fi
if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then
AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.])
modules/audio_filter/channel_mixer/Makefile
modules/audio_filter/converter/Makefile
modules/audio_filter/resampler/Makefile
+ modules/audio_filter/spatializer/Makefile
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
projects / vlc / blobdiff