Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lifegpc authored Oct 6, 2024
1 parent 51baa74 commit f75f2df
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/all/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_ffmpeg.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/build_win_ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit f75f2df

Please sign in to comment.