Skip to content

Commit

Permalink
Revert "update README"
Browse files Browse the repository at this point in the history
This reverts commit ccd6f51.
  • Loading branch information
slhck committed Sep 2, 2019
1 parent ccd6f51 commit cc354ef
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ In order to use this tap, you need to install Homebrew or Linuxbrew.
Then, to run a default installation, run:

```
brew tap homebrew-ffmpeg/ffmpeg
brew install homebrew-ffmpeg/ffmpeg/ffmpeg
brew tap varenc/ffmpeg
brew install varenc/ffmpeg/ffmpeg
```

**Note:** If you already have `ffmpeg` installed from Homebrew core, you will receive an error. You need to first run `brew uninstall ffmpeg` before you can use this tap.
Expand All @@ -29,29 +29,29 @@ brew install homebrew-ffmpeg/ffmpeg/ffmpeg
To see the list of supported options for this formula, run:

```
brew options homebrew-ffmpeg/ffmpeg/ffmpeg
brew options varenc/ffmpeg/ffmpeg
```

Then, you can run:

```
brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-<option1> --with-<option2> ...
brew install varenc/ffmpeg/ffmpeg --with-<option1> --with-<option2> ...
```

### Installing latest Git version (`HEAD`)

FFmpeg recommends installing the latest Git master version over a release. This formula builds the latest release by default, but you can install the latest Git version by adding the `--HEAD` option:

```
brew install homebrew-ffmpeg/ffmpeg/ffmpeg --HEAD
brew install varenc/ffmpeg/ffmpeg --HEAD
```

### Installing *everything*

To compile and install ffmpeg with *all* options, just run:

```
brew install homebrew-ffmpeg/ffmpeg/ffmpeg $(brew options homebrew-ffmpeg/ffmpeg/ffmpeg --compact)
brew install varenc/ffmpeg/ffmpeg $(brew options varenc/ffmpeg/ffmpeg --compact)
```

Note that this will perform a full build of ffmpeg and its dependencies, which may take a while depending on your machine's capabilities.
Expand All @@ -61,13 +61,13 @@ Note that this will perform a full build of ffmpeg and its dependencies, which m
To update Homebrew and upgrade the formula to the most recent stable release:

```
brew update && brew upgrade homebrew-ffmpeg/ffmpeg/ffmpeg
brew update && brew upgrade varenc/ffmpeg/ffmpeg
```

Or, if you are using the `HEAD` version and want to update to the latest commit:

```
brew update && brew upgrade homebrew-ffmpeg/ffmpeg/ffmpeg --fetch-HEAD
brew update && brew upgrade varenc/ffmpeg/ffmpeg --fetch-HEAD
```

## Included libraries
Expand Down Expand Up @@ -136,5 +136,6 @@ If the problem is reproducible with the `homebrew-core` version of `ffmpeg`, ple

## Maintainers

- Chris Varenhorst (`@varenc`)
- Reto Kromer (`@retokromer`)
- Werner Robitza (`@slhck`)

0 comments on commit cc354ef

Please sign in to comment.