[vlc-commits] contribs: ffmpeg, fix compilation for ARMv7 on Android

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec  6 23:46:29 2017 +0100| [a55d886ddd77e29cd3d12178a8a3eaecf6643dcc] | committer: Jean-Baptiste Kempf

contribs: ffmpeg, fix compilation for ARMv7 on Android

(cherry picked from commit d14c813b19b9f40e3c1de93f2d750ced41f0e7f1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a55d886ddd77e29cd3d12178a8a3eaecf6643dcc
---

 contrib/src/ffmpeg/armv7_fixup.patch | 14 ++++++++++++++
 contrib/src/ffmpeg/rules.mak         |  1 +
 2 files changed, 15 insertions(+)

diff --git a/contrib/src/ffmpeg/armv7_fixup.patch b/contrib/src/ffmpeg/armv7_fixup.patch
new file mode 100644
index 0000000000..0fe40de595
--- /dev/null
+++ b/contrib/src/ffmpeg/armv7_fixup.patch
@@ -0,0 +1,14 @@
+diff --git a/libavcodec/arm/hevcdsp_idct_neon.S b/libavcodec/arm/hevcdsp_idct_neon.S
+index 139029a256..5ac730c075 100644
+--- a/libavcodec/arm/hevcdsp_idct_neon.S
++++ b/libavcodec/arm/hevcdsp_idct_neon.S
+@@ -1017,8 +1017,8 @@ endfunc
+ tr_16x4 firstpass, 7, 512, 1
+ tr_16x4 secondpass_8, 20 - 8, 512, 1
+ tr_16x4 secondpass_10, 20 - 10, 512, 1
+-tr_16x4 noscale, 0, 2048, 4
+ .ltorg
++tr_16x4 noscale, 0, 2048, 4
+ tr_32x4 firstpass, 7
+ tr_32x4 secondpass_8, 20 - 8
+ tr_32x4 secondpass_10, 20 - 10
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 4afb87af7c..b31c1e38ce 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -222,6 +222,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
 	rm -Rf $@ $@-$(FFMPEG_BASENAME)
 	mkdir -p $@-$(FFMPEG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
 	$(MOVE)
 
 .ffmpeg: ffmpeg