Commit 1a13f12c authored by Christophe Massiot's avatar Christophe Massiot

* configure.ac: Reverted [12094] and [12138] because the ffmpeg team

   doesn't care to fix their packageconfig stuff to be really useful (such
   as instructing to link with mp3lame, zlib, etc.), so the
   packageconfig stuff doesn't bring much, and the current code breaks
   under OS X and Cygwin (at least).
parent 7a833ab0
...@@ -2018,9 +2018,6 @@ AC_CHECK_HEADERS(id3tag.h, [ ...@@ -2018,9 +2018,6 @@ AC_CHECK_HEADERS(id3tag.h, [
dnl dnl
dnl ffmpeg decoder/demuxer plugin dnl ffmpeg decoder/demuxer plugin
dnl dnl
dnl we try to find ffmpeg using : 1- ffmpeg-config, 2- pkg-config
dnl 3- default place, 4- given tree
AC_ARG_ENABLE(ffmpeg, AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)]) [ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "${enable_ffmpeg}" != "no" if test "${enable_ffmpeg}" != "no"
...@@ -2047,19 +2044,28 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2047,19 +2044,28 @@ dnl Look for a ffmpeg-config (we are on debian )
VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
else else
dnl Trying with pkg-config AC_ARG_WITH(ffmpeg-mp3lame,
PKG_CHECK_MODULES(FFMPEG,libavcodec libavformat, [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
[ [
AC_CHECK_HEADERS(ffmpeg/avcodec.h) VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_CHECK_HEADERS(postproc/postprocess.h)
VLC_ADD_BUILTINS([ffmpeg])
if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}])
],[ AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
AC_ARG_WITH(ffmpeg-dts,
[ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
AC_ARG_WITH(ffmpeg-zlib,
[ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
dnl dnl
dnl test for !(--with-ffmpeg-tree) dnl test for !(--with-ffmpeg-tree)
...@@ -2162,31 +2168,6 @@ dnl Trying with pkg-config ...@@ -2162,31 +2168,6 @@ dnl Trying with pkg-config
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat])
fi fi
fi fi
])
AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
AC_ARG_WITH(ffmpeg-dts,
[ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
AC_ARG_WITH(ffmpeg-zlib,
[ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support],
[
VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
fi fi
fi fi
......
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