diff options
author | Kevin Mitchell <kevmitch@gmail.com> | 2014-11-03 15:40:17 -0800 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2014-11-03 17:06:38 -0800 |
commit | 73bc6153fe2ab977a5530e6d8b66261ea2a2e2b9 (patch) | |
tree | 65f0cabfcf24a2149b43b470171a433f06991cfc | |
parent | 22c3c231fb646a5898ac2b9605a8a23f8cf77ba5 (diff) | |
download | mpv-build-73bc6153fe2ab977a5530e6d8b66261ea2a2e2b9.tar.bz2 mpv-build-73bc6153fe2ab977a5530e6d8b66261ea2a2e2b9.tar.xz |
move ffmpeg build after libass
in case someone wants to add --enable-libass to ffmpeg_options
-rwxr-xr-x | build | 4 | ||||
-rwxr-xr-x | scripts/ffmpeg-config | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1,11 +1,11 @@ #!/bin/sh set -e -scripts/ffmpeg-config -scripts/ffmpeg-build $@ #scripts/fribidi-config #scripts/fribidi-build $@ scripts/libass-config scripts/libass-build $@ +scripts/ffmpeg-config +scripts/ffmpeg-build $@ scripts/mpv-config scripts/mpv-build $@ diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index e68ff55..1d60174 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -19,4 +19,4 @@ echo Using ffmpeg options: $OPTIONS mkdir -p "$BUILD"/ffmpeg_build cd "$BUILD"/ffmpeg_build -"$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS +PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig "$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS |