Commit 87f1c97e authored by Måns Rullgård's avatar Måns Rullgård

allow recent libfaad versions with new function names

Originally committed as revision 5508 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0187178e
...@@ -1178,7 +1178,6 @@ enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame ...@@ -1178,7 +1178,6 @@ enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame
enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg
enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc
enabled theora && require libtheora theora/theora.h theora_info_init -ltheora enabled theora && require libtheora theora/theora.h theora_info_init -ltheora
enabled faad && require libfaad faad.h faacDecOpen -lfaad
enabled xvid && require XviD xvid.h xvid_global -lxvidcore enabled xvid && require XviD xvid.h xvid_global -lxvidcore
enabled x264 && require x264 x264.h x264_encoder_open -lx264 enabled x264 && require x264 x264.h x264_encoder_open -lx264
enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
...@@ -1201,6 +1200,21 @@ EOF ...@@ -1201,6 +1200,21 @@ EOF
restore_flags restore_flags
fi fi
# Ugh, recent faad2 versions have renamed all functions and #define the
# old names in faad.h. Generic tests won't work.
if enabled faad; then
save_flags
temp_extralibs -lfaad
check_ld <<EOF && add_extralibs -lfaad || die "ERROR: libfaad not found"
#include <faad.h>
int main(){
faacDecOpen();
return 0;
}
EOF
restore_flags
fi
# test for lrintf in math.h # test for lrintf in math.h
check_exec <<EOF && have_lrintf=yes || have_lrintf=no check_exec <<EOF && have_lrintf=yes || have_lrintf=no
#define _ISOC9X_SOURCE 1 #define _ISOC9X_SOURCE 1
......
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