mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 06:57:50 +00:00
ffmpeg: update to ffmpeg-3.3-Leia-Alpha
This commit is contained in:
parent
e8fda252ee
commit
896dfca8b1
@ -17,8 +17,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="ffmpeg"
|
PKG_NAME="ffmpeg"
|
||||||
# Current branch is: release/3.1-xbmc
|
# Current branch is: release/3.3-kodi
|
||||||
PKG_VERSION="33c167d"
|
PKG_VERSION="eb0819c"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="LGPLv2.1+"
|
PKG_LICENSE="LGPLv2.1+"
|
||||||
PKG_SITE="https://ffmpeg.org"
|
PKG_SITE="https://ffmpeg.org"
|
||||||
@ -159,7 +159,6 @@ configure_target() {
|
|||||||
--disable-dxva2 \
|
--disable-dxva2 \
|
||||||
--enable-runtime-cpudetect \
|
--enable-runtime-cpudetect \
|
||||||
$FFMPEG_TABLES \
|
$FFMPEG_TABLES \
|
||||||
--disable-memalign-hack \
|
|
||||||
--disable-encoders \
|
--disable-encoders \
|
||||||
--enable-encoder=ac3 \
|
--enable-encoder=ac3 \
|
||||||
--enable-encoder=aac \
|
--enable-encoder=aac \
|
||||||
@ -188,7 +187,6 @@ configure_target() {
|
|||||||
--disable-libopencore-amrwb \
|
--disable-libopencore-amrwb \
|
||||||
--disable-libopencv \
|
--disable-libopencv \
|
||||||
--disable-libdc1394 \
|
--disable-libdc1394 \
|
||||||
--disable-libfaac \
|
|
||||||
--disable-libfreetype \
|
--disable-libfreetype \
|
||||||
--disable-libgsm \
|
--disable-libgsm \
|
||||||
--disable-libmp3lame \
|
--disable-libmp3lame \
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -22,4 +22,3 @@ index 2fd3f2b..7165652 100644
|
|||||||
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
|
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
|
||||||
*poutbuf = NULL;
|
*poutbuf = NULL;
|
||||||
*poutbuf_size = 0;
|
*poutbuf_size = 0;
|
||||||
|
|
||||||
|
@ -53,4 +53,3 @@ index aca8382..f473f6c 100644
|
|||||||
--
|
--
|
||||||
2.7.4
|
2.7.4
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
--- a/libavformat/tls_openssl.c
|
|
||||||
+++ b/libavformat/tls_openssl.c
|
|
||||||
@@ -233,12 +233,13 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
|
|
||||||
if ((ret = ff_tls_open_underlying(c, h, uri, options)) < 0)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
- p->ctx = SSL_CTX_new(c->listen ? TLSv1_server_method() : TLSv1_client_method());
|
|
||||||
+ p->ctx = SSL_CTX_new(c->listen ? SSLv23_server_method() : SSLv23_client_method());
|
|
||||||
if (!p->ctx) {
|
|
||||||
av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
|
|
||||||
ret = AVERROR(EIO);
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
+ SSL_CTX_set_options(p->ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
|
|
||||||
if (c->ca_file) {
|
|
||||||
if (!SSL_CTX_load_verify_locations(p->ctx, c->ca_file, NULL))
|
|
||||||
av_log(h, AV_LOG_ERROR, "SSL_CTX_load_verify_locations %s\n", ERR_error_string(ERR_get_error(), NULL));
|
|
Loading…
x
Reference in New Issue
Block a user