Commit 8bf086bb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Update libavcodec patch

parent 62776310
......@@ -82,7 +82,7 @@ export PLATFORM_SHORT_ARCH
export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
# 1/ libvlc, libvlccore and its plugins
TESTED_HASH=dfccdf84e19
TESTED_HASH=826ec51f
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
......
From f1a26ad2cc8e64b9bcd1b3f8e71ab91949d288ac Mon Sep 17 00:00:00 2001
From 91bcedc03953339c64f5ad684a3277d12c87cdcc Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 10 Oct 2012 18:50:06 +0200
Subject: [PATCH 2/2] libavcodec: add NEON runtime autodetection
......@@ -6,8 +6,8 @@ Subject: [PATCH 2/2] libavcodec: add NEON runtime autodetection
---
...-use-HAVE_NEON_INLINE-for-NEON-inline-asm.patch | 66 +++
.../0002-arm-call-arm-specific-rv34dsp.patch | 496 +++++++++++++++++++++
contrib/src/ffmpeg/rules.mak | 11 +-
3 files changed, 570 insertions(+), 3 deletions(-)
contrib/src/ffmpeg/rules.mak | 9 +-
3 files changed, 569 insertions(+), 2 deletions(-)
create mode 100644 contrib/src/ffmpeg/0001-arm-use-HAVE_NEON_INLINE-for-NEON-inline-asm.patch
create mode 100644 contrib/src/ffmpeg/0002-arm-call-arm-specific-rv34dsp.patch
......@@ -586,7 +586,7 @@ index 0000000..1976eb1
+
+
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5a16552..11e5d6d 100644
index 4b99a1b..a327800 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
......@@ -598,15 +598,6 @@ index 5a16552..11e5d6d 100644
FFMPEGCONF = \
--cc="$(CC)" \
@@ -34,7 +34,7 @@ endif
# Small size
ifdef ENABLE_SMALL
-FFMPEGCONF += --enable-small --optflags=-O2
+FFMPEGCONF += --enable-small
ifeq ($(ARCH),arm)
ifdef HAVE_ARMV7A
# XXX: assumes > ARMv7-A, and thus thumb2-able
@@ -53,11 +53,14 @@ endif
# ARM stuff
ifeq ($(ARCH),arm)
......@@ -623,7 +614,7 @@ index 5a16552..11e5d6d 100644
# x86 stuff
ifeq ($(ARCH),i386)
@@ -133,6 +136,8 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
@@ -137,6 +140,8 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
rm -Rf $@ $@-git
mkdir -p $@-git
$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment