diff options
author | Ricardo Constantino <wiiaboo@gmail.com> | 2017-07-04 19:01:22 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2017-07-06 15:39:10 -0400 |
commit | 3b3501f75cb20b9f7abf43a3a9b1c3de595bc588 (patch) | |
tree | 79fd328b46d9535154c0d8c2625df732cc42dbab | |
parent | 99c68861f9c79033e09ad842e2651a4b3aea95ea (diff) | |
download | ffmpeg-3b3501f75cb20b9f7abf43a3a9b1c3de595bc588.tar.gz |
configure: require pkg-config for libvorbis
libvorbis comes with pkg-config files since at least v1.0.1, way back in 2003.
We need the two checks for vorbis and vorbisenc because we use functions from
both and Xiph considers them separate libraries.
The check is inverted (vorbis first then vorbisenc) because add_extralibs()
prepends to EXTRALIBS instead of appending. For both shared and static linking
the order didn't seem to matter anyway, testing with MinGW.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -5902,7 +5902,8 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl enabled libvidstab && require_pkg_config "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc -enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg +enabled libvorbis && require_pkg_config vorbis vorbis/codec.h vorbis_info_init && + require_pkg_config vorbisenc vorbis/vorbisenc.h vorbis_encode_init enabled libvpx && { enabled libvpx_vp8_decoder && { |