Skip to content

Commit deb6c27

Browse files
committed
Merge branch 'cdgriffith-master'
2 parents 5369a71 + 02e4833 commit deb6c27

File tree

2 files changed

+207
-81
lines changed

2 files changed

+207
-81
lines changed

README.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ $ ./build-ffmpeg --build
5151

5252
* `x264`: H.264 Video Codec (MPEG-4 AVC)
5353
* `x265`: H.265 Video Codec (HEVC)
54-
* `libsvtav1`, SVT-AV1 Encoder and Decoder
54+
* `libsvtav1`: SVT-AV1 Encoder and Decoder
5555
* `aom`: AV1 Video Codec (Experimental and very slow!)
56+
* `librav1e`: rust based AV1 encoder (only available if [`cargo` is installed](https://doc.rust-lang.org/cargo/getting-started/installation.html))
5657
* `fdk_aac`: Fraunhofer FDK AAC Codec
5758
* `xvidcore`: MPEG-4 video coding standard
5859
* `VP8/VP9/webm`: VP8 / VP9 Video Codec for the WebM video file format
@@ -62,7 +63,6 @@ $ ./build-ffmpeg --build
6263
* `theora`: Free lossy video compression format
6364
* `opus`: Lossy audio coding format
6465
* `srt`: Secure Reliable Transport
65-
* `srt`: Secure Reliable Transport
6666
* `webp`: Image format both lossless and lossy
6767

6868
### HardwareAccel
@@ -93,6 +93,11 @@ $ ./build-ffmpeg --build
9393
* MPEG2 video `mpeg2_vaapi`
9494
* VP8 `vp8_vaapi`
9595
* VP9 `vp9_vaapi`
96+
* `AMF`: [AMD's Advanced Media Framework](https://github.com/GPUOpen-LibrariesAndSDKs/AMF). These encoders will only
97+
be available if `amdgpu` drivers are detected in use on the system with `lspci -v`.
98+
* Encoders
99+
* H264 `h264_amf`
100+
96101

97102
### Apple M1 (Apple Silicon) Support
98103

@@ -235,6 +240,15 @@ $ sudo apt install libva-dev vainfo
235240
$ sudo dnf install libva-devel libva-intel-driver libva-utils
236241
```
237242

243+
## AMF installation
244+
245+
To use the AMF encoder, you will need to be using the AMD GPU Pro drivers with OpenCL support.
246+
Download the drivers from https://www.amd.com/en/support and install the appropriate opencl versions.
247+
248+
```bash
249+
./amdgpu-pro-install -y --opencl=rocr,legacy
250+
```
251+
238252
## Usage
239253

240254
```bash
@@ -244,6 +258,7 @@ Options:
244258
--version Display version information
245259
-b, --build Starts the build process
246260
--enable-gpl-and-non-free Enable non-free codecs - https://ffmpeg.org/legal.html
261+
--latest Build latest version of dependencies if newer available
247262
-c, --cleanup Remove all working dirs
248263
--full-static Complete static build of ffmpeg (eg. glibc, pthreads etc...) **only Linux**
249264
Note: Because of the NSS (Name Service Switch), glibc does not recommend static links.

0 commit comments

Comments
 (0)