Commit 1105c8b0 authored by Christophe Mutricy's avatar Christophe Mutricy

postproc also need avutil to link.

parent 9a662c01
...@@ -2876,9 +2876,6 @@ dnl Trying with pkg-config ...@@ -2876,9 +2876,6 @@ dnl Trying with pkg-config
VLC_ADD_LDFLAGS([ffmpeg],[-lavutil]) VLC_ADD_LDFLAGS([ffmpeg],[-lavutil])
LDAVUTIL="-lavutil"]) LDAVUTIL="-lavutil"])
AC_CHECK_LIB(postproc, pp_postprocess, [
VLC_ADD_LDFLAGS([ffmpeg],[-lpostproc])])
AC_CHECK_LIB(avcodec, avcodec_init, [ AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_BUILTINS([ffmpeg])
VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec]) VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
...@@ -2888,6 +2885,11 @@ dnl Trying with pkg-config ...@@ -2888,6 +2885,11 @@ dnl Trying with pkg-config
[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
AC_CHECK_LIB(postproc, pp_postprocess, [
VLC_ADD_LDFLAGS([ffmpeg],[-lpostproc])],
AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]),
[$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [ AC_CHECK_LIB(avformat, av_open_input_stream, [
VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL])
LDFLAGS="${LDFLAGS_save}" LDFLAGS="${LDFLAGS_save}"
......
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