mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity
59148 commits 329 branches 124 tags 6.7 GiB
Commit graph

102 commits

Author SHA1 Message Date
Peter Simons ecad102326 pkgs/development/libraries/ffmpeg/generic.nix: don't insert faac into buildInputs unconditionally 
This is a hot-fix to mitigate https://github.com/NixOS/nixpkgs/issues/6727.
 2015-03-09 12:30:16 +01:00
codyopel 6ed1d9f525 ffmpeg: refactor to generic 
* migrate some branches from ffmpeg.config.<optional>, now allows version specific configuration
* Added optionals for most features
* Added qt-faststart executable
* Licensing corrections
* Added dependencies
    + celt
    + faad2
    + flite
    + frei0r-plugins
    + fribidi
    + game-music-emu
    + gsm
    + jack2
    + ladspa-sdk
    + libavc1394
    + libbluray
    + libbs2b
    + libcaca
    + libmodplug
    + libogg
    + libraw1394
    + libssh
    + libwebp
    + libxcb
    + lzma
    + openal
    + opencl
    + opengl
    + openh264
    + openjpeg
    + openssl
    + pulseaudio
    + rtmpdump
    + samba
    + soxr
    + v4l-utils
    + vid.stab
    + wavpack
    + libX11
    + libXv
    + wavpack
    + x265
    + xavs
    + xvidcore
    + zeromq
* Outlines support for: (unpackaged/broken dependencies)
    + aacplus
    + avisynth
    + crystalhd
    + blackmagic-design-desktop-video
    + flite
    + ilbc
    + libavc1394
    + libcdio-paranoia
    + libiec61883
    + libmfx
    + libnut
    + nvenc (nvidia)
    + opencl
    + opencore-amr
    + openh264
    + oss
    + libquvi
    + schroedinger
    + shine
    + twolame
    + utvideo
    + vo-aacenc
    + vo-amrwbenc
    + zvbi
 2015-02-28 12:12:25 -05:00
Nathaniel Baxter 798a42a3ee ffmpeg: update 2.5.3 to 2.5.4 2015-02-22 11:58:48 +11:00
Vladimír Čunát 474aeb0b3d ffmpeg-2.2: update (still used by vlc) 2015-02-05 11:19:18 +01:00
Mateusz Kowalczyk 7db3f7ada6 ffmpeg: update from 2.5.1 to 2.5.3, potentially fixes CVE-2014-9602, CVE-2014-9603, CVE-2014-9604 2015-01-23 19:41:27 +00:00
Vladimír Čunát eb611fa890 ffmpeg: maintenance update 2.5 -> 2.5.1 2014-12-16 21:39:18 +01:00
Vladimír Čunát 304484a753 ffmpeg_2_3: use 2.2 instead of 2.3 
2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).
 2014-12-16 21:33:24 +01:00
Mateusz Kowalczyk b13301ecbe ffmpeg: update from 2.4.4 to 2.5 (close #5279) 2014-12-10 18:13:53 +01:00
Mateusz Kowalczyk 41e2ba7bbf ffmpeg: update from 2.4.3 to 2.4.4 2014-12-03 16:52:46 +00:00
Rüdiger Sonderfeld b023a0bdfb ffmpeg/1.x: Update to 1.2.10 (close #5215) 2014-12-03 16:37:11 +01:00
Mateusz Kowalczyk 9b507ccf02 ffmpeg: 2.4.2 -> 2.4.3 2014-11-03 16:56:03 +00:00
William A. Kennington III 8ad2a13bdf ffmpeg: 1.2.8 -> 1.2.9 2014-10-17 14:26:44 -07:00
Mateusz Kowalczyk 23fbed1fef ffmpeg: update from 2.4.1 to 2.4.2 2014-10-06 17:36:40 +01:00
Mateusz Kowalczyk 76f07fbafc ffmpeg-1: meta.branch 2014-09-30 11:13:43 +01:00
Mateusz Kowalczyk 0f485bd0db ffmpeg_0_10: update from 0.10.14 to 0.10.15 
cc @lovek323
 2014-09-30 11:13:37 +01:00
Mateusz Kowalczyk 07e2be6c29 ffmpeg-0.6: branch info 2014-09-30 10:33:15 +01:00
Mateusz Kowalczyk aafca4dd51 Add a few meta.branch to please monitor 2014-09-30 10:07:49 +01:00
Nathaniel Baxter 859918d235 vlc: Add ffmpeg version 2.3.x for vlc. 
Vlc doesn't support libavcodec >= 56 yet, which means it needs an older
version of ffmpeg.

Closes #4286
 2014-09-27 01:04:38 +01:00
Mateusz Kowalczyk d6821cc9a8 ffmpeg: update from 2.3.3 to 2.4.1 2014-09-26 06:29:07 +01:00
Moritz Ulrich 332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich 439ebda62a ffmpeg_1: update from 1.2.7 to 1.2.8 2014-09-04 17:05:20 +02:00
Mateusz Kowalczyk 98cc03eb22 ffmpeg: update to 2.3.3 2014-08-29 13:05:09 +01:00
Vladimír Čunát 3310c8b507 ffmpeg: maintenance update 2014-08-14 22:28:46 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Vladimír Čunát 6b4929373f ffmpeg: major update 2.2.4 -> 2.3 
It's claimed to be fully API-compatible update.
 2014-07-20 08:44:58 +02:00
Vladimír Čunát 07a09fbe63 ffmpeg{_2,_1,_0_10}: minor update 2014-06-30 21:00:36 +02:00
Jason "Don" O'Conal bcc36ee23e mpd: fix build on darwin 2014-05-21 15:50:15 +10:00
Chris Double 30c3b81cc2 Update ffmpeg to 2.2.2 2014-05-08 00:52:38 +12:00
Sterling Stein 63b3cf669b Add subtitle option for ffmpeg. 2014-04-25 20:13:12 -07:00
Thomas Tuegel 922e4f3858 ffmpeg 2.1.4 -> 2.2.1 2014-04-16 07:49:51 -05:00
Vladimír Čunát da4fca4ce4 ffmpeg (0.10): minor update 
(cherry picked from commit 9951478c40)

Conflicts:
	pkgs/development/libraries/ffmpeg/0.10.nix
 2014-03-17 22:56:19 +01:00
Evgeny Egorochkin 0047f42663 ffmpeg_1: update from 1.2.4 to 1.2.6 2014-03-08 18:32:13 +02:00
Evgeny Egorochkin bc1c6df9fe ffmpeg_0_10: update from 0.10.10 to 0.10.11 2014-03-08 18:30:44 +02:00
Vladimír Čunát 765e119b33 ffmpeg_2: update 2.1.1 -> .4, fixing CVE-2014-209{7,8,9} 2014-03-05 21:33:56 +01:00
Lluís Batlle i Rossell 3faf620e8a Updating libvpx to 1.3.0, and making ffmpeg include vpx 
I don't think there is any reason not to have vpx there. It's
part of webm.
 2014-01-20 13:47:24 +01:00
Lluís Batlle i Rossell cb35bf15a4 ffmpeg: adding gnutls support 
I also take out the useless 'openssl' I added by error to mpv.
 2014-01-15 17:04:14 +01:00
Eelco Dolstra 20ab977736 ffmpeg: configurable.nix -> 2.x.nix 2014-01-07 15:36:00 +01:00
Thomas Tuegel 90c99bab59 ffmpeg: make fdk-aac support configurable 2014-01-05 09:02:47 -06:00
Thomas Tuegel eb1e109b51 ffmpeg: add configurable 2014-01-05 09:02:46 -06:00
Mathijs Kwik e3acde0b44 ffmpeg: switch to default versioning-scheme 2013-12-23 11:03:09 +01:00
Mathijs Kwik 8e85e17a99 ffmpeg-1: upgrade to 1.2.4 2013-12-23 10:25:14 +01:00
Mathijs Kwik 2de160c594 ffmpeg-0.10: upgrade to 0.10.10 2013-12-23 10:25:14 +01:00
Lluís Batlle i Rossell 142298495e Fixing the Ultrastardx build. Not tested if it works and how. 2013-12-07 00:07:35 +01:00
Lluís Batlle i Rossell ad90f2f0b8 Adding ffmpeg 2.x 2013-12-04 21:04:30 +01:00
Lluís Batlle i Rossell 6f4c08b0b7 Adding fontconfig support to ffmpeg. 2013-11-27 12:37:59 +01:00
Lluís Batlle i Rossell bf48a6f3d6 Adding freetype to ffmpeg. To use the drawtext filter. 2013-11-24 14:57:54 +01:00
Jonas Hoersch b0976dcdfc ffmpeg_1: update to version 1.2.3 2013-09-16 07:01:36 +02:00
Jason \"Don\" O'Conal 735555d86f ffmpeg: fix build on darwin 
* build with gccApple
* don't delete '*.a' files when building xvidcore
 2013-07-12 16:26:44 +02:00
Mathijs Kwik f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik 7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00