mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2025-01-25 00:55:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Link vlc with correct dts library patch by Anssi Hannula

Browse Source
This commit is contained in:
Jean-Paul Saman 2005-11-19 20:52:02 +00:00
parent 353bed9dbe
commit 3796e3b49c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -2251,8 +2251,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
[ [
if test "$with_ffmpeg_mp3lame" = "yes"; then if test "$with_ffmpeg_mp3lame" = "yes"; then
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
fi fi])
])
AC_ARG_WITH(ffmpeg-faac, AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
@ -2265,7 +2264,11 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
[ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
[ [
if test "$with_ffmpeg_dts" = "yes"; then if test "$with_ffmpeg_dts" = "yes"; then
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) 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])
AC_ARG_WITH(ffmpeg-zlib, AC_ARG_WITH(ffmpeg-zlib,
@ -2360,7 +2363,11 @@ dnl Trying with pkg-config
fi fi
if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then
if test "${with_ffmpeg_dts}" != "yes"; then if test "${with_ffmpeg_dts}" != "yes"; then
VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) 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
fi fi
if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then