Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,53 +0,0 @@
|
||||
From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001
|
||||
From: elupus <elupus@xbmc.org>
|
||||
Date: Tue, 1 Nov 2011 20:18:35 +0100
|
||||
Subject: [PATCH 13/13] add public version of ff_read_frame_flush
|
||||
|
||||
We need this since we sometimes seek on the
|
||||
input stream behind ffmpeg's back. After this
|
||||
all data need to be flushed completely.
|
||||
|
||||
Patch part of the XBMC patch set for ffmpeg, downloaded from
|
||||
https://github.com/xbmc/FFmpeg/.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
libavformat/avformat.h | 5 +++++
|
||||
libavformat/utils.c | 5 +++++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
|
||||
index 2e54ed1..3a9f292 100644
|
||||
--- a/libavformat/avformat.h
|
||||
+++ b/libavformat/avformat.h
|
||||
@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic,
|
||||
int av_read_frame(AVFormatContext *s, AVPacket *pkt);
|
||||
|
||||
/**
|
||||
+ * Clear out any buffered data in context
|
||||
+ */
|
||||
+void av_read_frame_flush(AVFormatContext *s);
|
||||
+
|
||||
+/**
|
||||
* Seek to the keyframe at timestamp.
|
||||
* 'timestamp' in 'stream_index'.
|
||||
*
|
||||
diff --git a/libavformat/utils.c b/libavformat/utils.c
|
||||
index f4fb172..10dda18 100644
|
||||
--- a/libavformat/utils.c
|
||||
+++ b/libavformat/utils.c
|
||||
@@ -1624,6 +1624,11 @@ void ff_read_frame_flush(AVFormatContext *s)
|
||||
}
|
||||
}
|
||||
|
||||
+void av_read_frame_flush(AVFormatContext *s)
|
||||
+{
|
||||
+ ff_read_frame_flush(s);
|
||||
+}
|
||||
+
|
||||
void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
|
||||
{
|
||||
int i;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
Fix bfin compile error
|
||||
|
||||
See gcc bug report:
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77311
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c ffmpeg-2.8.7/libavcodec/hevcdsp_template.c
|
||||
--- ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c 2016-03-29 04:25:16.000000000 +0200
|
||||
+++ ffmpeg-2.8.7/libavcodec/hevcdsp_template.c 2016-08-12 21:32:36.728178969 +0200
|
||||
@@ -1517,7 +1517,14 @@
|
||||
#define TQ2 pix[2 * xstride + 3 * ystride]
|
||||
#define TQ3 pix[3 * xstride + 3 * ystride]
|
||||
|
||||
-static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
|
||||
+// Blackfin gcc 6.1.x fails with
|
||||
+// unable to find a register to spill in class CCREGS
|
||||
+#if defined(__bfin__)
|
||||
+#define disable_opt __attribute__ ((optimize("O1")))
|
||||
+#else
|
||||
+#define disable_opt
|
||||
+#endif
|
||||
+static void disable_opt FUNC(hevc_loop_filter_luma)(uint8_t *_pix,
|
||||
ptrdiff_t _xstride, ptrdiff_t _ystride,
|
||||
int beta, int *_tc,
|
||||
uint8_t *_no_p, uint8_t *_no_q)
|
||||
@@ -1,7 +1,14 @@
|
||||
config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
bool
|
||||
# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
|
||||
# ffmpeg's configure script only supports mips64 (r1) variant
|
||||
# No support for ARMv7-M in the ARM assembly logic
|
||||
default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 && \
|
||||
!BR2_ARM_CPU_ARMV7M
|
||||
|
||||
menuconfig BR2_PACKAGE_FFMPEG
|
||||
bool "ffmpeg"
|
||||
# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
|
||||
depends on !BR2_nios2
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
help
|
||||
FFmpeg is a complete, cross-platform solution to record, convert
|
||||
and stream audio and video.
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea6e07fa ffmpeg-2.8.6.tar.xz
|
||||
sha256 97be8a6c1cab2c52015544f76d40f6fd0babcb1b40cf601b4e57fb818564157c ffmpeg-2.8.7.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FFMPEG_VERSION = 2.8.6
|
||||
FFMPEG_VERSION = 2.8.7
|
||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||
FFMPEG_INSTALL_STAGING = YES
|
||||
@@ -36,7 +36,6 @@ FFMPEG_CONF_OPTS = \
|
||||
--enable-mdct \
|
||||
--enable-rdft \
|
||||
--disable-crystalhd \
|
||||
--disable-vdpau \
|
||||
--disable-dxva2 \
|
||||
--enable-runtime-cpudetect \
|
||||
--disable-hardcoded-tables \
|
||||
@@ -225,6 +224,10 @@ else
|
||||
FFMPEG_CONF_OPTS += --disable-libdcadec
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy)
|
||||
FFMPEG_DEPENDENCIES += libebur128
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
|
||||
FFMPEG_CONF_OPTS += --enable-libopenh264
|
||||
FFMPEG_DEPENDENCIES += libopenh264
|
||||
@@ -247,6 +250,13 @@ else
|
||||
FFMPEG_CONF_OPTS += --disable-vaapi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVDPAU),y)
|
||||
FFMPEG_CONF_OPTS += --enable-vdpau
|
||||
FFMPEG_DEPENDENCIES += libvdpau
|
||||
else
|
||||
FFMPEG_CONF_OPTS += --disable-vdpau
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
FFMPEG_CONF_OPTS += --enable-libopus
|
||||
FFMPEG_DEPENDENCIES += opus
|
||||
@@ -427,14 +437,15 @@ FFMPEG_CONF_OPTS += --disable-vfp
|
||||
endif
|
||||
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
|
||||
FFMPEG_CONF_OPTS += --enable-neon
|
||||
else
|
||||
FFMPEG_CONF_OPTS += --disable-neon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
|
||||
ifeq ($(BR2_MIPS_SOFT_FLOAT),y)
|
||||
FFMPEG_CONF_OPTS += \
|
||||
--disable-mipsfpu
|
||||
FFMPEG_CONF_OPTS += --disable-mipsfpu
|
||||
else
|
||||
FFMPEG_CONF_OPTS += \
|
||||
--enable-mipsfpu
|
||||
FFMPEG_CONF_OPTS += --enable-mipsfpu
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_mips_32r2),y)
|
||||
@@ -444,6 +455,7 @@ else
|
||||
FFMPEG_CONF_OPTS += \
|
||||
--disable-mips32r2
|
||||
endif
|
||||
endif # MIPS
|
||||
|
||||
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
|
||||
FFMPEG_CONF_OPTS += --enable-altivec
|
||||
|
||||
Reference in New Issue
Block a user