mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 05:33:23 +00:00
1537ce23b1
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog Configuration flag changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure Ignored new configuration flags: --enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no] --enable-pocketsphinx enable PocketSphinx, needed for asr filter [no] --enable-cuda-nvcc enable Nvidia CUDA compiler [no] --disable-cuda-llvm disable CUDA compilation using clang [autodetect] --disable-msa2 disable MSA2 optimizations The renamed and removed configuration options where not used. I've added a patch to prefer libdav1d over libaom, as libaom wasn't even able to play my sample videos for AV1 (apart from the reduced performance, at least in theory).
20 lines
748 B
Diff
20 lines
748 B
Diff
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
|
|
index d2f9a39ce5..2342399a8e 100644
|
|
--- a/libavcodec/allcodecs.c
|
|
+++ b/libavcodec/allcodecs.c
|
|
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
|
|
extern AVCodec ff_pcm_mulaw_at_decoder;
|
|
extern AVCodec ff_qdmc_at_decoder;
|
|
extern AVCodec ff_qdm2_at_decoder;
|
|
+extern AVCodec ff_libdav1d_decoder;
|
|
extern AVCodec ff_libaom_av1_decoder;
|
|
extern AVCodec ff_libaom_av1_encoder;
|
|
extern AVCodec ff_libaribb24_decoder;
|
|
extern AVCodec ff_libcelt_decoder;
|
|
extern AVCodec ff_libcodec2_encoder;
|
|
extern AVCodec ff_libcodec2_decoder;
|
|
-extern AVCodec ff_libdav1d_decoder;
|
|
extern AVCodec ff_libdavs2_decoder;
|
|
extern AVCodec ff_libfdk_aac_encoder;
|
|
extern AVCodec ff_libfdk_aac_decoder;
|