mirror of
https://github.com/mpv-player/mpv
synced 2024-12-16 03:45:23 +00:00
-logg must come before -lvorbisidec since both declare the same symbols.
Otherwise demux_ogg will take have the functions from libogg and the other half from libvorbisidec, ending in a crash git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19360 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
3e1a95f6f9
commit
00c76dea5c
4
configure
vendored
4
configure
vendored
@ -5565,7 +5565,7 @@ elif test "$_tremor_external" = auto; then
|
||||
#include <tremor/ivorbiscodec.h>
|
||||
int main(void) { vorbis_packet_blocksize(0,0); return 0; }
|
||||
EOF
|
||||
cc_check -lvorbisidec -logg $_ld_lm && _tremor_external=yes && _libvorbis=no
|
||||
cc_check -logg -lvorbisidec $_ld_lm && _tremor_external=yes && _libvorbis=no
|
||||
fi
|
||||
if test "$_libvorbis" = auto; then
|
||||
_libvorbis=no
|
||||
@ -5591,7 +5591,7 @@ elif test "$_tremor_external" = yes ; then
|
||||
_def_tremor='#define TREMOR 1'
|
||||
_codecmodules="tremor(external) $_codecmodules"
|
||||
_res_comment="external Tremor"
|
||||
_ld_vorbis='-lvorbisidec -logg'
|
||||
_ld_vorbis='-logg -lvorbisidec'
|
||||
elif test "$_libvorbis" = yes ; then
|
||||
_vorbis=yes
|
||||
_def_vorbis='#define HAVE_OGGVORBIS 1'
|
||||
|
Loading…
Reference in New Issue
Block a user