diff options
| author | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-02-10 10:54:23 -0700 |
|---|---|---|
| committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-02-10 10:54:23 -0700 |
| commit | ea16a090c4f54aa55c603d41b99e8097f207f946 (patch) | |
| tree | c693d00fb54ad88be3493c3fe673d9e974c2d00f | |
| parent | 699163e7b67de1c6ec6429dd9ebe94f48779b7be (diff) | |
Revert "[buildsys] Fix parallel build with static ffmpeg."
This reverts commit ad815563a3837bbd9ea73c3645af55ec56cacb9a.
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index 7eb0b345e1..428b67ccf5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -497,17 +497,6 @@ DYNOBJSXBMC += lib/ffmpeg/libavcodec/libavcodec.a \ lib/ffmpeg/libpostproc/libpostproc.a \ lib/ffmpeg/libswscale/libswscale.a LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ - -lib/ffmpeg/libavcodec/libavcodec.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libavfilter/libavfilter.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libswresample/libswresample.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libavformat/libavformat.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libavutil/libavutil.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libpostproc/libpostproc.a: lib/ffmpeg/ffmpeg -lib/ffmpeg/libswscale/libswscale.a: lib/ffmpeg/ffmpeg - -lib/ffmpeg/ffmpeg: - make -C lib/ffmpeg endif OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC)) diff --git a/configure.in b/configure.in index 38b94735db..808f74bdcf 100644 --- a/configure.in +++ b/configure.in @@ -2719,7 +2719,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ # handle disables first, we do individual enables later ffmpg_config="$ffmpg_config --disable-muxers --disable-encoders" ffmpg_config="$ffmpg_config --disable-devices --disable-doc" - ffmpg_config="$ffmpg_config --disable-ffplay --enable-ffmpeg" + ffmpg_config="$ffmpg_config --disable-ffplay --disable-ffmpeg" ffmpg_config="$ffmpg_config --disable-ffprobe --disable-ffserver" ffmpg_config="$ffmpg_config --enable-vda --disable-crystalhd" ffmpg_config="$ffmpg_config --disable-decoder=mpeg_xvmc" @@ -2817,7 +2817,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ --disable-ffprobe \ --disable-ffplay \ --disable-ffserver \ - --enable-ffmpeg \ + --disable-ffmpeg \ --disable-crystalhd \ `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static; else echo --enable-shared; fi` \ --disable-doc \ |