Commit Graph

280 Commits

Author SHA1 Message Date
Luke Granger-Brown
f355e8a060
Merge pull request #134726 from risicle/ris-ffmpeg-tests
ffmpeg, ffmpeg-full: enable basic tests
2021-08-21 03:42:11 +01:00
Sandro
f45fa31ab2
Merge pull request #120577 from MatthewCroughan/ffmpeg-srt 2021-08-20 13:00:18 +02:00
Robert Scott
649f0ed1a8 ffmpeg: enable basic tests 2021-08-18 23:52:00 +01:00
TredwellGit
a83f82576b ffmpeg: patch CVE-2021-33815 and CVE-2021-38114
https://nvd.nist.gov/vuln/detail/CVE-2021-33815
https://nvd.nist.gov/vuln/detail/CVE-2021-38114
2021-08-17 02:31:11 +00:00
MatthewCroughan
065a8102c9
Update pkgs/development/libraries/ffmpeg/generic.nix
Co-authored-by: Michal Sojka <michal.sojka@cvut.cz>
2021-08-03 13:02:23 +01:00
Izorkin
ae8dd3c149
ffmpeg_4: fix incorrect segment length in hls 2021-07-05 19:21:27 +03:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Robert Schütz
a20dd34600
ffmpeg_3: mark as insecure (#123496) 2021-05-19 23:45:41 +02:00
Vladimír Čunát
3e43d42f87
ffmpeg_4: only apply the patch on darwin
It's not a big deal, but why rebuild the linux dependencies now.
2021-05-16 09:31:27 +02:00
Zane van Iperen
8f64c5d9fc
ffmpeg_4: fix build error on darwin
See https://trac.ffmpeg.org/ticket/9242
2021-05-16 08:05:03 +10:00
github-actions[bot]
c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Robert Schütz
900fd5d09f ffmpeg_2: mark as insecure 2021-05-01 20:52:27 +02:00
matthewcroughan
47586a182d ffmpeg: add support for libsrt
based upon 47801afc3d
2021-04-24 22:14:04 +01:00
TredwellGit
72354f8ec1 ffmpeg: 4.3.2 -> 4.4
https://github.com/FFmpeg/FFmpeg/blob/n4.4/Changelog
2021-04-10 08:30:54 +00:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
TredwellGit
f94e21c4e8 ffmpeg: 4.3.1 -> 4.3.2
https://nvd.nist.gov/vuln/detail/CVE-2020-35964
https://nvd.nist.gov/vuln/detail/CVE-2020-35965
2021-03-02 11:08:19 +00:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
David Guibert
1b54b2aa0d ffmpeg: set explicit --enable-libass
needed for subtitles filter.
2020-08-15 08:54:01 +02:00
zowoq
916bc99f2c ffmpeg: 4.3 -> 4.3.1 2020-07-17 09:28:45 +10:00
zowoq
88c720f0bf ffmpeg_3_4: 3.4.7 -> 3.4.8 2020-07-17 09:28:45 +10:00
zowoq
92cfd28d2b ffmpeg_2_8: 2.8.16 -> 2.8.17 2020-07-17 09:28:45 +10:00
zowoq
f9e5ca8e58 ffmpeg: 4.2.3 -> 4.3 2020-06-18 14:56:18 +10:00
Frederik Rietdijk
362d88c2b1 Merge staging-next into staging 2020-05-27 15:27:28 +02:00
zowoq
cfaa8035d7 ffmpeg_2_8: 2.8.15 -> 2.8.16 2020-05-24 10:44:45 +10:00
zowoq
0e384147f9 ffmpeg_4: 4.2.2 -> 4.2.3 2020-05-24 10:44:45 +10:00
Orivej Desh
aa44ca368a ffmpeg: add libaom to build inputs only if enabled 2020-05-23 19:56:22 +00:00
Florian Klink
a42e33612a
Merge pull request #87968 from elohmeier/ffmpeg-addOpenGLRunpath2
ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries
2020-05-16 21:51:25 +02:00
Enno Lohmeier
78987e2af0 ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries 2020-05-16 21:48:59 +02:00
John Ericson
ee8cfe4bf3 treewide: pkg-config has targetPrefix 2020-05-16 00:21:21 +00:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Andrew Childs
4ac6c244cc ffmpeg: fix vdpauSupport=false 2020-02-09 09:23:57 +01:00
Frederik Rietdijk
981b94442b Merge staging-next into staging 2020-01-05 16:10:40 +01:00
zowoq
c13f1a508d ffmpeg_2_8: 2.8.14 -> 2.8.15 2020-01-04 11:50:10 +00:00
zowoq
115791b9ab ffmpeg_4: 4.2.1 -> 4.2.2 2020-01-04 11:50:10 +00:00
Jörg Thalheim
1a931f1f60
Revert "Revert "ffmpeg: fix cross compilation""
This reverts commit 7d46f7363c.

This change was accidentally commit to master. To avoid a mass-rebuild we
actually apply this change on staging first.
2020-01-04 08:26:03 +00:00
Jörg Thalheim
7d46f7363c
Revert "ffmpeg: fix cross compilation"
This reverts commit f6f8f0b75a.

avoid mass-rebuild on master; move to staging instead.
2020-01-04 08:25:54 +00:00
Daniel Fullmer
1b591acf6b
ffmpeg: fix cross compilation 2020-01-04 08:25:51 +00:00
Jörg Thalheim
f1568223c9
Revert "ffmpeg: fix cross compilation"
This reverts commit f6f8f0b75a.

avoid mass-rebuild on master; move to staging instead.
2020-01-04 08:24:30 +00:00
Daniel Fullmer
f6f8f0b75a ffmpeg: fix cross compilation 2020-01-04 02:14:53 -05:00
Robin Gloster
4a8de55be0
ffmpeg: fix for structured attrs 2019-12-31 01:26:02 +01:00
Vladimír Čunát
37e1da2874
ffmpeg: 3.4.6 -> 3.4.7 (security)
Fixes #73628 (many CVEs).
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/289a79d545e83a:/Changelog
2019-12-29 10:40:04 +01:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Tom Hall
801e8b4d72 Allow ffmpeg attributes to be overridden
Switch the order in which the version-specific attributes are combined
with args. Otherwise, if args such as 'branch' are overridden by an
overlay or other derivation, the new value is replaced with the
original when the sets are combined with //.
2019-11-18 23:13:59 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Timothy DeHerrera
30e428c96c ffmpeg: add options for QuickSync and libaom AV1
Allow users to optionally compile with support for Intel's QuickSync
hardware accelerated encoding, and libaom AV1 encoding. Set to false by
default.
2019-11-12 14:42:58 +01:00