[vlc-commits] contribs: ffmpeg: only apply arm fixups when using FFMpeg.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Dec  7 11:04:05 2017 +0300| [8710951fc638cc182ed0d4e4080f50bb6f449a6b] | committer: Jean-Baptiste Kempf

contribs: ffmpeg: only apply arm fixups when using FFMpeg.

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

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

 contrib/src/ffmpeg/rules.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index f2fa142056..b5ad263ec7 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -224,7 +224,9 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
 	rm -Rf $@ $@-$(FFMPEG_BASENAME)
 	mkdir -p $@-$(FFMPEG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
+endif
 	$(MOVE)
 
 .ffmpeg: ffmpeg