external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Replace ffmpeg version from 2.1.1 to 3.2.4

Browse source
This commit is contained in:
HungMingWu 2017-02-13 23:29:39 +08:00
parent 2fcd3972c1
commit 33d6274217
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/3rdparty/patches/6.ffmpeg.speex.patch vendored Normal file
View file

@ -0,0 +1,13 @@
--- configure 2017-02-10 21:25:25.000000000 +0800
+++ ../ffmpeg-3.2.4-patch/configure 2017-02-13 22:39:22.676288196 +0800
@@ -5739,7 +5739,9 @@
enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init
-enabled libspeex && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
+enabled libspeex && { use_pkg_config speex speex/speex.h speex_decoder_init -lspeex ||
+ { require libspeex speex/speex.h speex_decoder_init -lspeex &&
+ warn "using libspeex without pkg-config"; } }
enabled libtesseract && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame &&