ffmpeg: update to ffmpeg-3.3-Leia-Alpha

This commit is contained in:
MilhouseVH 2017-05-10 05:49:19 +01:00
parent e8fda252ee
commit 896dfca8b1
5 changed files with 5190 additions and 5366 deletions

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="ffmpeg"
# Current branch is: release/3.1-xbmc
PKG_VERSION="33c167d"
# Current branch is: release/3.3-kodi
PKG_VERSION="eb0819c"
PKG_ARCH="any"
PKG_LICENSE="LGPLv2.1+"
PKG_SITE="https://ffmpeg.org"
@ -159,7 +159,6 @@ configure_target() {
--disable-dxva2 \
--enable-runtime-cpudetect \
$FFMPEG_TABLES \
--disable-memalign-hack \
--disable-encoders \
--enable-encoder=ac3 \
--enable-encoder=aac \
@ -188,7 +187,6 @@ configure_target() {
--disable-libopencore-amrwb \
--disable-libopencv \
--disable-libdc1394 \
--disable-libfaac \
--disable-libfreetype \
--disable-libgsm \
--disable-libmp3lame \

View File

@ -22,4 +22,3 @@ index 2fd3f2b..7165652 100644
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL;
*poutbuf_size = 0;

View File

@ -53,4 +53,3 @@ index aca8382..f473f6c 100644
--
2.7.4

View File

@ -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));