You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
4.5 KiB
63 lines
4.5 KiB
Index: configure |
|
--- configure.orig 2018-04-20 12:02:55.000000000 +0200 |
|
+++ configure 2018-04-20 19:55:35.520706000 +0200 |
|
@@ -5985,7 +5985,7 @@ |
|
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info |
|
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || |
|
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } |
|
-enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do |
|
+enabled libgsm && { for gsm_hdr in "gsm.h" "gsm.h"; do |
|
check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; |
|
done || die "ERROR: libgsm not found"; } |
|
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs |
|
@@ -6032,7 +6032,7 @@ |
|
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ |
|
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr |
|
enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init |
|
-enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init |
|
+enabled libspeex && require_pkg_config libspeex speexdsp speex/speex.h speex_decoder_init |
|
enabled libsrt && require_pkg_config libsrt "srt >= 1.2.0" srt/srt.h srt_socket |
|
enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate |
|
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg |
|
@@ -6049,22 +6049,22 @@ |
|
|
|
enabled libvpx && { |
|
enabled libvpx_vp8_decoder && { |
|
- check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || |
|
- check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || |
|
+ check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_integer.h vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || |
|
+ check_lib libvpx_vp8_decoder "vpx/vpx_integer.h vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || |
|
die "ERROR: libvpx decoder version must be >=1.4.0"; |
|
} |
|
enabled libvpx_vp8_encoder && { |
|
- check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || |
|
- check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || |
|
+ check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_integer.h vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || |
|
+ check_lib libvpx_vp8_encoder "vpx/vpx_integer.h vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || |
|
die "ERROR: libvpx encoder version must be >=1.4.0"; |
|
} |
|
enabled libvpx_vp9_decoder && { |
|
- check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || |
|
- check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" |
|
+ check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_integer.h vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || |
|
+ check_lib libvpx_vp9_decoder "vpx/vpx_integer.h vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" |
|
} |
|
enabled libvpx_vp9_encoder && { |
|
- check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || |
|
- check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" |
|
+ check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_integer.h vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || |
|
+ check_lib libvpx_vp9_encoder "vpx/vpx_integer.h vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" |
|
} |
|
if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then |
|
die "libvpx enabled but no supported decoders found" |
|
Index: libavformat/tcp.c |
|
--- libavformat/tcp.c.orig 2018-04-20 12:02:58.000000000 +0200 |
|
+++ libavformat/tcp.c 2018-04-20 18:16:26.598628000 +0200 |
|
@@ -31,6 +31,7 @@ |
|
#if HAVE_POLL_H |
|
#include <poll.h> |
|
#endif |
|
+#include <sys/socket.h> |
|
|
|
typedef struct TCPContext { |
|
const AVClass *class;
|
|
|