-
-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #67205 from primeos/ffmpeg-full
ffmpeg-full: 4.1.4 -> 4.2
- Loading branch information
Showing
2 changed files
with
33 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
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; |