浏览代码

Bump ffmpeg from 3.1 to 7.1! Also bump x264 to latest stable.

master
Ray Burgemeestre 5 个月前
父节点
当前提交
635194d70d
共有 1 个文件被更改,包括 10 次插入7 次删除
  1. +10
    -7
      ffmpeg/Makefile

+ 10
- 7
ffmpeg/Makefile 查看文件

@@ -38,8 +38,10 @@ ubuntu2404:
# sometimes got 404 on videolan/x264
#git clone https://code.videolan.org/videolan/x264
#git clone git://source.ffmpeg.org/ffmpeg.git
git clone https://github.com/rayburgemeestre/x264
git clone https://github.com/rayburgemeestre/ffmpeg
#git clone https://github.com/rayburgemeestre/x264
git clone -b stable https://code.videolan.org/videolan/x264
#git clone https://github.com/rayburgemeestre/ffmpeg
git clone -b n7.1 https://github.com/FFmpeg/FFmpeg ffmpeg

bash ../ubuntu2404.sh make ffmpeg_impl
make package-ubuntu2404
@@ -59,7 +61,8 @@ ffmpeg_impl:
cp -prv 5.1-0004-fix-binutils.patch ffmpeg/

pushd x264 && \
git checkout 2451a7282463f68e532f2eee090a70ab139bb3e7
echo pass
#git checkout 2451a7282463f68e532f2eee090a70ab139bb3e7
# ^ parent of 71ed44c7312438fac7c5c5301e45522e57127db4, which is where they dropped support for:
# libavcodec/libx264.c:282:9: error: 'x264_bit_depth' undeclared (first use in this function); did you mean 'x264_picture_t'?
# if (x264_bit_depth > 8)
@@ -74,12 +77,12 @@ ffmpeg_impl:
make -j $$(nproc) && \
make install

pushd ffmpeg && git checkout n3.1
pushd ffmpeg && git checkout n7.1
#git checkout 71052d85c16bd65fa1e3e01d9040f9a3925efd7a # or my muxing code won't work, they've modified the example since fba1592f35501bff0f28d7885f4128dfc7b82777
pushd ffmpeg && \
./configure --cxx=$$(which c++) --enable-static --enable-shared --enable-libx264 --enable-gpl --enable-swresample --prefix=$$(realpath $$PWD/../ffmpeg_out) && \
sed -i.bak 's/HAVE_ARC4RANDOM 1/HAVE_ARC4RANDOM 0/g' ./config.h && \
patch libavcodec/x86/mathops.h 5.1-0004-fix-binutils.patch && \
./configure --cxx=$$(which c++) --enable-static --enable-shared --enable-libx264 --enable-gpl --enable-swresample --disable-libdrm --prefix=$$(realpath $$PWD/../ffmpeg_out) && \
# sed -i.bak 's/HAVE_ARC4RANDOM 1/HAVE_ARC4RANDOM 0/g' ./config.h && \
# patch libavcodec/x86/mathops.h 5.1-0004-fix-binutils.patch && \
make -j $$(nproc) && \
make install


正在加载...
取消
保存