Skip to content

Commit

Permalink
housekeeping (#17)
Browse files Browse the repository at this point in the history
- remove unneeded parameters
- remove deprecated `avresample`
- make AMR optional
- add missing option
- `brew options` output fits in 80 chars
  • Loading branch information
retokromer authored Feb 19, 2019
1 parent 64ee60d commit 022075b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Formula/ffmpeg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ class Ffmpeg < Formula
option "with-libssh", "Enable SFTP protocol via libssh"
option "with-tesseract", "Enable the tesseract OCR engine"
option "with-libvidstab", "Enable vid.stab support for video stabilization"
option "with-opencore-amr", "Enable Opencore AMR NR/WB audio format"
option "with-openh264", "Enable OpenH264 library"
option "with-openjpeg", "Enable JPEG 2000 image format"
option "with-openssl", "Enable SSL support"
option "with-rubberband", "Enable rubberband library"
option "with-webp", "Enable using libwebp to encode WEBP images"
option "with-zeromq", "Enable using libzeromq to receive commands sent through a libzeromq client"
option "with-zeromq", "Enable using libzeromq to receive cmds sent through a libzeromq client"
option "with-zimg", "Enable z.lib zimg library"
option "with-srt", "Enable SRT library"
option "with-libvmaf", "Enable libvmaf scoring library"
Expand All @@ -38,7 +39,6 @@ class Ffmpeg < Formula
depends_on "libass"
depends_on "libvorbis"
depends_on "libvpx"
depends_on "opencore-amr"
depends_on "opus"
depends_on "rtmpdump"
depends_on "sdl2"
Expand Down Expand Up @@ -69,6 +69,7 @@ class Ffmpeg < Formula
depends_on "libssh" => :optional
depends_on "libvidstab" => :optional
depends_on "libvmaf" => :optional
depends_on "opencore-amr" => :optional
depends_on "openh264" => :optional
depends_on "openjpeg" => :optional
depends_on "openssl" => :optional
Expand All @@ -85,14 +86,10 @@ def install
args = %W[
--prefix=#{prefix}
--enable-shared
--enable-pthreads
--enable-version3
--enable-hardcoded-tables
--enable-avresample
--cc=#{ENV.cc}
--host-cflags=#{ENV.cflags}
--host-ldflags=#{ENV.ldflags}
--enable-ffplay
--enable-gpl
--enable-libaom
--enable-libmp3lame
Expand All @@ -104,13 +101,10 @@ def install
--enable-libx264
--enable-libx265
--enable-libxvid
--enable-lzma
--enable-libfontconfig
--enable-libfreetype
--enable-frei0r
--enable-libass
--enable-libopencore-amrnb
--enable-libopencore-amrwb
--enable-librtmp
--enable-libspeex
--disable-libjack
Expand Down Expand Up @@ -147,6 +141,12 @@ def install
args << "--enable-libzmq" if build.with? "zeromq"
args << "--enable-openssl" if build.with? "openssl"

if build.with? "opencore-amr"
args << "--enable-version3"
args << "--enable-libopencore-amrnb"
args << "--enable-libopencore-amrwb"
end

if build.with? "openjpeg"
args << "--enable-libopenjpeg"
args << "--disable-decoder=jpeg2000"
Expand Down

0 comments on commit 022075b

Please sign in to comment.