root 7 年之前
父节点
当前提交
1d4fafb835
共有 4 个文件被更改,包括 6 次插入3 次删除
  1. 1 0
      .gitignore
  2. 1 1
      FFmpeg
  3. 2 1
      build.sh
  4. 2 1
      buildffmpeg.sh

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/debs

+ 1 - 1
FFmpeg

@@ -1 +1 @@
-Subproject commit 7e4f32f4e4b93c95dcc872cb844c5548e69f352e
+Subproject commit c8b57d4333b1bc5c4125fdac8fbf4625c399fc9c

+ 2 - 1
build.sh

@@ -3,7 +3,8 @@
 set -e
 set -x
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf libtool checkinstall libssl-dev libmp3lame-dev libopencore-amrnb-dev libopencore-amrwb-dev git
+DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf libtool checkinstall libssl-dev libmp3lame-dev git
+DEBIAN_FRONTEND=noninteractive apt-get install -y libopencore-amrnb-dev libopencore-amrwb-dev || true
 
 git submodule init
 git submodule update

+ 2 - 1
buildffmpeg.sh

@@ -4,7 +4,8 @@ set -e
 set -x
 
 cd FFmpeg 
-./configure --enable-gpl --enable-omx --enable-omx-rpi --enable-nonfree --enable-openssl --enable-libx264 --enable-libfdk-aac --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-librtmp --enable-version3 --prefix=/usr
+./configure --enable-gpl --enable-nonfree --enable-gnutls --enable-libx264 --enable-libfdk-aac --enable-libmp3lame --enable-version3 --prefix=/usr
+# ./configure --enable-gpl --enable-omx --enable-omx-rpi --enable-nonfree --enable-openssl --enable-libx264 --enable-libfdk-aac --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-librtmp --enable-version3 --prefix=/usr
 make
 
 checkinstall --pkgname=ffmpeg --pkgversion="$(date +%Y%m%d%H%M)-git" --backup=no --deldoc=yes --fstrans=no --default