浏览代码

Use debian ffmpeg package

Bob Mottram 7 年前
父节点
当前提交
582cbe99d9
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8
    2
      src/freedombone-utils-ffmpeg

+ 8
- 2
src/freedombone-utils-ffmpeg 查看文件

@@ -30,8 +30,7 @@
30 30
 
31 31
 FFMPEG_VERSION=3.1.2
32 32
 
33
-function mesh_install_ffmpeg
34
-{
33
+function mesh_install_ffmpeg_old {
35 34
     chroot "${rootdir}" apt-get -yq remove ffmpeg libav-tools
36 35
     chroot "${rootdir}" apt-get -yq install build-essential
37 36
     chroot "${rootdir}" apt-get -yq install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libopenjp2-7-dev libx264-dev mjpegtools libmjpegtools-dev
@@ -49,5 +48,12 @@ EOF
49 48
     chroot "${rootdir}" ldconfig
50 49
 }
51 50
 
51
+function mesh_install_ffmpeg {
52
+    chroot "${rootdir}" apt-get -yq install build-essential
53
+    chroot "${rootdir}" apt-get -yq install ffmpeg libmp3lame-dev libvorbis-dev libtheora-dev
54
+    chroot "${rootdir}" apt-get -yq install libspeex-dev yasm pkg-config libopenjp2-7-dev
55
+    chroot "${rootdir}" apt-get -yq install libx264-dev mjpegtools libmjpegtools-dev libav-tools
56
+}
57
+
52 58
 
53 59
 # NOTE: deliberately there is no "exit 0"