public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: add patches for libvpx 1.5 

ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
This commit is contained in:
Franz Pletz 2016-05-17 00:58:15 +02:00
parent fd294521e6
commit 28e051f066
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
5 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/ffmpeg/0.10.nix
View File

@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec {
version = "${branch}.16"; version = "${branch}.16";
branch = "0.10"; branch = "0.10";
sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77";
patches = [ ./vpxenc-0.10-libvpx-1.5.patch ];
}) })

1
pkgs/development/libraries/ffmpeg/1.2.nix
View File

@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec {
version = "${branch}.12"; version = "${branch}.12";
branch = "1.2"; branch = "1.2";
sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli";
patches = [ ./vpxenc-1.2-libvpx-1.5.patch ];
}) })

5
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -15,7 +15,7 @@
# Darwin frameworks # Darwin frameworks
, Cocoa , Cocoa
# Inherit generics # Inherit generics
, branch, sha256, version, ... , branch, sha256, version, patches ? [], ...
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
patchPhase = ''patchShebangs .''; postPatch = ''patchShebangs .'';
inherit patches;
outputs = [ "dev" "out" "bin" ] outputs = [ "dev" "out" "bin" ]
++ optional (reqMin "1.0") "doc" ; # just dev-doc ++ optional (reqMin "1.0") "doc" ; # just dev-doc

24
pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 1d33ce9..dface51 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
/** String mappings for enum vp8e_enc_control_id */
static const char *ctlidstr[] = {
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",

24
pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 4f1adb8..1791952 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext {
/** String mappings for enum vp8e_enc_control_id */
static const char *const ctlidstr[] = {
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",