pyrox.dev
lol
libav: 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
authored by
Christian Albrecht
and committed by
Franz Pletz
fd294521
67cb0eaa
+4
pkgs/development/libraries/libav/default.nix
+4
pkgs/development/libraries/libav/default.nix
···
38
38
inherit sha1; # upstream directly provides sha1 of releases over https
39
39
};
40
40
41
+
patches = []
42
+
++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ]
43
+
++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ];
44
+
41
45
preConfigure = "patchShebangs doc/texi2pod.pl";
42
46
43
47
configureFlags =
+22
pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch
+22
pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch
···
1
+
--- a/libavcodec/libvpxenc.c 2016-05-01 17:57:16.753852614 +0200
2
+
+++ b/libavcodec/libvpxenc.c 2016-05-01 18:01:08.252147138 +0200
3
+
@@ -67,19 +67,11 @@
4
+
5
+
/** String mappings for enum vp8e_enc_control_id */
6
+
static const char *ctlidstr[] = {
7
+
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
8
+
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
9
+
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
10
+
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
11
+
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
12
+
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
13
+
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
14
+
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
15
+
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
16
+
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
17
+
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
18
+
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
19
+
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
20
+
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
21
+
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
22
+
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
+22
pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
+22
pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
···
1
+
--- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200
2
+
+++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200
3
+
@@ -70,19 +70,11 @@
4
+
5
+
/** String mappings for enum vp8e_enc_control_id */
6
+
static const char *const ctlidstr[] = {
7
+
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
8
+
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
9
+
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
10
+
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
11
+
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
12
+
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
13
+
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
14
+
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
15
+
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
16
+
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
17
+
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
18
+
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
19
+
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
20
+
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
21
+
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
22
+
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",