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

Konstantin Pavlov git at videolan.org
Thu Dec 7 09:05:07 CET 2017


vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Dec  7 11:04:05 2017 +0300| [22bf300392596146431a199858a50e1bf1542c6e] | committer: Konstantin Pavlov

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

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

 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



More information about the vlc-commits mailing list