[vlc-commits] contrib: Set pkg-config path in ffmpeg configure

Uwe L. Korn git at videolan.org
Sat May 3 18:43:28 CEST 2014


vlc | branch: master | Uwe L. Korn <uwelk at xhochy.com> | Mon Apr 28 13:29:02 2014 +0100| [aeea38539a5180cdd9046981ae8caefe1f500710] | committer: Jean-Baptiste Kempf

contrib: Set pkg-config path in ffmpeg configure

Although we know in the contrib build system the path to pkg-config,
ffmpeg does not always pick it up and dependency resolution will
fail.

Acked-by: Rémi Denis-Courmont <remi at remlab.net>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5f73239..4ce4682 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -14,6 +14,7 @@ endif
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
+	--pkg-config="$(PKG_CONFIG)" \
 	--disable-doc \
 	--disable-encoder=vorbis \
 	--enable-libgsm \



More information about the vlc-commits mailing list