diff --git a/.devcontainer/all/Dockerfile b/.devcontainer/all/Dockerfile index 9bff5c5..bde2510 100644 --- a/.devcontainer/all/Dockerfile +++ b/.devcontainer/all/Dockerfile @@ -33,7 +33,7 @@ RUN cd ~ && git clone --depth 1 'https://code.videolan.org/videolan/x264.git' && && ./configure --disable-cli --enable-strip --enable-pic --enable-shared --disable-static --prefix=/usr \ && make -j$(grep -c ^processor /proc/cpuinfo) && make install \ && cd ~ && rm -rf x264 -RUN cd ~ && git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' && cd ffmpeg \ +RUN cd ~ && git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' ffmpeg && cd ffmpeg \ && ./configure --enable-shared --disable-static --enable-gpl --enable-version3 --enable-libx264 --prefix=/usr \ && make -j$(grep -c ^processor /proc/cpuinfo) && make install \ && cd ~ && rm -rf ffmpeg diff --git a/Dockerfile b/Dockerfile index 7af106b..07f1c75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN cd ~ && git clone --depth 1 'https://code.videolan.org/videolan/x264.git' && && make -j$(grep -c ^processor /proc/cpuinfo) && make install \ && cd ~ && rm -rf x264 RUN export PKG_CONFIG_PATH=/clib/lib/pkgconfig \ - && cd ~ && git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' && cd ffmpeg \ + && cd ~ && git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' ffmpeg && cd ffmpeg \ && ./configure --enable-shared --disable-static --enable-gpl --enable-version3 --enable-libx264 --prefix=/clib \ && make -j$(grep -c ^processor /proc/cpuinfo) && make install \ && cd ~ && rm -rf ffmpeg diff --git a/scripts/build_ffmpeg.sh b/scripts/build_ffmpeg.sh index b8aac3f..7eeed41 100755 --- a/scripts/build_ffmpeg.sh +++ b/scripts/build_ffmpeg.sh @@ -1,5 +1,5 @@ export PREFIX=`pwd`/clib mkdir -p cbuild && cd cbuild || exit 1 -git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' && cd ffmpeg || exit 1 +git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' ffmpeg && cd ffmpeg || exit 1 ./configure "--prefix=${PREFIX}" --enable-shared --disable-static --enable-gpl --enable-version3 --disable-doc --enable-libx264 || exit 1 make -j8 && make install || exit 1 diff --git a/scripts/build_win_ffmpeg.sh b/scripts/build_win_ffmpeg.sh index 6054965..ecc1429 100644 --- a/scripts/build_win_ffmpeg.sh +++ b/scripts/build_win_ffmpeg.sh @@ -5,7 +5,7 @@ export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig export "LIB=$LIB;$PREFIX2/lib" export "INCLUDE=$INCLUDE;$PREFIX2/include" mkdir -p cbuild && cd cbuild || exit 1 -git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' && cd ffmpeg || exit 1 +git clone --depth 1 'https://github.com/FFmpeg/FFmpeg' ffmpeg && cd ffmpeg || exit 1 ./configure \ --enable-gpl \ --enable-shared \