mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Replace ffmpeg version from 2.1.1 to 3.2.4
This commit is contained in:
parent
2fcd3972c1
commit
33d6274217
6 changed files with 25 additions and 13 deletions
BIN
trunk/3rdparty/ffmpeg-2.1.1.zip
vendored
BIN
trunk/3rdparty/ffmpeg-2.1.1.zip
vendored
Binary file not shown.
BIN
trunk/3rdparty/ffmpeg-3.2.4.zip
vendored
Normal file
BIN
trunk/3rdparty/ffmpeg-3.2.4.zip
vendored
Normal file
Binary file not shown.
13
trunk/3rdparty/patches/6.ffmpeg.speex.patch
vendored
Normal file
13
trunk/3rdparty/patches/6.ffmpeg.speex.patch
vendored
Normal 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 &&
|
4
trunk/3rdparty/readme.txt
vendored
4
trunk/3rdparty/readme.txt
vendored
|
@ -13,7 +13,7 @@ openssl-1.0.1f.zip
|
|||
CherryPy-3.2.4.zip
|
||||
sample api server for srs.
|
||||
|
||||
ffmpeg-2.1.1.tar.gz
|
||||
ffmpeg-3.2.4.tar.gz
|
||||
yasm-1.2.0.tar.gz
|
||||
lame-3.99.5.tar.gz
|
||||
speex-1.2rc1.zip
|
||||
|
@ -45,7 +45,7 @@ links:
|
|||
http://sourceforge.net/projects/state-threads
|
||||
ffmpeg:
|
||||
http://ffmpeg.org/
|
||||
http://ffmpeg.org/releases/ffmpeg-2.1.1.tar.gz
|
||||
http://ffmpeg.org/releases/ffmpeg-3.2.4.tar.gz
|
||||
x264:
|
||||
http://www.videolan.org/
|
||||
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20131129-2245-stable.tar.bz2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue