summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg/ffmpeg
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-03 15:09:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:56 +0000
commita19e8359555e8c098a6d92183394ce2e1ca6ece8 (patch)
treea6ca6af4f31e51fa9d602c00836a7dd9dab2fbe6 /meta/recipes-multimedia/ffmpeg/ffmpeg
parent1bdd2c423af9546080e8f2e15a4cd411346f57be (diff)
downloadpoky-a19e8359555e8c098a6d92183394ce2e1ca6ece8.tar.gz
ffmpeg: update to 3.4
Schroedinger support has been dropped: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/220b24c7c9 Remove upstreamed patch. (From OE-Core rev: 7795925fa985e10f61b92ecc0bb7c45692076f1c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch
deleted file mode 100644
index 3f8224aa07..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-build-fix-for-mips.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From f34c567045bea5a7ded9bcfa8e785cfd24cc7dde Mon Sep 17 00:00:00 2001
2From: Shivraj Patil <shivraj.patil@imgtec.com>
3Date: Tue, 4 Apr 2017 18:56:01 +0530
4Subject: [PATCH] build fix for mips
5
6Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
7Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8---
9Upstream-Status: Backport
10
11 libavcodec/mips/hevcpred_init_mips.c | 3 ++-
12 libavcodec/mips/hevcpred_msa.c | 2 +-
13 2 files changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/libavcodec/mips/hevcpred_init_mips.c b/libavcodec/mips/hevcpred_init_mips.c
16index 331cfac115..e987698d66 100644
17--- a/libavcodec/mips/hevcpred_init_mips.c
18+++ b/libavcodec/mips/hevcpred_init_mips.c
19@@ -18,7 +18,8 @@
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */
22
23-#include "libavcodec/hevc.h"
24+#include "config.h"
25+#include "libavutil/attributes.h"
26 #include "libavcodec/mips/hevcpred_mips.h"
27
28 #if HAVE_MSA
29diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
30index 6a3b2815fd..963c64c861 100644
31--- a/libavcodec/mips/hevcpred_msa.c
32+++ b/libavcodec/mips/hevcpred_msa.c
33@@ -18,7 +18,7 @@
34 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
35 */
36
37-#include "libavcodec/hevc.h"
38+#include "libavcodec/hevcdec.h"
39 #include "libavutil/mips/generic_macros_msa.h"
40 #include "hevcpred_mips.h"
41
42--
432.13.1
44