Commit 09fe3888 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Re apply the revert from [12159]. ffmpeg pkg-config has been fixed. closes #306

parent d1001432
...@@ -2138,6 +2138,9 @@ AC_CHECK_HEADERS(id3tag.h, [ ...@@ -2138,6 +2138,9 @@ 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"
...@@ -2164,29 +2167,20 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2164,29 +2167,20 @@ 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
AC_ARG_WITH(ffmpeg-mp3lame, dnl Trying with pkg-config
[ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], PKG_CHECK_MODULES(FFMPEG,libavcodec libavformat,
[ [
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ]) AC_CHECK_HEADERS(ffmpeg/avcodec.h)
AC_CHECK_HEADERS(postproc/postprocess.h)
AC_ARG_WITH(ffmpeg-faac, VLC_ADD_BUILTINS([ffmpeg])
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], if test "${enable_sout}" != "no"; then
[ VLC_ADD_BUILTINS([stream_out_switcher])
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ]) fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
AC_ARG_WITH(ffmpeg-dts, VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}])
[ --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)
dnl dnl
...@@ -2288,6 +2282,31 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2288,6 +2282,31 @@ dnl Look for a ffmpeg-config (we are on debian )
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