ffmpeg: Upgrade to 3.3.2 stable

* Fix mips/mips64 along the way, it was broken in 3.3 as well

(From OE-Core rev: ace103370746b7d8ae38701d2ef472f53a68edfb)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2017-06-12 17:32:10 -07:00
committed by Richard Purdie
parent 7408dbccb2
commit f930cbc521
2 changed files with 47 additions and 2 deletions

View File

@@ -0,0 +1,44 @@
From f34c567045bea5a7ded9bcfa8e785cfd24cc7dde Mon Sep 17 00:00:00 2001
From: Shivraj Patil <shivraj.patil@imgtec.com>
Date: Tue, 4 Apr 2017 18:56:01 +0530
Subject: [PATCH] build fix for mips
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
Upstream-Status: Backport
libavcodec/mips/hevcpred_init_mips.c | 3 ++-
libavcodec/mips/hevcpred_msa.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mips/hevcpred_init_mips.c b/libavcodec/mips/hevcpred_init_mips.c
index 331cfac115..e987698d66 100644
--- a/libavcodec/mips/hevcpred_init_mips.c
+++ b/libavcodec/mips/hevcpred_init_mips.c
@@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevc.h"
+#include "config.h"
+#include "libavutil/attributes.h"
#include "libavcodec/mips/hevcpred_mips.h"
#if HAVE_MSA
diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
index 6a3b2815fd..963c64c861 100644
--- a/libavcodec/mips/hevcpred_msa.c
+++ b/libavcodec/mips/hevcpred_msa.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevcdec.h"
#include "libavutil/mips/generic_macros_msa.h"
#include "hevcpred_mips.h"
--
2.13.1

View File

@@ -25,9 +25,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
file://0001-build-fix-for-mips.patch \
"
SRC_URI[md5sum] = "368f1fff4bdadaf2823934cc0aadd71d"
SRC_URI[sha256sum] = "599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d"
SRC_URI[md5sum] = "d6c09c84e3d0d9ca8a51f481da660603"
SRC_URI[sha256sum] = "1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET = "arm"