vanhofen
4 years ago
18 changed files with 280 additions and 204 deletions
@ -0,0 +1,43 @@ |
|||||
|
From bf8eae2d30a205bb76ac625e04c0351106981b9e Mon Sep 17 00:00:00 2001 |
||||
|
From: Parker Ernest <@> |
||||
|
Date: Sun, 23 Feb 2020 13:22:42 +0100 |
||||
|
Subject: [PATCH] swscale/x86/yuv2rgb: Fix build without SSSE3 |
||||
|
|
||||
|
commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on |
||||
|
x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II |
||||
|
|
||||
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> |
||||
|
[bernd.kuhls@t-online.de: |
||||
|
- retrieved from upstream patchwork: |
||||
|
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/ |
||||
|
] |
||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> |
||||
|
[yann.morin.1998@free.fr: fix reference top patchwork and SoB order] |
||||
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> |
||||
|
---
|
||||
|
libswscale/x86/yuv2rgb.c | 2 ++ |
||||
|
1 file changed, 2 insertions(+) |
||||
|
|
||||
|
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
|
||||
|
index c12e88cbb5..4791e5b93a 100644
|
||||
|
--- a/libswscale/x86/yuv2rgb.c
|
||||
|
+++ b/libswscale/x86/yuv2rgb.c
|
||||
|
@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
||||
|
#if HAVE_X86ASM |
||||
|
int cpu_flags = av_get_cpu_flags(); |
||||
|
|
||||
|
+#if HAVE_SSSE3
|
||||
|
if (EXTERNAL_SSSE3(cpu_flags)) { |
||||
|
switch (c->dstFormat) { |
||||
|
case AV_PIX_FMT_RGB32: |
||||
|
@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
||||
|
return yuv420_rgb15_ssse3; |
||||
|
} |
||||
|
} |
||||
|
+#endif
|
||||
|
|
||||
|
if (EXTERNAL_MMXEXT(cpu_flags)) { |
||||
|
switch (c->dstFormat) { |
||||
|
--
|
||||
|
2.26.2 |
||||
|
|
||||
@ -0,0 +1,36 @@ |
|||||
|
From 2c6b3f357331e203ad87214984661c40704aceb7 Mon Sep 17 00:00:00 2001 |
||||
|
From: Rainer Hochecker <fernetmenta@online.de> |
||||
|
Date: Sat, 26 Jan 2019 19:48:35 +0100 |
||||
|
Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices |
||||
|
|
||||
|
This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368. |
||||
|
It was hit frequently when watching h264 channels received via DVB-X. |
||||
|
Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704 |
||||
|
|
||||
|
Downloaded from Kodi ffmpeg repo: |
||||
|
https://github.com/xbmc/FFmpeg/commit/2c6b3f357331e203ad87214984661c40704aceb7 |
||||
|
|
||||
|
Patch was sent upstream: |
||||
|
http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html |
||||
|
|
||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> |
||||
|
---
|
||||
|
libavcodec/vaapi_h264.c | 5 +++++ |
||||
|
1 file changed, 5 insertions(+) |
||||
|
|
||||
|
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
|
||||
|
index dd2a6571604..e521a05c4ff 100644
|
||||
|
--- a/libavcodec/vaapi_h264.c
|
||||
|
+++ b/libavcodec/vaapi_h264.c
|
||||
|
@@ -314,6 +314,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
|
||||
|
H264SliceContext *sl = &h->slice_ctx[0]; |
||||
|
int ret; |
||||
|
|
||||
|
+ if (pic->nb_slices == 0) {
|
||||
|
+ ret = AVERROR_INVALIDDATA;
|
||||
|
+ goto finish;
|
||||
|
+ }
|
||||
|
+
|
||||
|
ret = ff_vaapi_decode_issue(avctx, pic); |
||||
|
if (ret < 0) |
||||
|
goto finish; |
||||
@ -0,0 +1,72 @@ |
|||||
|
From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001 |
||||
|
From: Bernd Kuhls <bernd.kuhls@t-online.de> |
||||
|
Date: Sun, 6 Jun 2021 08:54:53 +0200 |
||||
|
Subject: [PATCH] libavutil: Fix mips build |
||||
|
|
||||
|
Check for sys/auxv.h because not all toolchains contain this header. |
||||
|
|
||||
|
Fixes https://trac.ffmpeg.org/ticket/9138 |
||||
|
|
||||
|
Patch sent upstream: |
||||
|
http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html |
||||
|
|
||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> |
||||
|
---
|
||||
|
configure | 2 ++ |
||||
|
libavutil/mips/cpu.c | 6 +++--- |
||||
|
2 files changed, 5 insertions(+), 3 deletions(-) |
||||
|
|
||||
|
diff --git a/configure b/configure
|
||||
|
index 6bfd98b384..773a7d516c 100755
|
||||
|
--- a/configure
|
||||
|
+++ b/configure
|
||||
|
@@ -2161,6 +2161,7 @@ HEADERS_LIST="
|
||||
|
opencv2_core_core_c_h |
||||
|
OpenGL_gl3_h |
||||
|
poll_h |
||||
|
+ sys_auxv_h
|
||||
|
sys_param_h |
||||
|
sys_resource_h |
||||
|
sys_select_h |
||||
|
@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
|
||||
|
check_headers windows.h |
||||
|
check_headers X11/extensions/XvMClib.h |
||||
|
check_headers asm/types.h |
||||
|
+check_headers sys/auxv.h
|
||||
|
|
||||
|
# it seems there are versions of clang in some distros that try to use the |
||||
|
# gcc headers, which explodes for stdatomic |
||||
|
diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c
|
||||
|
index 59619d54de..19196de50b 100644
|
||||
|
--- a/libavutil/mips/cpu.c
|
||||
|
+++ b/libavutil/mips/cpu.c
|
||||
|
@@ -19,7 +19,7 @@
|
||||
|
#include "libavutil/cpu.h" |
||||
|
#include "libavutil/cpu_internal.h" |
||||
|
#include "config.h" |
||||
|
-#if defined __linux__ || defined __ANDROID__
|
||||
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
||||
|
#include <stdint.h> |
||||
|
#include <stdio.h> |
||||
|
#include <string.h> |
||||
|
@@ -28,7 +28,7 @@
|
||||
|
#include "libavutil/avstring.h" |
||||
|
#endif |
||||
|
|
||||
|
-#if defined __linux__ || defined __ANDROID__
|
||||
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
||||
|
|
||||
|
#define HWCAP_LOONGSON_CPUCFG (1 << 14) |
||||
|
|
||||
|
@@ -105,7 +105,7 @@ static int cpu_flags_cpuinfo(void)
|
||||
|
|
||||
|
int ff_get_cpu_flags_mips(void) |
||||
|
{ |
||||
|
-#if defined __linux__ || defined __ANDROID__
|
||||
|
+#if (defined __linux__ || defined __ANDROID__) && HAVE_SYS_AUXV_H
|
||||
|
if (cpucfg_available()) |
||||
|
return cpu_flags_cpucfg(); |
||||
|
else |
||||
|
--
|
||||
|
2.29.2 |
||||
|
|
||||
@ -0,0 +1,47 @@ |
|||||
|
From 0c288853630b7b4e004774c39945d4a804afcfa8 Mon Sep 17 00:00:00 2001 |
||||
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
||||
|
Date: Fri, 6 Aug 2021 09:17:20 +0200 |
||||
|
Subject: [PATCH] configure: add extralibs to extralibs_xxx |
||||
|
|
||||
|
Add extralibs to extralibs_xxx (e.g. extralibs_avformat) to allow |
||||
|
applications such as motion to retrieve ffmpeg dependencies such as |
||||
|
-latomic through pkg-config
|
||||
|
|
||||
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
||||
|
[Upstream status: not upstreamable] |
||||
|
---
|
||||
|
configure | 18 +++++++++--------- |
||||
|
1 file changed, 9 insertions(+), 9 deletions(-) |
||||
|
|
||||
|
diff --git a/configure b/configure
|
||||
|
index 0bb3a7cf2b..3bda99e415 100755
|
||||
|
--- a/configure
|
||||
|
+++ b/configure
|
||||
|
@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}")
|
||||
|
source_path=${source_path} |
||||
|
LIBPREF=${LIBPREF} |
||||
|
LIBSUF=${LIBSUF} |
||||
|
-extralibs_avutil="$avutil_extralibs"
|
||||
|
-extralibs_avcodec="$avcodec_extralibs"
|
||||
|
-extralibs_avformat="$avformat_extralibs"
|
||||
|
-extralibs_avdevice="$avdevice_extralibs"
|
||||
|
-extralibs_avfilter="$avfilter_extralibs"
|
||||
|
-extralibs_avresample="$avresample_extralibs"
|
||||
|
-extralibs_postproc="$postproc_extralibs"
|
||||
|
-extralibs_swscale="$swscale_extralibs"
|
||||
|
-extralibs_swresample="$swresample_extralibs"
|
||||
|
+extralibs_avutil="$avutil_extralibs $extralibs"
|
||||
|
+extralibs_avcodec="$avcodec_extralibs $extralibs"
|
||||
|
+extralibs_avformat="$avformat_extralibs $extralibs"
|
||||
|
+extralibs_avdevice="$avdevice_extralibs $extralibs"
|
||||
|
+extralibs_avfilter="$avfilter_extralibs $extralibs"
|
||||
|
+extralibs_avresample="$avresample_extralibs $extralibs"
|
||||
|
+extralibs_postproc="$postproc_extralibs $extralibs"
|
||||
|
+extralibs_swscale="$swscale_extralibs $extralibs"
|
||||
|
+extralibs_swresample="$swresample_extralibs $extralibs"
|
||||
|
EOF |
||||
|
|
||||
|
for lib in $LIBRARY_LIST; do |
||||
|
--
|
||||
|
2.30.2 |
||||
|
|
||||
@ -1,126 +0,0 @@ |
|||||
--- a/configure
|
|
||||
+++ b/configure
|
|
||||
@@ -3411,10 +3411,8 @@
|
|
||||
# protocols |
|
||||
async_protocol_deps="threads" |
|
||||
bluray_protocol_deps="libbluray" |
|
||||
-ffrtmpcrypt_protocol_conflict="librtmp_protocol"
|
|
||||
ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl mbedtls" |
|
||||
ffrtmpcrypt_protocol_select="tcp_protocol" |
|
||||
-ffrtmphttp_protocol_conflict="librtmp_protocol"
|
|
||||
ffrtmphttp_protocol_select="http_protocol" |
|
||||
ftp_protocol_select="tcp_protocol" |
|
||||
gopher_protocol_select="network" |
|
||||
@@ -3427,20 +3425,18 @@
|
|
||||
icecast_protocol_select="http_protocol" |
|
||||
mmsh_protocol_select="http_protocol" |
|
||||
mmst_protocol_select="network" |
|
||||
-rtmp_protocol_conflict="librtmp_protocol"
|
|
||||
-rtmp_protocol_select="tcp_protocol"
|
|
||||
-rtmp_protocol_suggest="zlib"
|
|
||||
-rtmpe_protocol_select="ffrtmpcrypt_protocol"
|
|
||||
-rtmpe_protocol_suggest="zlib"
|
|
||||
-rtmps_protocol_conflict="librtmp_protocol"
|
|
||||
-rtmps_protocol_select="tls_protocol"
|
|
||||
-rtmps_protocol_suggest="zlib"
|
|
||||
-rtmpt_protocol_select="ffrtmphttp_protocol"
|
|
||||
-rtmpt_protocol_suggest="zlib"
|
|
||||
-rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol"
|
|
||||
-rtmpte_protocol_suggest="zlib"
|
|
||||
-rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
|
|
||||
-rtmpts_protocol_suggest="zlib"
|
|
||||
+ffrtmp_protocol_select="tcp_protocol"
|
|
||||
+ffrtmp_protocol_suggest="zlib"
|
|
||||
+ffrtmpe_protocol_select="ffrtmpcrypt_protocol"
|
|
||||
+ffrtmpe_protocol_suggest="zlib"
|
|
||||
+ffrtmps_protocol_select="tls_protocol"
|
|
||||
+ffrtmps_protocol_suggest="zlib"
|
|
||||
+ffrtmpt_protocol_select="ffrtmphttp_protocol"
|
|
||||
+ffrtmpt_protocol_suggest="zlib"
|
|
||||
+ffrtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol"
|
|
||||
+ffrtmpte_protocol_suggest="zlib"
|
|
||||
+ffrtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
|
|
||||
+ffrtmpts_protocol_suggest="zlib"
|
|
||||
rtp_protocol_select="udp_protocol" |
|
||||
schannel_conflict="openssl gnutls libtls mbedtls" |
|
||||
sctp_protocol_deps="struct_sctp_event_subscribe struct_msghdr_msg_flags" |
|
||||
--- a/libavformat/Makefile
|
|
||||
+++ b/libavformat/Makefile
|
|
||||
@@ -609,12 +609,12 @@
|
|
||||
OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o |
|
||||
OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o |
|
||||
OBJS-$(CONFIG_PROMPEG_PROTOCOL) += prompeg.o |
|
||||
-OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
-OBJS-$(CONFIG_RTMPE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
-OBJS-$(CONFIG_RTMPS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
-OBJS-$(CONFIG_RTMPT_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
-OBJS-$(CONFIG_RTMPTE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
-OBJS-$(CONFIG_RTMPTS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMP_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMPE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMPS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMPT_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMPTE_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
+OBJS-$(CONFIG_FFRTMPTS_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o
|
|
||||
OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o ip.o |
|
||||
OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o |
|
||||
OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o |
|
||||
--- a/libavformat/protocols.c
|
|
||||
+++ b/libavformat/protocols.c
|
|
||||
@@ -44,12 +44,12 @@
|
|
||||
extern const URLProtocol ff_md5_protocol; |
|
||||
extern const URLProtocol ff_pipe_protocol; |
|
||||
extern const URLProtocol ff_prompeg_protocol; |
|
||||
-extern const URLProtocol ff_rtmp_protocol;
|
|
||||
-extern const URLProtocol ff_rtmpe_protocol;
|
|
||||
-extern const URLProtocol ff_rtmps_protocol;
|
|
||||
-extern const URLProtocol ff_rtmpt_protocol;
|
|
||||
-extern const URLProtocol ff_rtmpte_protocol;
|
|
||||
-extern const URLProtocol ff_rtmpts_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmp_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmpe_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmps_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmpt_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmpte_protocol;
|
|
||||
+extern const URLProtocol ff_ffrtmpts_protocol;
|
|
||||
extern const URLProtocol ff_rtp_protocol; |
|
||||
extern const URLProtocol ff_sctp_protocol; |
|
||||
extern const URLProtocol ff_srtp_protocol; |
|
||||
--- a/libavformat/rtmpproto.c
|
|
||||
+++ b/libavformat/rtmpproto.c
|
|
||||
@@ -2591,7 +2591,7 @@
|
|
||||
static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **opts) |
|
||||
{ |
|
||||
RTMPContext *rt = s->priv_data; |
|
||||
- char proto[8], hostname[256], path[1024], auth[100], *fname;
|
|
||||
+ char *proto, tmpProto[10], hostname[256], path[1024], auth[100], *fname;
|
|
||||
char *old_app, *qmark, *n, fname_buffer[1024]; |
|
||||
uint8_t buf[2048]; |
|
||||
int port; |
|
||||
@@ -2602,7 +2602,9 @@
|
|
||||
|
|
||||
rt->is_input = !(flags & AVIO_FLAG_WRITE); |
|
||||
|
|
||||
- av_url_split(proto, sizeof(proto), auth, sizeof(auth),
|
|
||||
+ memset(tmpProto, 0, sizeof(tmpProto));
|
|
||||
+ proto = &tmpProto[2];
|
|
||||
+ av_url_split(tmpProto, sizeof(tmpProto), auth, sizeof(auth),
|
|
||||
hostname, sizeof(hostname), &port, |
|
||||
path, sizeof(path), s->filename); |
|
||||
|
|
||||
@@ -3141,9 +3143,9 @@
|
|
||||
}; |
|
||||
|
|
||||
|
|
||||
-RTMP_PROTOCOL(rtmp)
|
|
||||
-RTMP_PROTOCOL(rtmpe)
|
|
||||
-RTMP_PROTOCOL(rtmps)
|
|
||||
-RTMP_PROTOCOL(rtmpt)
|
|
||||
-RTMP_PROTOCOL(rtmpte)
|
|
||||
-RTMP_PROTOCOL(rtmpts)
|
|
||||
+RTMP_PROTOCOL(ffrtmp)
|
|
||||
+RTMP_PROTOCOL(ffrtmpe)
|
|
||||
+RTMP_PROTOCOL(ffrtmps)
|
|
||||
+RTMP_PROTOCOL(ffrtmpt)
|
|
||||
+RTMP_PROTOCOL(ffrtmpte)
|
|
||||
+RTMP_PROTOCOL(ffrtmpts)
|
|
||||
@ -1,30 +0,0 @@ |
|||||
It will add -mips64r6 and -mips64r2 to cmdline which will |
|
||||
cause conflicts |
|
||||
|
|
||||
in OE we user mips32r2 and mips64r2 for mips arch versions |
|
||||
so there is no benefit of detecting it automatically by |
|
||||
poking at tools especially in cross env |
|
||||
|
|
||||
Fixes errors like |
|
||||
|
|
||||
linking -mnan=2008 module with previous -mnan=legacy modules |
|
||||
failed to merge target specific data of file |
|
||||
|
|
||||
-Khem
|
|
||||
Upstream-Status: Inappropriate [OE-Specific] |
|
||||
|
|
||||
--- a/configure
|
|
||||
+++ b/configure
|
|
||||
@@ -5847,12 +5847,9 @@
|
|
||||
|
|
||||
# Enable minimum ISA based on selected options |
|
||||
if enabled mips64; then |
|
||||
- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
|
|
||||
enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' |
|
||||
disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' |
|
||||
else |
|
||||
- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
|
|
||||
- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
|
|
||||
enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' |
|
||||
disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' |
|
||||
fi |
|
||||
@ -0,0 +1,17 @@ |
|||||
|
--- a/libavutil/common.h_org 2020-05-16 14:06:14.551152997 +0200
|
||||
|
+++ b/libavutil/common.h 2020-05-17 18:59:28.020443989 +0200
|
||||
|
@@ -30,6 +30,14 @@
|
||||
|
#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS |
||||
|
#endif |
||||
|
|
||||
|
+#ifndef INT64_MAX
|
||||
|
+#define INT64_MAX 0x7fffffffffffffffLL
|
||||
|
+#endif
|
||||
|
+
|
||||
|
+#ifndef INT64_MIN
|
||||
|
+#define INT64_MIN (-INT64_MAX - 1LL)
|
||||
|
+#endif
|
||||
|
+
|
||||
|
#include <errno.h> |
||||
|
#include <inttypes.h> |
||||
|
#include <limits.h> |
||||
@ -1,6 +1,6 @@ |
|||||
--- a/libavformat/mov.c
|
--- a/libavformat/mov.c
|
||||
+++ b/libavformat/mov.c
|
+++ b/libavformat/mov.c
|
||||
@@ -3615,8 +3615,10 @@
|
@@ -3634,8 +3634,10 @@
|
||||
|
|
||||
if (ctts_data_old && ctts_index_old < ctts_count_old) { |
if (ctts_data_old && ctts_index_old < ctts_count_old) { |
||||
curr_ctts = ctts_data_old[ctts_index_old].duration; |
curr_ctts = ctts_data_old[ctts_index_old].duration; |
||||
@ -1,6 +1,6 @@ |
|||||
--- a/libavformat/mpegts.c
|
--- a/libavformat/mpegts.c
|
||||
+++ b/libavformat/mpegts.c
|
+++ b/libavformat/mpegts.c
|
||||
@@ -1015,10 +1015,12 @@
|
@@ -1018,10 +1018,12 @@
|
||||
pes->buffer = NULL; |
pes->buffer = NULL; |
||||
reset_pes_packet_state(pes); |
reset_pes_packet_state(pes); |
||||
|
|
||||
@ -0,0 +1,32 @@ |
|||||
|
in OE we user mips32r2 and mips64r2 for mips arch versions |
||||
|
so there is no benefit of detecting it automatically by |
||||
|
poking at tools especially in cross env |
||||
|
|
||||
|
Fixes errors like |
||||
|
|
||||
|
linking -mnan=2008 module with previous -mnan=legacy modules |
||||
|
failed to merge target specific data of file |
||||
|
|
||||
|
-Khem
|
||||
|
Upstream-Status: Inappropriate [OE-Specific] |
||||
|
|
||||
|
--- a/configure
|
||||
|
+++ b/configure
|
||||
|
@@ -5885,17 +5885,10 @@
|
||||
|
|
||||
|
# Check toolchain ISA level |
||||
|
if enabled mips64; then |
||||
|
- enabled mips64r6 && check_inline_asm mips64r6 '"dlsa $0, $0, $0, 1"' &&
|
||||
|
- disable mips64r2
|
||||
|
-
|
||||
|
enabled mips64r2 && check_inline_asm mips64r2 '"dext $0, $0, 0, 1"' |
||||
|
|
||||
|
disable mips32r6 && disable mips32r5 && disable mips32r2 |
||||
|
else |
||||
|
- enabled mips32r6 && check_inline_asm mips32r6 '"aui $0, $0, 0"' &&
|
||||
|
- disable mips32r5 && disable mips32r2
|
||||
|
-
|
||||
|
- enabled mips32r5 && check_inline_asm mips32r5 '"eretnc"'
|
||||
|
enabled mips32r2 && check_inline_asm mips32r2 '"ext $0, $0, 0, 1"' |
||||
|
|
||||
|
disable mips64r6 && disable mips64r5 && disable mips64r2 |
||||
@ -1,6 +1,6 @@ |
|||||
--- a/libavformat/hls.c
|
--- a/libavformat/hls.c
|
||||
+++ b/libavformat/hls.c
|
+++ b/libavformat/hls.c
|
||||
@@ -2142,8 +2142,10 @@
|
@@ -2165,8 +2165,10 @@
|
||||
HLSContext *c = s->priv_data; |
HLSContext *c = s->priv_data; |
||||
int ret, i, minplaylist = -1; |
int ret, i, minplaylist = -1; |
||||
|
|
||||
Loading…
Reference in new issue