Architecture specific change in rpms/lld13.git
by githook-noreply@fedoraproject.org
The package rpms/lld13.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lld13.git/commit/?id=288cf17484aa....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit c7d5cee7e11e4388b84d11f5f1b6e7aa273f8ea9
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Wed Apr 6 15:48:45 2022 +0000
Add missing sources
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a00d187
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/lld-13.0.1.src.tar.xz
+/lld-13.0.1.src.tar.xz.sig
commit 288cf17484aadb07e01bc0f0d8e6ace8c5a08f81
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Wed Apr 6 15:37:09 2022 +0000
13.0.1 Release
diff --git a/0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch b/0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
new file mode 100644
index 0000000..7d8beda
--- /dev/null
+++ b/0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
@@ -0,0 +1,498 @@
+From 43dfe54ce017c8d37eaec480a2f13a492bbc4203 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton(a)redhat.com>
+Date: Thu, 25 Feb 2021 14:24:14 +0100
+Subject: [PATCH 2/2] [PATCH][lld] Import compact_unwind_encoding.h from
+ libunwind
+
+This avoids an implicit cross package dependency
+---
+ lld/include/mach-o/compact_unwind_encoding.h | 477 +++++++++++++++++++++++++++
+ 1 file changed, 477 insertions(+)
+ create mode 100644 lld/include/mach-o/compact_unwind_encoding.h
+
+diff --git a/lld/include/mach-o/compact_unwind_encoding.h b/lld/include/mach-o/compact_unwind_encoding.h
+new file mode 100644
+index 0000000..5301b10
+--- /dev/null
++++ b/lld/include/mach-o/compact_unwind_encoding.h
+@@ -0,0 +1,477 @@
++//===------------------ mach-o/compact_unwind_encoding.h ------------------===//
++//
++// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
++// See https://llvm.org/LICENSE.txt for license information.
++// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
++//
++//
++// Darwin's alternative to DWARF based unwind encodings.
++//
++//===----------------------------------------------------------------------===//
++
++
++#ifndef __COMPACT_UNWIND_ENCODING__
++#define __COMPACT_UNWIND_ENCODING__
++
++#include <stdint.h>
++
++//
++// Compilers can emit standard DWARF FDEs in the __TEXT,__eh_frame section
++// of object files. Or compilers can emit compact unwind information in
++// the __LD,__compact_unwind section.
++//
++// When the linker creates a final linked image, it will create a
++// __TEXT,__unwind_info section. This section is a small and fast way for the
++// runtime to access unwind info for any given function. If the compiler
++// emitted compact unwind info for the function, that compact unwind info will
++// be encoded in the __TEXT,__unwind_info section. If the compiler emitted
++// DWARF unwind info, the __TEXT,__unwind_info section will contain the offset
++// of the FDE in the __TEXT,__eh_frame section in the final linked image.
++//
++// Note: Previously, the linker would transform some DWARF unwind infos into
++// compact unwind info. But that is fragile and no longer done.
++
++
++//
++// The compact unwind endoding is a 32-bit value which encoded in an
++// architecture specific way, which registers to restore from where, and how
++// to unwind out of the function.
++//
++typedef uint32_t compact_unwind_encoding_t;
++
++
++// architecture independent bits
++enum {
++ UNWIND_IS_NOT_FUNCTION_START = 0x80000000,
++ UNWIND_HAS_LSDA = 0x40000000,
++ UNWIND_PERSONALITY_MASK = 0x30000000,
++};
++
++
++
++
++//
++// x86
++//
++// 1-bit: start
++// 1-bit: has lsda
++// 2-bit: personality index
++//
++// 4-bits: 0=old, 1=ebp based, 2=stack-imm, 3=stack-ind, 4=DWARF
++// ebp based:
++// 15-bits (5*3-bits per reg) register permutation
++// 8-bits for stack offset
++// frameless:
++// 8-bits stack size
++// 3-bits stack adjust
++// 3-bits register count
++// 10-bits register permutation
++//
++enum {
++ UNWIND_X86_MODE_MASK = 0x0F000000,
++ UNWIND_X86_MODE_EBP_FRAME = 0x01000000,
++ UNWIND_X86_MODE_STACK_IMMD = 0x02000000,
++ UNWIND_X86_MODE_STACK_IND = 0x03000000,
++ UNWIND_X86_MODE_DWARF = 0x04000000,
++
++ UNWIND_X86_EBP_FRAME_REGISTERS = 0x00007FFF,
++ UNWIND_X86_EBP_FRAME_OFFSET = 0x00FF0000,
++
++ UNWIND_X86_FRAMELESS_STACK_SIZE = 0x00FF0000,
++ UNWIND_X86_FRAMELESS_STACK_ADJUST = 0x0000E000,
++ UNWIND_X86_FRAMELESS_STACK_REG_COUNT = 0x00001C00,
++ UNWIND_X86_FRAMELESS_STACK_REG_PERMUTATION = 0x000003FF,
++
++ UNWIND_X86_DWARF_SECTION_OFFSET = 0x00FFFFFF,
++};
++
++enum {
++ UNWIND_X86_REG_NONE = 0,
++ UNWIND_X86_REG_EBX = 1,
++ UNWIND_X86_REG_ECX = 2,
++ UNWIND_X86_REG_EDX = 3,
++ UNWIND_X86_REG_EDI = 4,
++ UNWIND_X86_REG_ESI = 5,
++ UNWIND_X86_REG_EBP = 6,
++};
++
++//
++// For x86 there are four modes for the compact unwind encoding:
++// UNWIND_X86_MODE_EBP_FRAME:
++// EBP based frame where EBP is push on stack immediately after return address,
++// then ESP is moved to EBP. Thus, to unwind ESP is restored with the current
++// EPB value, then EBP is restored by popping off the stack, and the return
++// is done by popping the stack once more into the pc.
++// All non-volatile registers that need to be restored must have been saved
++// in a small range in the stack that starts EBP-4 to EBP-1020. The offset/4
++// is encoded in the UNWIND_X86_EBP_FRAME_OFFSET bits. The registers saved
++// are encoded in the UNWIND_X86_EBP_FRAME_REGISTERS bits as five 3-bit entries.
++// Each entry contains which register to restore.
++// UNWIND_X86_MODE_STACK_IMMD:
++// A "frameless" (EBP not used as frame pointer) function with a small
++// constant stack size. To return, a constant (encoded in the compact
++// unwind encoding) is added to the ESP. Then the return is done by
++// popping the stack into the pc.
++// All non-volatile registers that need to be restored must have been saved
++// on the stack immediately after the return address. The stack_size/4 is
++// encoded in the UNWIND_X86_FRAMELESS_STACK_SIZE (max stack size is 1024).
++// The number of registers saved is encoded in UNWIND_X86_FRAMELESS_STACK_REG_COUNT.
++// UNWIND_X86_FRAMELESS_STACK_REG_PERMUTATION constains which registers were
++// saved and their order.
++// UNWIND_X86_MODE_STACK_IND:
++// A "frameless" (EBP not used as frame pointer) function large constant
++// stack size. This case is like the previous, except the stack size is too
++// large to encode in the compact unwind encoding. Instead it requires that
++// the function contains "subl $nnnnnnnn,ESP" in its prolog. The compact
++// encoding contains the offset to the nnnnnnnn value in the function in
++// UNWIND_X86_FRAMELESS_STACK_SIZE.
++// UNWIND_X86_MODE_DWARF:
++// No compact unwind encoding is available. Instead the low 24-bits of the
++// compact encoding is the offset of the DWARF FDE in the __eh_frame section.
++// This mode is never used in object files. It is only generated by the
++// linker in final linked images which have only DWARF unwind info for a
++// function.
++//
++// The permutation encoding is a Lehmer code sequence encoded into a
++// single variable-base number so we can encode the ordering of up to
++// six registers in a 10-bit space.
++//
++// The following is the algorithm used to create the permutation encoding used
++// with frameless stacks. It is passed the number of registers to be saved and
++// an array of the register numbers saved.
++//
++//uint32_t permute_encode(uint32_t registerCount, const uint32_t registers[6])
++//{
++// uint32_t renumregs[6];
++// for (int i=6-registerCount; i < 6; ++i) {
++// int countless = 0;
++// for (int j=6-registerCount; j < i; ++j) {
++// if ( registers[j] < registers[i] )
++// ++countless;
++// }
++// renumregs[i] = registers[i] - countless -1;
++// }
++// uint32_t permutationEncoding = 0;
++// switch ( registerCount ) {
++// case 6:
++// permutationEncoding |= (120*renumregs[0] + 24*renumregs[1]
++// + 6*renumregs[2] + 2*renumregs[3]
++// + renumregs[4]);
++// break;
++// case 5:
++// permutationEncoding |= (120*renumregs[1] + 24*renumregs[2]
++// + 6*renumregs[3] + 2*renumregs[4]
++// + renumregs[5]);
++// break;
++// case 4:
++// permutationEncoding |= (60*renumregs[2] + 12*renumregs[3]
++// + 3*renumregs[4] + renumregs[5]);
++// break;
++// case 3:
++// permutationEncoding |= (20*renumregs[3] + 4*renumregs[4]
++// + renumregs[5]);
++// break;
++// case 2:
++// permutationEncoding |= (5*renumregs[4] + renumregs[5]);
++// break;
++// case 1:
++// permutationEncoding |= (renumregs[5]);
++// break;
++// }
++// return permutationEncoding;
++//}
++//
++
++
++
++
++//
++// x86_64
++//
++// 1-bit: start
++// 1-bit: has lsda
++// 2-bit: personality index
++//
++// 4-bits: 0=old, 1=rbp based, 2=stack-imm, 3=stack-ind, 4=DWARF
++// rbp based:
++// 15-bits (5*3-bits per reg) register permutation
++// 8-bits for stack offset
++// frameless:
++// 8-bits stack size
++// 3-bits stack adjust
++// 3-bits register count
++// 10-bits register permutation
++//
++enum {
++ UNWIND_X86_64_MODE_MASK = 0x0F000000,
++ UNWIND_X86_64_MODE_RBP_FRAME = 0x01000000,
++ UNWIND_X86_64_MODE_STACK_IMMD = 0x02000000,
++ UNWIND_X86_64_MODE_STACK_IND = 0x03000000,
++ UNWIND_X86_64_MODE_DWARF = 0x04000000,
++
++ UNWIND_X86_64_RBP_FRAME_REGISTERS = 0x00007FFF,
++ UNWIND_X86_64_RBP_FRAME_OFFSET = 0x00FF0000,
++
++ UNWIND_X86_64_FRAMELESS_STACK_SIZE = 0x00FF0000,
++ UNWIND_X86_64_FRAMELESS_STACK_ADJUST = 0x0000E000,
++ UNWIND_X86_64_FRAMELESS_STACK_REG_COUNT = 0x00001C00,
++ UNWIND_X86_64_FRAMELESS_STACK_REG_PERMUTATION = 0x000003FF,
++
++ UNWIND_X86_64_DWARF_SECTION_OFFSET = 0x00FFFFFF,
++};
++
++enum {
++ UNWIND_X86_64_REG_NONE = 0,
++ UNWIND_X86_64_REG_RBX = 1,
++ UNWIND_X86_64_REG_R12 = 2,
++ UNWIND_X86_64_REG_R13 = 3,
++ UNWIND_X86_64_REG_R14 = 4,
++ UNWIND_X86_64_REG_R15 = 5,
++ UNWIND_X86_64_REG_RBP = 6,
++};
++//
++// For x86_64 there are four modes for the compact unwind encoding:
++// UNWIND_X86_64_MODE_RBP_FRAME:
++// RBP based frame where RBP is push on stack immediately after return address,
++// then RSP is moved to RBP. Thus, to unwind RSP is restored with the current
++// EPB value, then RBP is restored by popping off the stack, and the return
++// is done by popping the stack once more into the pc.
++// All non-volatile registers that need to be restored must have been saved
++// in a small range in the stack that starts RBP-8 to RBP-2040. The offset/8
++// is encoded in the UNWIND_X86_64_RBP_FRAME_OFFSET bits. The registers saved
++// are encoded in the UNWIND_X86_64_RBP_FRAME_REGISTERS bits as five 3-bit entries.
++// Each entry contains which register to restore.
++// UNWIND_X86_64_MODE_STACK_IMMD:
++// A "frameless" (RBP not used as frame pointer) function with a small
++// constant stack size. To return, a constant (encoded in the compact
++// unwind encoding) is added to the RSP. Then the return is done by
++// popping the stack into the pc.
++// All non-volatile registers that need to be restored must have been saved
++// on the stack immediately after the return address. The stack_size/8 is
++// encoded in the UNWIND_X86_64_FRAMELESS_STACK_SIZE (max stack size is 2048).
++// The number of registers saved is encoded in UNWIND_X86_64_FRAMELESS_STACK_REG_COUNT.
++// UNWIND_X86_64_FRAMELESS_STACK_REG_PERMUTATION constains which registers were
++// saved and their order.
++// UNWIND_X86_64_MODE_STACK_IND:
++// A "frameless" (RBP not used as frame pointer) function large constant
++// stack size. This case is like the previous, except the stack size is too
++// large to encode in the compact unwind encoding. Instead it requires that
++// the function contains "subq $nnnnnnnn,RSP" in its prolog. The compact
++// encoding contains the offset to the nnnnnnnn value in the function in
++// UNWIND_X86_64_FRAMELESS_STACK_SIZE.
++// UNWIND_X86_64_MODE_DWARF:
++// No compact unwind encoding is available. Instead the low 24-bits of the
++// compact encoding is the offset of the DWARF FDE in the __eh_frame section.
++// This mode is never used in object files. It is only generated by the
++// linker in final linked images which have only DWARF unwind info for a
++// function.
++//
++
++
++// ARM64
++//
++// 1-bit: start
++// 1-bit: has lsda
++// 2-bit: personality index
++//
++// 4-bits: 4=frame-based, 3=DWARF, 2=frameless
++// frameless:
++// 12-bits of stack size
++// frame-based:
++// 4-bits D reg pairs saved
++// 5-bits X reg pairs saved
++// DWARF:
++// 24-bits offset of DWARF FDE in __eh_frame section
++//
++enum {
++ UNWIND_ARM64_MODE_MASK = 0x0F000000,
++ UNWIND_ARM64_MODE_FRAMELESS = 0x02000000,
++ UNWIND_ARM64_MODE_DWARF = 0x03000000,
++ UNWIND_ARM64_MODE_FRAME = 0x04000000,
++
++ UNWIND_ARM64_FRAME_X19_X20_PAIR = 0x00000001,
++ UNWIND_ARM64_FRAME_X21_X22_PAIR = 0x00000002,
++ UNWIND_ARM64_FRAME_X23_X24_PAIR = 0x00000004,
++ UNWIND_ARM64_FRAME_X25_X26_PAIR = 0x00000008,
++ UNWIND_ARM64_FRAME_X27_X28_PAIR = 0x00000010,
++ UNWIND_ARM64_FRAME_D8_D9_PAIR = 0x00000100,
++ UNWIND_ARM64_FRAME_D10_D11_PAIR = 0x00000200,
++ UNWIND_ARM64_FRAME_D12_D13_PAIR = 0x00000400,
++ UNWIND_ARM64_FRAME_D14_D15_PAIR = 0x00000800,
++
++ UNWIND_ARM64_FRAMELESS_STACK_SIZE_MASK = 0x00FFF000,
++ UNWIND_ARM64_DWARF_SECTION_OFFSET = 0x00FFFFFF,
++};
++// For arm64 there are three modes for the compact unwind encoding:
++// UNWIND_ARM64_MODE_FRAME:
++// This is a standard arm64 prolog where FP/LR are immediately pushed on the
++// stack, then SP is copied to FP. If there are any non-volatile registers
++// saved, then are copied into the stack frame in pairs in a contiguous
++// range right below the saved FP/LR pair. Any subset of the five X pairs
++// and four D pairs can be saved, but the memory layout must be in register
++// number order.
++// UNWIND_ARM64_MODE_FRAMELESS:
++// A "frameless" leaf function, where FP/LR are not saved. The return address
++// remains in LR throughout the function. If any non-volatile registers
++// are saved, they must be pushed onto the stack before any stack space is
++// allocated for local variables. The stack sized (including any saved
++// non-volatile registers) divided by 16 is encoded in the bits
++// UNWIND_ARM64_FRAMELESS_STACK_SIZE_MASK.
++// UNWIND_ARM64_MODE_DWARF:
++// No compact unwind encoding is available. Instead the low 24-bits of the
++// compact encoding is the offset of the DWARF FDE in the __eh_frame section.
++// This mode is never used in object files. It is only generated by the
++// linker in final linked images which have only DWARF unwind info for a
++// function.
++//
++
++
++
++
++
++////////////////////////////////////////////////////////////////////////////////
++//
++// Relocatable Object Files: __LD,__compact_unwind
++//
++////////////////////////////////////////////////////////////////////////////////
++
++//
++// A compiler can generated compact unwind information for a function by adding
++// a "row" to the __LD,__compact_unwind section. This section has the
++// S_ATTR_DEBUG bit set, so the section will be ignored by older linkers.
++// It is removed by the new linker, so never ends up in final executables.
++// This section is a table, initially with one row per function (that needs
++// unwind info). The table columns and some conceptual entries are:
++//
++// range-start pointer to start of function/range
++// range-length
++// compact-unwind-encoding 32-bit encoding
++// personality-function or zero if no personality function
++// lsda or zero if no LSDA data
++//
++// The length and encoding fields are 32-bits. The other are all pointer sized.
++//
++// In x86_64 assembly, these entry would look like:
++//
++// .section __LD,__compact_unwind,regular,debug
++//
++// #compact unwind for _foo
++// .quad _foo
++// .set L1,LfooEnd-_foo
++// .long L1
++// .long 0x01010001
++// .quad 0
++// .quad 0
++//
++// #compact unwind for _bar
++// .quad _bar
++// .set L2,LbarEnd-_bar
++// .long L2
++// .long 0x01020011
++// .quad __gxx_personality
++// .quad except_tab1
++//
++//
++// Notes: There is no need for any labels in the the __compact_unwind section.
++// The use of the .set directive is to force the evaluation of the
++// range-length at assembly time, instead of generating relocations.
++//
++// To support future compiler optimizations where which non-volatile registers
++// are saved changes within a function (e.g. delay saving non-volatiles until
++// necessary), there can by multiple lines in the __compact_unwind table for one
++// function, each with a different (non-overlapping) range and each with
++// different compact unwind encodings that correspond to the non-volatiles
++// saved at that range of the function.
++//
++// If a particular function is so wacky that there is no compact unwind way
++// to encode it, then the compiler can emit traditional DWARF unwind info.
++// The runtime will use which ever is available.
++//
++// Runtime support for compact unwind encodings are only available on 10.6
++// and later. So, the compiler should not generate it when targeting pre-10.6.
++
++
++
++
++////////////////////////////////////////////////////////////////////////////////
++//
++// Final Linked Images: __TEXT,__unwind_info
++//
++////////////////////////////////////////////////////////////////////////////////
++
++//
++// The __TEXT,__unwind_info section is laid out for an efficient two level lookup.
++// The header of the section contains a coarse index that maps function address
++// to the page (4096 byte block) containing the unwind info for that function.
++//
++
++#define UNWIND_SECTION_VERSION 1
++struct unwind_info_section_header
++{
++ uint32_t version; // UNWIND_SECTION_VERSION
++ uint32_t commonEncodingsArraySectionOffset;
++ uint32_t commonEncodingsArrayCount;
++ uint32_t personalityArraySectionOffset;
++ uint32_t personalityArrayCount;
++ uint32_t indexSectionOffset;
++ uint32_t indexCount;
++ // compact_unwind_encoding_t[]
++ // uint32_t personalities[]
++ // unwind_info_section_header_index_entry[]
++ // unwind_info_section_header_lsda_index_entry[]
++};
++
++struct unwind_info_section_header_index_entry
++{
++ uint32_t functionOffset;
++ uint32_t secondLevelPagesSectionOffset; // section offset to start of regular or compress page
++ uint32_t lsdaIndexArraySectionOffset; // section offset to start of lsda_index array for this range
++};
++
++struct unwind_info_section_header_lsda_index_entry
++{
++ uint32_t functionOffset;
++ uint32_t lsdaOffset;
++};
++
++//
++// There are two kinds of second level index pages: regular and compressed.
++// A compressed page can hold up to 1021 entries, but it cannot be used
++// if too many different encoding types are used. The regular page holds
++// 511 entries.
++//
++
++struct unwind_info_regular_second_level_entry
++{
++ uint32_t functionOffset;
++ compact_unwind_encoding_t encoding;
++};
++
++#define UNWIND_SECOND_LEVEL_REGULAR 2
++struct unwind_info_regular_second_level_page_header
++{
++ uint32_t kind; // UNWIND_SECOND_LEVEL_REGULAR
++ uint16_t entryPageOffset;
++ uint16_t entryCount;
++ // entry array
++};
++
++#define UNWIND_SECOND_LEVEL_COMPRESSED 3
++struct unwind_info_compressed_second_level_page_header
++{
++ uint32_t kind; // UNWIND_SECOND_LEVEL_COMPRESSED
++ uint16_t entryPageOffset;
++ uint16_t entryCount;
++ uint16_t encodingsPageOffset;
++ uint16_t encodingsCount;
++ // 32-bit entry array
++ // encodings array
++};
++
++#define UNWIND_INFO_COMPRESSED_ENTRY_FUNC_OFFSET(entry) (entry & 0x00FFFFFF)
++#define UNWIND_INFO_COMPRESSED_ENTRY_ENCODING_INDEX(entry) ((entry >> 24) & 0xFF)
++
++
++
++#endif
++
+--
+1.8.3.1
+
diff --git a/lld13.spec b/lld13.spec
new file mode 100644
index 0000000..ee6f2da
--- /dev/null
+++ b/lld13.spec
@@ -0,0 +1,416 @@
+%bcond_without check
+
+#global rc_ver 3
+%global lld_srcdir lld-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
+%global maj_ver 13
+%global min_ver 0
+%global patch_ver 1
+
+# Don't include unittests in automatic generation of provides or requires.
+%global __provides_exclude_from ^%{_libdir}/lld/.*$
+%global __requires_exclude ^libgtest.*$
+
+%global install_prefix %{_libdir}/llvm%{maj_ver}
+%global install_bindir %{install_prefix}/bin
+%global install_includedir %{install_prefix}/include
+%global install_libdir %{install_prefix}/lib
+
+Name: lld13
+Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
+Release: 1%{?dist}
+Summary: The LLVM Linker
+
+License: NCSA
+URL: http://llvm.org
+Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}...
+Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}...
+Source2: tstellar-gpg-key.asc
+
+ExcludeArch: s390x
+
+# Bundle libunwind header need during build for MachO support
+Patch0: 0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
+
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: ninja-build
+BuildRequires: llvm%{maj_ver}-devel = %{version}
+BuildRequires: ncurses-devel
+BuildRequires: zlib-devel
+
+# For make check:
+BuildRequires: python3-rpm-macros
+BuildRequires: python3-lit
+
+# For gpg source verification
+BuildRequires: gnupg2
+
+Requires(post): %{_sbindir}/update-alternatives
+Requires(preun): %{_sbindir}/update-alternatives
+
+Requires: %{name}-libs = %{version}-%{release}
+
+%description
+The LLVM project linker.
+
+%package devel
+Summary: Libraries and header files for LLD
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains library and header files needed to develop new native
+programs that use the LLD infrastructure.
+
+%package libs
+Summary: LLD shared libraries
+
+%description libs
+Shared libraries for LLD.
+
+%prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -n %{lld_srcdir} -p2
+
+
+%build
+
+# Disable lto since it causes the COFF/libpath.test lit test to crash.
+%global _lto_cflags %{nil}
+
+%cmake \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
+ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
+ -DLLVM_DYLIB_COMPONENTS="all" \
+ -DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DPYTHON_EXECUTABLE=%{__python3} \
+ -DLLVM_INCLUDE_TESTS=OFF \
+ -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
+ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
+ -DLLVM_LIT_ARGS="-sv \
+ --path %{_libdir}/llvm"
+
+%cmake_build
+
+%install
+
+# Install libraries and binaries
+%cmake_install
+
+# Remove binaries
+rm -Rf %{buildroot}%{install_bindir}
+
+# This is generated by Patch1 during build and (probably) must be removed afterward
+rm %{buildroot}%{install_includedir}/mach-o/compact_unwind_encoding.h
+
+%files devel
+%{install_includedir}/lld
+%{install_libdir}/liblld*.so
+%{install_libdir}/cmake/lld/
+
+%files libs
+%license LICENSE.TXT
+%{install_libdir}/liblld*.so.*
+
+%changelog
+* Thu Feb 03 2022 Nikita Popov <npopov(a)redhat.com> - 13.0.1-1
+- Update to LLVM 13.0.1 final
+
+* Tue Feb 01 2022 Nikita Popov <npopov(a)redhat.com> - 13.0.1~rc3-1
+- Update to LLVM 13.0.1 rc3
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 13.0.1~rc2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 14 2022 Nikita Popov <npopov(a)redhat.com> - 13.0.1~rc2-1
+- Update to LLVM 13.0.1rc2
+
+* Wed Jan 12 2022 Nikita Popov <npopov(a)redhat.com> - 13.0.1~rc1-1
+- Update to LLVM 13.0.1rc1
+
+* Wed Oct 06 2021 Tom Stellard <tstellar(a)redhat.com> - 13.0.0-2
+- Rebuild for llvm soname bump
+
+* Fri Oct 01 2021 Tom Stellard <tstellar(a)redhat.com> - 13.0.0-1
+- 13.0.0 Release
+
+* Thu Sep 30 2021 Tom Stellard <tstellar(a)redhat.com> - 13.0.0~rc4-1
+- 13.0.0-rc4 Release
+
+* Mon Sep 20 2021 Tom Stellard <tstellar(a)redhat.com> - 13.0.0~rc1-3
+- 13.0.0-rc3 Release
+
+* Tue Sep 14 2021 Konrad Kleine <kkleine(a)redhat.com> - 13.0.0~rc1-2
+- Add --without=check option
+
+* Fri Aug 06 2021 Tom Stellard <tstellar(a)redhat.com> - 13.0.0~rc1-1
+- 13.0.0-rc1 Release
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 12.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jul 13 2021 Tom Stellard <tstellar(a)redhat.com> - 12.0.1-1
+- 12.0.1 Release
+
+* Wed Jun 30 2021 Tom Stellard <tstellar(a)redhat.com> - 12.0.1~rc3-1
+- 12.0.1-rc3 Release
+
+* Tue Jun 01 2021 Tom Stellard <tstellar(a)redhat.com> - 12.0.1~rc1-1
+- 12.0.1-rc1 Release
+
+* Fri Apr 16 2021 Tom Stellard <tstellar(a)redhat.com> - 12.0.0-1
+- 12.0.0 Release
+
+* Thu Apr 08 2021 sguelton(a)redhat.com - 12.0.0-0.8.rc5
+- New upstream release candidate
+
+* Wed Apr 07 2021 Tom Stellard <tstellar(a)redhat.com> - 12.0.0-0.7.rc4
+- Set executable permissions on run-lit-tests
+
+* Fri Apr 02 2021 sguelton(a)redhat.com - 12.0.0-0.6.rc4
+- New upstream release candidate
+
+* Wed Mar 31 2021 Jonathan Wakely <jwakely(a)redhat.com> - 12.0.0-0.5.rc3
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
+* Thu Mar 11 2021 sguelton(a)redhat.com - 12.0.0-0.4.rc3
+- LLVM 12.0.0 rc3
+
+* Wed Mar 10 2021 sguelton(a)redhat.com - 12.0.0-0.3.rc2
+- rebuilt
+
+* Wed Feb 24 2021 sguelton(a)redhat.com - 12.0.0-0.2.rc2
+- llvm 12.0.0-rc2 release
+
+* Tue Feb 16 2021 sguelton(a)redhat.com - 12.0.0-0.1.rc1
+- llvm 12.0.0-rc1 release
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 11.1.0-0.3.rc2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Serge Guelton - 11.1.0-0.2.rc2
+- llvm 11.1.0-rc2 release
+
+* Thu Jan 14 2021 Serge Guelton - 11.1.0-0.1.rc1
+- 11.1.0-rc1 release
+
+* Wed Jan 06 2021 Serge Guelton - 11.0.1-3
+- LLVM 11.0.1 final
+
+* Tue Dec 22 2020 sguelton(a)redhat.com - 11.0.1-2.rc2
+- llvm 11.0.1-rc2
+
+* Tue Dec 01 2020 sguelton(a)redhat.com - 11.0.1-1.rc1
+- llvm 11.0.1-rc1
+
+* Thu Nov 12 2020 sguelton(a)redhat.com - 11.0.0-3
+- Exclude s390x, unsupported upstream
+
+* Mon Oct 19 2020 sguelton(a)redhat.com - 11.0.0-2
+- Rebuilt with all gating tests on
+
+* Thu Oct 15 2020 sguelton(a)redhat.com - 11.0.0-1
+- Fix NVR
+
+* Mon Oct 12 2020 sguelton(a)redhat.com - 11.0.0-0.6
+- llvm 11.0.0 - final release
+
+* Thu Oct 08 2020 sguelton(a)redhat.com - 11.0.0-0.5.rc6
+- 11.0.0-rc6
+
+* Wed Oct 07 2020 sguelton(a)redhat.com - 11.0.0-0.4.rc5
+- Update CI tests
+
+* Fri Oct 02 2020 sguelton(a)redhat.com - 11.0.0-0.3.rc5
+- 11.0.0-rc5 Release
+
+* Sun Sep 27 2020 sguelton(a)redhat.com - 11.0.0-0.2.rc3
+- Fix NVR
+
+* Thu Sep 24 2020 sguelton(a)redhat.com - 11.0.0-0.1.rc3
+- 11.0.0-rc3 Release
+
+* Tue Sep 01 2020 sguelton(a)redhat.com - 11.0.0-0.1.rc2
+- 11.0.0-rc2 Release
+
+* Mon Aug 10 2020 Tom Stellard <tstellar(a)redhat.com> - 11.0.0-0.1.rc1
+- 11.0.0-rc1 Release
+
+* Mon Aug 10 2020 sguelton(a)redhat.com - 10.0.0-7
+- use %%license macro
+
+* Mon Aug 10 2020 Tom Stellard <tstellar(a)redhat.com> - 10.0.0-6
+- Disable LTO
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.0.0-5
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 10.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 sguelton(a)redhat.com - 10.0.0-3
+- Use generic cmake macros
+- Use Ninja as build system
+- Remove chrpath dependency
+
+* Fri Jul 17 2020 sguelton(a)redhat.com - 10.0.0-2
+- Make test archive arch-independent
+
+* Mon Mar 30 2020 sguelton(a)redhat.com - 10.0.0-1
+- 10.0.0 final
+
+* Wed Mar 25 2020 sguelton(a)redhat.com - 10.0.0-0.6.rc6
+- 10.0.0 rc6
+
+* Fri Mar 20 2020 sguelton(a)redhat.com - 10.0.0-0.5.rc5
+- 10.0.0 rc5
+
+* Sun Mar 15 2020 sguelton(a)redhat.com - 10.0.0-0.4.rc4
+- 10.0.0 rc4
+
+* Thu Mar 05 2020 sguelton(a)redhat.com - 10.0.0-0.3.rc3
+- 10.0.0 rc3
+
+* Fri Feb 14 2020 sguelton(a)redhat.com - 10.0.0-0.2.rc2
+- 10.0.0 rc2
+
+* Fri Jan 31 2020 sguelton(a)redhat.com - 10.0.0-0.1.rc1
+- 10.0.0 rc1
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 9.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Dec 19 2019 Tom Stellard <tstellar(a)redhat.com> -9.0.1-1
+- 9.0.1 Release
+
+* Sat Dec 14 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-6
+- Fix some rpmdiff errors
+
+* Fri Dec 13 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-5
+- Remove build artifacts installed with unittests
+
+* Thu Dec 05 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-4
+- Enable GPG-based source file verification
+
+* Thu Dec 05 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-3
+- Add lld-test package
+
+* Thu Nov 14 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-2
+- Add explicit lld-libs requires to fix rpmdiff errors
+
+* Thu Sep 19 2019 Tom Stellard <tstellar(a)redhat.com> -9.0.0-1
+- 9.0.0 Release
+
+* Thu Aug 22 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.1.rc3
+- 9.0.0-rc3 Release
+
+* Tue Aug 20 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-3
+- touch /usr/bin/ld as required by the packaging guidelines for
+ update-alternatives
+
+* Tue Aug 13 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-2
+- Add update-alternative for ld
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.0-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Mar 20 2019 sguelton(a)redhat.com - 8.0.0-1
+- 8.0.0 final
+
+* Tue Mar 12 2019 sguelton(a)redhat.com - 8.0.0-0.4.rc4
+- 8.0.0 Release candidate 4
+
+* Tue Mar 5 2019 sguelton(a)redhat.com - 8.0.0-0.4.rc3
+- Cleanup specfile after llvm specfile update
+
+* Mon Mar 4 2019 sguelton(a)redhat.com - 8.0.0-0.3.rc3
+- 8.0.0 Release candidate 3
+
+* Fri Feb 22 2019 sguelton(a)redhat.com - 8.0.0-0.2.rc2
+- 8.0.0 Release candidate 2
+
+* Mon Feb 11 2019 sguelton(a)redhat.com - 8.0.0-0.1.rc1
+- 8.0.0 Release candidate 1
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.0.1-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 sguelton(a)redhat.com - 7.0.1-3
+- Fix lld + annobin integration & Setup basic CI tests
+
+* Mon Dec 17 2018 sguelton(a)redhat.com - 7.0.1-2
+- Update lit dependency
+
+* Mon Dec 17 2018 sguelton(a)redhat.com - 7.0.1-1
+- 7.0.1 Release
+
+* Tue Dec 04 2018 sguelton(a)redhat.com - 7.0.0-2
+- Ensure rpmlint passes on specfile
+
+* Mon Sep 24 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-1
+- 7.0.1 Release
+
+* Tue Sep 11 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.4.rc3
+- 7.0.0-rc3 Release
+
+* Fri Aug 31 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.3.rc2
+- 7.0.0-rc2 Release
+
+* Thu Aug 30 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.2.rc1
+- Enable make check
+
+* Mon Aug 13 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.1.rc1
+- 7.0.0-rc1 Release
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 27 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-1
+- 6.0.1 Release
+
+* Fri May 11 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-0.1.rc1
+- 6.0.1-rc1 Release
+
+* Thu Mar 08 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-1
+- 6.0.0 Release
+
+* Tue Feb 13 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.3.rc2
+- 6.0.0-rc2 Release
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.0-0.2.rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 25 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.1.rc1
+- 6.0.0-rc1 Release
+
+* Thu Dec 21 2017 Tom Stellard <tstellar(a)redhat.com> - 5.0.1-1
+- 5.0.1 Release
+
+* Mon Sep 11 2017 Tom Stellard <tstellar(a)redhat.com> - 5.0.0-1
+- 5.0.0 Release
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 06 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-2
+- Backport r307092
+
+* Tue Jul 04 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-1
+- 4.0.1 Release
+
+* Tue Jul 04 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-4
+- Fix build without llvm-static
+
+* Wed May 31 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-3
+- Remove llvm-static dependency
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Tue Mar 14 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-1
+- lld 4.0.0 Final Release
diff --git a/sources b/sources
new file mode 100644
index 0000000..dca80c6
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (lld-13.0.1.src.tar.xz) = cc0b401e741b9d3d283d9d41969354be55791f74ab80d3d3ac50bb653c4b5826d9ce11e7fdd38517c98e0abceaa21cf0407fc8e418f9db1a30f2f3587e0f0db0
+SHA512 (lld-13.0.1.src.tar.xz.sig) = de77a62fc413245f92cc005c38ef0e76446d8fc877d78aa3d838cd4de3a573a33ad8e9c53c300ff775dbf9029571bf929bbc26fec625c000abba04d76bbdeb43
diff --git a/tstellar-gpg-key.asc b/tstellar-gpg-key.asc
new file mode 100644
index 0000000..eba625c
Binary files /dev/null and b/tstellar-gpg-key.asc differ
2 years, 1 month
Architecture specific change in rpms/dovecot.git
by githook-noreply@fedoraproject.org
The package rpms/dovecot.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dovecot.git/commit/?id=24321854aa....
Change:
+%ifnarch aarch64
Thanks.
Full change:
============
commit d4d0b8d5ab3de0b988f6568812ef5be83c2db3ef
Merge: da9eeb3 2432185
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Apr 6 11:21:49 2022 +0200
Merge branch 'rawhide' into f35
commit 24321854aab9e7ad74f48e4106c54a8c05f850e6
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Feb 9 12:09:44 2022 +0100
skip aarch64 check, it timeouts
diff --git a/dovecot.spec b/dovecot.spec
index dbee79d..770a174 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -317,9 +317,12 @@ rm -f %restart_flag
fi
%check
+%ifnarch aarch64
+# some aarch64 tests timeout, skip for now
make check
cd dovecot-2*3-pigeonhole-%{pigeonholever}
make check
+%endif
%files
%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README
commit f9a454dd49393ac6e2df3adf8d13411b2698db6c
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Feb 9 10:15:45 2022 +0100
updated to 2.3.18, pigeonhole to 0.5.18
diff --git a/dovecot-2.3.15-fixvalcond.patch b/dovecot-2.3.15-fixvalcond.patch
index 26090a1..6711010 100644
--- a/dovecot-2.3.15-fixvalcond.patch
+++ b/dovecot-2.3.15-fixvalcond.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17/src/lib-sieve/storage/dict/sieve-dict-script.c
---- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17.1/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100
-+++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17.1/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100
+diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c
+--- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100
++++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100
@@ -114,7 +114,7 @@ static int sieve_dict_script_get_stream
(struct sieve_dict_script *)script;
struct sieve_dict_storage *dstorage =
diff --git a/dovecot-2.3.16-ftbfsbigend.patch b/dovecot-2.3.16-ftbfsbigend.patch
deleted file mode 100644
index 762503b..0000000
--- a/dovecot-2.3.16-ftbfsbigend.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit ec4595097067a736717ef202fe8542b1b4bc2dd5
-Author: Timo Sirainen <timo.sirainen(a)open-xchange.com>
-Date: Tue Aug 10 12:22:08 2021 +0300
-
- lib-index: Fix storing cache fields' last_used with 64bit big endian CPUs
-
-diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
-index e929fb559d..429e0d234c 100644
---- a/src/lib-index/mail-cache-fields.c
-+++ b/src/lib-index/mail-cache-fields.c
-@@ -524,6 +524,19 @@ static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest,
- }
- }
-
-+static void
-+copy_to_buf_last_used(struct mail_cache *cache, buffer_t *dest, bool add_new)
-+{
-+ size_t offset = offsetof(struct mail_cache_field, last_used);
-+#if defined(WORDS_BIGENDIAN) && SIZEOF_VOID_P == 8
-+ /* 64bit time_t with big endian CPUs: copy the last 32 bits instead of
-+ the first 32 bits (that are always 0). The 32 bits are enough until
-+ year 2106, so we're not in a hurry to use 64 bits on disk. */
-+ offset += sizeof(uint32_t);
-+#endif
-+ copy_to_buf(cache, dest, add_new, offset, sizeof(uint32_t));
-+}
-+
- static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
- {
- buffer_t *buffer;
-@@ -536,9 +549,7 @@ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
-
- buffer = t_buffer_create(256);
-
-- copy_to_buf(cache, buffer, FALSE,
-- offsetof(struct mail_cache_field, last_used),
-- sizeof(uint32_t));
-+ copy_to_buf_last_used(cache, buffer, FALSE);
- ret = mail_cache_write(cache, buffer->data, buffer->used,
- offset + MAIL_CACHE_FIELD_LAST_USED());
- if (ret == 0) {
-@@ -599,9 +610,7 @@ void mail_cache_header_fields_get(struct mail_cache *cache, buffer_t *dest)
- buffer_append(dest, &hdr, sizeof(hdr));
-
- /* we have to keep the field order for the existing fields. */
-- copy_to_buf(cache, dest, TRUE,
-- offsetof(struct mail_cache_field, last_used),
-- sizeof(uint32_t));
-+ copy_to_buf_last_used(cache, dest, TRUE);
- copy_to_buf(cache, dest, TRUE,
- offsetof(struct mail_cache_field, field_size),
- sizeof(uint32_t));
-
diff --git a/dovecot-2.3.6-opensslhmac.patch b/dovecot-2.3.6-opensslhmac.patch
index ba6453b..53f3321 100644
--- a/dovecot-2.3.6-opensslhmac.patch
+++ b/dovecot-2.3.6-opensslhmac.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-2.3.14/src/auth/auth-token.c.opensslhmac dovecot-2.3.14/src/auth/auth-token.c
---- dovecot-2.3.14/src/auth/auth-token.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/auth-token.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/auth-token.c.opensslhmac dovecot-2.3.18/src/auth/auth-token.c
+--- dovecot-2.3.18/src/auth/auth-token.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/auth-token.c 2022-02-09 09:27:15.887883359 +0100
@@ -161,17 +161,17 @@ void auth_token_deinit(void)
const char *auth_token_get(const char *service, const char *session_pid,
const char *username, const char *session_id)
@@ -26,9 +26,9 @@ diff -up dovecot-2.3.14/src/auth/auth-token.c.opensslhmac dovecot-2.3.14/src/aut
return binary_to_hex(result, sizeof(result));
}
-diff -up dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.14/src/auth/mech-cram-md5.c
---- dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/mech-cram-md5.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.18/src/auth/mech-cram-md5.c
+--- dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/mech-cram-md5.c 2022-02-09 09:27:15.887883359 +0100
@@ -51,7 +51,7 @@ static bool verify_credentials(struct cr
{
@@ -52,10 +52,10 @@ diff -up dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.14/src/
response_hex = binary_to_hex(digest, sizeof(digest));
-diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/auth/mech-scram.c
---- dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/mech-scram.c 2021-03-22 20:44:13.022912242 +0100
-@@ -78,7 +78,7 @@ static const char *get_scram_server_firs
+diff -up dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac dovecot-2.3.18/src/auth/mech-scram.c
+--- dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/mech-scram.c 2022-02-09 09:31:50.927146858 +0100
+@@ -93,7 +93,7 @@ get_scram_server_first(struct scram_auth
static const char *get_scram_server_final(struct scram_auth_request *request)
{
const struct hash_method *hmethod = request->hash_method;
@@ -64,7 +64,7 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
const char *auth_message;
unsigned char server_signature[hmethod->digest_size];
string_t *str;
-@@ -87,9 +87,9 @@ static const char *get_scram_server_fina
+@@ -109,9 +109,9 @@ static const char *get_scram_server_fina
request->server_first_message, ",",
request->client_final_message_without_proof, NULL);
@@ -75,9 +75,9 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message));
+ openssl_hmac_final(&ctx, server_signature);
- str = t_str_new(MAX_BASE64_ENCODED_SIZE(sizeof(server_signature)));
- str_append(str, "v=");
-@@ -228,7 +228,7 @@ static bool parse_scram_client_first(str
+ /* RFC 5802, Section 7:
+
+@@ -292,7 +292,7 @@ parse_scram_client_first(struct scram_au
static bool verify_credentials(struct scram_auth_request *request)
{
const struct hash_method *hmethod = request->hash_method;
@@ -86,7 +86,7 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
const char *auth_message;
unsigned char client_key[hmethod->digest_size];
unsigned char client_signature[hmethod->digest_size];
-@@ -239,9 +239,9 @@ static bool verify_credentials(struct sc
+@@ -310,9 +310,9 @@ static bool verify_credentials(struct sc
request->server_first_message, ",",
request->client_final_message_without_proof, NULL);
@@ -97,11 +97,11 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message));
+ openssl_hmac_final(&ctx, client_signature);
+ /* ClientProof := ClientKey XOR ClientSignature */
const unsigned char *proof_data = request->proof->data;
- for (i = 0; i < sizeof(client_signature); i++)
-diff -up dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac dovecot-2.3.14/src/auth/password-scheme.c
---- dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/password-scheme.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme.c
+--- dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/password-scheme.c 2022-02-09 09:27:15.888883345 +0100
@@ -639,11 +639,11 @@ static void
cram_md5_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED,
const unsigned char **raw_password_r, size_t *size_r)
@@ -116,9 +116,9 @@ diff -up dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac dovecot-2.3.14/sr
strlen(plaintext), &hash_method_md5);
hmac_md5_get_cram_context(&ctx, context_digest);
-diff -up dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3.14/src/auth/password-scheme-scram.c
---- dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/password-scheme-scram.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme-scram.c
+--- dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/password-scheme-scram.c 2022-02-09 09:27:15.888883345 +0100
@@ -30,23 +30,23 @@ Hi(const struct hash_method *hmethod, co
const unsigned char *salt, size_t salt_size, unsigned int i,
unsigned char *result)
@@ -208,9 +208,9 @@ diff -up dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3
str_append_c(str, ',');
base64_encode(server_key, sizeof(server_key), str);
-diff -up dovecot-2.3.14/src/lib/hmac.c.opensslhmac dovecot-2.3.14/src/lib/hmac.c
---- dovecot-2.3.14/src/lib/hmac.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c
+--- dovecot-2.3.18/src/lib/hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac.c 2022-02-09 09:27:15.888883345 +0100
@@ -7,6 +7,10 @@
* This software is released under the MIT license.
*/
@@ -448,9 +448,9 @@ diff -up dovecot-2.3.14/src/lib/hmac.c.opensslhmac dovecot-2.3.14/src/lib/hmac.c
- safe_memset(prk, 0, sizeof(prk));
- safe_memset(okm, 0, sizeof(okm));
}
-diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.14/src/lib/hmac-cram-md5.c
---- dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac-cram-md5.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.c
+--- dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac-cram-md5.c 2022-02-09 09:27:15.888883345 +0100
@@ -9,10 +9,10 @@
#include "md5.h"
#include "hmac-cram-md5.h"
@@ -477,9 +477,9 @@ diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.14/src/l
const unsigned char *cdp;
struct md5_context *ctx = (void*)hmac_ctx->ctx;
-diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.14/src/lib/hmac-cram-md5.h
---- dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac-cram-md5.h 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.h
+--- dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac-cram-md5.h 2022-02-09 09:27:15.888883345 +0100
@@ -5,9 +5,9 @@
#define CRAM_MD5_CONTEXTLEN 32
@@ -492,9 +492,9 @@ diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.14/src/l
const unsigned char context_digest[CRAM_MD5_CONTEXTLEN]);
-diff -up dovecot-2.3.14/src/lib/hmac.h.opensslhmac dovecot-2.3.14/src/lib/hmac.h
---- dovecot-2.3.14/src/lib/hmac.h.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac.h 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h
+--- dovecot-2.3.18/src/lib/hmac.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac.h 2022-02-09 09:27:15.888883345 +0100
@@ -4,60 +4,97 @@
#include "hash-method.h"
#include "sha1.h"
@@ -606,9 +606,9 @@ diff -up dovecot-2.3.14/src/lib/hmac.h.opensslhmac dovecot-2.3.14/src/lib/hmac.h
okm_buffer, okm_len);
return okm_buffer;
}
-diff -up dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c
---- dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c
+--- dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c 2022-02-09 09:27:15.888883345 +0100
@@ -85,15 +85,15 @@ imap_urlauth_internal_generate(const cha
const unsigned char mailbox_key[IMAP_URLAUTH_KEY_LEN],
size_t *token_len_r)
@@ -629,10 +629,10 @@ diff -up dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-
*token_len_r = SHA1_RESULTLEN + 1;
return token;
-diff -up dovecot-2.3.14/src/lib/Makefile.am.opensslhmac dovecot-2.3.14/src/lib/Makefile.am
---- dovecot-2.3.14/src/lib/Makefile.am.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/Makefile.am 2021-03-22 20:44:13.023912229 +0100
-@@ -352,6 +352,9 @@ headers = \
+diff -up dovecot-2.3.18/src/lib/Makefile.am.opensslhmac dovecot-2.3.18/src/lib/Makefile.am
+--- dovecot-2.3.18/src/lib/Makefile.am.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/Makefile.am 2022-02-09 09:27:15.889883331 +0100
+@@ -354,6 +354,9 @@ headers = \
wildcard-match.h \
write-full.h
@@ -642,10 +642,10 @@ diff -up dovecot-2.3.14/src/lib/Makefile.am.opensslhmac dovecot-2.3.14/src/lib/M
test_programs = test-lib
noinst_PROGRAMS = $(test_programs)
-diff -up dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c
---- dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c 2021-03-22 20:44:13.024912217 +0100
-@@ -106,14 +106,14 @@ oauth2_validate_hmac(const struct oauth2
+diff -up dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c
+--- dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100
+@@ -144,14 +144,14 @@ oauth2_validate_hmac(const struct oauth2
if (oauth2_lookup_hmac_key(set, azp, alg, key_id, &key, error_r) < 0)
return -1;
@@ -666,10 +666,10 @@ diff -up dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.14/s
buffer_t *their_digest =
t_base64url_decode_str(BASE64_DECODE_FLAG_NO_PADDING, blobs[2]);
-diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c
---- dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c 2021-03-22 20:46:09.524440794 +0100
-@@ -236,7 +236,7 @@ static void save_key_to(const char *algo
+diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c
+--- dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100
+@@ -248,7 +248,7 @@ static void save_key_azp_to(const char *
static void sign_jwt_token_hs256(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -678,7 +678,7 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-@@ -246,7 +246,7 @@ static void sign_jwt_token_hs256(buffer_
+@@ -258,7 +258,7 @@ static void sign_jwt_token_hs256(buffer_
static void sign_jwt_token_hs384(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -687,7 +687,7 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-@@ -256,7 +256,7 @@ static void sign_jwt_token_hs384(buffer_
+@@ -268,7 +268,7 @@ static void sign_jwt_token_hs384(buffer_
static void sign_jwt_token_hs512(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -696,9 +696,9 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-diff -up dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac dovecot-2.3.14/src/lib/pkcs5.c
---- dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/pkcs5.c 2021-03-22 20:44:13.024912217 +0100
+diff -up dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac dovecot-2.3.18/src/lib/pkcs5.c
+--- dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/pkcs5.c 2022-02-09 09:27:15.889883331 +0100
@@ -52,7 +52,7 @@ int pkcs5_pbkdf2(const struct hash_metho
size_t l = (length + hash->digest_size - 1)/hash->digest_size; /* same as ceil(length/hash->digest_size) */
unsigned char dk[l * hash->digest_size];
@@ -733,9 +733,9 @@ diff -up dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac dovecot-2.3.14/src/lib/pkcs5
for(i = 0; i < hash->digest_size; i++)
block[i] ^= U_c[i];
}
-diff -up dovecot-2.3.14/src/lib/test-hmac.c.opensslhmac dovecot-2.3.14/src/lib/test-hmac.c
---- dovecot-2.3.14/src/lib/test-hmac.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/test-hmac.c 2021-03-22 20:44:13.024912217 +0100
+diff -up dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac dovecot-2.3.18/src/lib/test-hmac.c
+--- dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/test-hmac.c 2022-02-09 09:27:15.889883331 +0100
@@ -206,11 +206,11 @@ static void test_hmac_rfc(void)
test_begin("hmac sha256 rfc4231 vectors");
for(size_t i = 0; i < N_ELEMENTS(test_vectors); i++) {
diff --git a/dovecot.spec b/dovecot.spec
index 83c58e2..dbee79d 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -4,9 +4,9 @@
Summary: Secure imap and pop3 server
Name: dovecot
Epoch: 1
-Version: 2.3.17.1
+Version: 2.3.18
%global prever %{nil}
-Release: 2%{?dist}
+Release: 1%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2
@@ -14,7 +14,7 @@ URL: https://www.dovecot.org/
Source: https://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz
Source1: dovecot.init
Source2: dovecot.pam
-%global pigeonholever 0.5.17.1
+%global pigeonholever 0.5.18
Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pige...
Source9: dovecot.sysconfig
Source10: dovecot.tmpfilesd
@@ -43,7 +43,6 @@ Patch16: dovecot-2.3.6-opensslhmac.patch
# FTBFS
Patch17: dovecot-2.3.15-fixvalcond.patch
Patch18: dovecot-2.3.15-valbasherr.patch
-Patch19: dovecot-2.3.16-ftbfsbigend.patch
Patch20: dovecot-2.3.14-opensslv3.patch
Source15: prestartscript
@@ -141,7 +140,6 @@ This package provides the development files for dovecot.
%patch16 -p1 -b .opensslhmac
%patch17 -p1 -b .fixvalcond
%patch18 -p1 -b .valbasherr
-%patch19 -p1 -b .ftbfsbigend
%patch20 -p1 -b .opensslv3
cp run-test-valgrind.supp dovecot-2.3-pigeonhole-%{pigeonholever}/
# valgrind would fail with shell wrapper
@@ -468,6 +466,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog
+* Wed Feb 09 2022 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.3.18-1
+- updated to 2.3.18, pigeonhole to 0.5.18
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.3.17.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 76a3cc8..d434056 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dovecot-2.3.17.1.tar.gz) = 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
-SHA512 (dovecot-2.3-pigeonhole-0.5.17.1.tar.gz) = 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
+SHA512 (dovecot-2.3.18.tar.gz) = b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
+SHA512 (dovecot-2.3-pigeonhole-0.5.18.tar.gz) = 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
commit e195fa62dc0843d54b378f306a6aca7669cca2e9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 00:59:08 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dovecot.spec b/dovecot.spec
index c5f5885..83c58e2 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -6,7 +6,7 @@ Name: dovecot
Epoch: 1
Version: 2.3.17.1
%global prever %{nil}
-Release: 1%{?dist}
+Release: 2%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2
@@ -468,6 +468,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.3.17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Tue Dec 07 2021 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.3.17.1-1
- dovecot updated to 2.3.17.1, pigeonhole to 0.5.17.1
- dsync: Add back accidentically removed parameters.
2 years, 1 month
Architecture specific change in rpms/dovecot.git
by githook-noreply@fedoraproject.org
The package rpms/dovecot.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dovecot.git/commit/?id=24321854aa....
Change:
+%ifnarch aarch64
Thanks.
Full change:
============
commit 24321854aab9e7ad74f48e4106c54a8c05f850e6
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Feb 9 12:09:44 2022 +0100
skip aarch64 check, it timeouts
diff --git a/dovecot.spec b/dovecot.spec
index dbee79d..770a174 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -317,9 +317,12 @@ rm -f %restart_flag
fi
%check
+%ifnarch aarch64
+# some aarch64 tests timeout, skip for now
make check
cd dovecot-2*3-pigeonhole-%{pigeonholever}
make check
+%endif
%files
%doc docinstall/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README
commit f9a454dd49393ac6e2df3adf8d13411b2698db6c
Author: Michal Hlavinka <mhlavink(a)redhat.com>
Date: Wed Feb 9 10:15:45 2022 +0100
updated to 2.3.18, pigeonhole to 0.5.18
diff --git a/dovecot-2.3.15-fixvalcond.patch b/dovecot-2.3.15-fixvalcond.patch
index 26090a1..6711010 100644
--- a/dovecot-2.3.15-fixvalcond.patch
+++ b/dovecot-2.3.15-fixvalcond.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17/src/lib-sieve/storage/dict/sieve-dict-script.c
---- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17.1/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100
-+++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.17.1/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100
+diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c
+--- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond 2021-11-02 21:51:36.109032050 +0100
++++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c 2021-11-02 21:52:28.409344118 +0100
@@ -114,7 +114,7 @@ static int sieve_dict_script_get_stream
(struct sieve_dict_script *)script;
struct sieve_dict_storage *dstorage =
diff --git a/dovecot-2.3.16-ftbfsbigend.patch b/dovecot-2.3.16-ftbfsbigend.patch
deleted file mode 100644
index 762503b..0000000
--- a/dovecot-2.3.16-ftbfsbigend.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit ec4595097067a736717ef202fe8542b1b4bc2dd5
-Author: Timo Sirainen <timo.sirainen(a)open-xchange.com>
-Date: Tue Aug 10 12:22:08 2021 +0300
-
- lib-index: Fix storing cache fields' last_used with 64bit big endian CPUs
-
-diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
-index e929fb559d..429e0d234c 100644
---- a/src/lib-index/mail-cache-fields.c
-+++ b/src/lib-index/mail-cache-fields.c
-@@ -524,6 +524,19 @@ static void copy_to_buf_byte(struct mail_cache *cache, buffer_t *dest,
- }
- }
-
-+static void
-+copy_to_buf_last_used(struct mail_cache *cache, buffer_t *dest, bool add_new)
-+{
-+ size_t offset = offsetof(struct mail_cache_field, last_used);
-+#if defined(WORDS_BIGENDIAN) && SIZEOF_VOID_P == 8
-+ /* 64bit time_t with big endian CPUs: copy the last 32 bits instead of
-+ the first 32 bits (that are always 0). The 32 bits are enough until
-+ year 2106, so we're not in a hurry to use 64 bits on disk. */
-+ offset += sizeof(uint32_t);
-+#endif
-+ copy_to_buf(cache, dest, add_new, offset, sizeof(uint32_t));
-+}
-+
- static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
- {
- buffer_t *buffer;
-@@ -536,9 +549,7 @@ static int mail_cache_header_fields_update_locked(struct mail_cache *cache)
-
- buffer = t_buffer_create(256);
-
-- copy_to_buf(cache, buffer, FALSE,
-- offsetof(struct mail_cache_field, last_used),
-- sizeof(uint32_t));
-+ copy_to_buf_last_used(cache, buffer, FALSE);
- ret = mail_cache_write(cache, buffer->data, buffer->used,
- offset + MAIL_CACHE_FIELD_LAST_USED());
- if (ret == 0) {
-@@ -599,9 +610,7 @@ void mail_cache_header_fields_get(struct mail_cache *cache, buffer_t *dest)
- buffer_append(dest, &hdr, sizeof(hdr));
-
- /* we have to keep the field order for the existing fields. */
-- copy_to_buf(cache, dest, TRUE,
-- offsetof(struct mail_cache_field, last_used),
-- sizeof(uint32_t));
-+ copy_to_buf_last_used(cache, dest, TRUE);
- copy_to_buf(cache, dest, TRUE,
- offsetof(struct mail_cache_field, field_size),
- sizeof(uint32_t));
-
diff --git a/dovecot-2.3.6-opensslhmac.patch b/dovecot-2.3.6-opensslhmac.patch
index ba6453b..53f3321 100644
--- a/dovecot-2.3.6-opensslhmac.patch
+++ b/dovecot-2.3.6-opensslhmac.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-2.3.14/src/auth/auth-token.c.opensslhmac dovecot-2.3.14/src/auth/auth-token.c
---- dovecot-2.3.14/src/auth/auth-token.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/auth-token.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/auth-token.c.opensslhmac dovecot-2.3.18/src/auth/auth-token.c
+--- dovecot-2.3.18/src/auth/auth-token.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/auth-token.c 2022-02-09 09:27:15.887883359 +0100
@@ -161,17 +161,17 @@ void auth_token_deinit(void)
const char *auth_token_get(const char *service, const char *session_pid,
const char *username, const char *session_id)
@@ -26,9 +26,9 @@ diff -up dovecot-2.3.14/src/auth/auth-token.c.opensslhmac dovecot-2.3.14/src/aut
return binary_to_hex(result, sizeof(result));
}
-diff -up dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.14/src/auth/mech-cram-md5.c
---- dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/mech-cram-md5.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.18/src/auth/mech-cram-md5.c
+--- dovecot-2.3.18/src/auth/mech-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/mech-cram-md5.c 2022-02-09 09:27:15.887883359 +0100
@@ -51,7 +51,7 @@ static bool verify_credentials(struct cr
{
@@ -52,10 +52,10 @@ diff -up dovecot-2.3.14/src/auth/mech-cram-md5.c.opensslhmac dovecot-2.3.14/src/
response_hex = binary_to_hex(digest, sizeof(digest));
-diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/auth/mech-scram.c
---- dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/mech-scram.c 2021-03-22 20:44:13.022912242 +0100
-@@ -78,7 +78,7 @@ static const char *get_scram_server_firs
+diff -up dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac dovecot-2.3.18/src/auth/mech-scram.c
+--- dovecot-2.3.18/src/auth/mech-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/mech-scram.c 2022-02-09 09:31:50.927146858 +0100
+@@ -93,7 +93,7 @@ get_scram_server_first(struct scram_auth
static const char *get_scram_server_final(struct scram_auth_request *request)
{
const struct hash_method *hmethod = request->hash_method;
@@ -64,7 +64,7 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
const char *auth_message;
unsigned char server_signature[hmethod->digest_size];
string_t *str;
-@@ -87,9 +87,9 @@ static const char *get_scram_server_fina
+@@ -109,9 +109,9 @@ static const char *get_scram_server_fina
request->server_first_message, ",",
request->client_final_message_without_proof, NULL);
@@ -75,9 +75,9 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message));
+ openssl_hmac_final(&ctx, server_signature);
- str = t_str_new(MAX_BASE64_ENCODED_SIZE(sizeof(server_signature)));
- str_append(str, "v=");
-@@ -228,7 +228,7 @@ static bool parse_scram_client_first(str
+ /* RFC 5802, Section 7:
+
+@@ -292,7 +292,7 @@ parse_scram_client_first(struct scram_au
static bool verify_credentials(struct scram_auth_request *request)
{
const struct hash_method *hmethod = request->hash_method;
@@ -86,7 +86,7 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
const char *auth_message;
unsigned char client_key[hmethod->digest_size];
unsigned char client_signature[hmethod->digest_size];
-@@ -239,9 +239,9 @@ static bool verify_credentials(struct sc
+@@ -310,9 +310,9 @@ static bool verify_credentials(struct sc
request->server_first_message, ",",
request->client_final_message_without_proof, NULL);
@@ -97,11 +97,11 @@ diff -up dovecot-2.3.14/src/auth/mech-scram.c.opensslhmac dovecot-2.3.14/src/aut
+ openssl_hmac_update(&ctx, auth_message, strlen(auth_message));
+ openssl_hmac_final(&ctx, client_signature);
+ /* ClientProof := ClientKey XOR ClientSignature */
const unsigned char *proof_data = request->proof->data;
- for (i = 0; i < sizeof(client_signature); i++)
-diff -up dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac dovecot-2.3.14/src/auth/password-scheme.c
---- dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/password-scheme.c 2021-03-22 20:44:13.022912242 +0100
+diff -up dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme.c
+--- dovecot-2.3.18/src/auth/password-scheme.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/password-scheme.c 2022-02-09 09:27:15.888883345 +0100
@@ -639,11 +639,11 @@ static void
cram_md5_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED,
const unsigned char **raw_password_r, size_t *size_r)
@@ -116,9 +116,9 @@ diff -up dovecot-2.3.14/src/auth/password-scheme.c.opensslhmac dovecot-2.3.14/sr
strlen(plaintext), &hash_method_md5);
hmac_md5_get_cram_context(&ctx, context_digest);
-diff -up dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3.14/src/auth/password-scheme-scram.c
---- dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/auth/password-scheme-scram.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3.18/src/auth/password-scheme-scram.c
+--- dovecot-2.3.18/src/auth/password-scheme-scram.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/auth/password-scheme-scram.c 2022-02-09 09:27:15.888883345 +0100
@@ -30,23 +30,23 @@ Hi(const struct hash_method *hmethod, co
const unsigned char *salt, size_t salt_size, unsigned int i,
unsigned char *result)
@@ -208,9 +208,9 @@ diff -up dovecot-2.3.14/src/auth/password-scheme-scram.c.opensslhmac dovecot-2.3
str_append_c(str, ',');
base64_encode(server_key, sizeof(server_key), str);
-diff -up dovecot-2.3.14/src/lib/hmac.c.opensslhmac dovecot-2.3.14/src/lib/hmac.c
---- dovecot-2.3.14/src/lib/hmac.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac.c.opensslhmac dovecot-2.3.18/src/lib/hmac.c
+--- dovecot-2.3.18/src/lib/hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac.c 2022-02-09 09:27:15.888883345 +0100
@@ -7,6 +7,10 @@
* This software is released under the MIT license.
*/
@@ -448,9 +448,9 @@ diff -up dovecot-2.3.14/src/lib/hmac.c.opensslhmac dovecot-2.3.14/src/lib/hmac.c
- safe_memset(prk, 0, sizeof(prk));
- safe_memset(okm, 0, sizeof(okm));
}
-diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.14/src/lib/hmac-cram-md5.c
---- dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac-cram-md5.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.c
+--- dovecot-2.3.18/src/lib/hmac-cram-md5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac-cram-md5.c 2022-02-09 09:27:15.888883345 +0100
@@ -9,10 +9,10 @@
#include "md5.h"
#include "hmac-cram-md5.h"
@@ -477,9 +477,9 @@ diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.c.opensslhmac dovecot-2.3.14/src/l
const unsigned char *cdp;
struct md5_context *ctx = (void*)hmac_ctx->ctx;
-diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.14/src/lib/hmac-cram-md5.h
---- dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac-cram-md5.h 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.18/src/lib/hmac-cram-md5.h
+--- dovecot-2.3.18/src/lib/hmac-cram-md5.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac-cram-md5.h 2022-02-09 09:27:15.888883345 +0100
@@ -5,9 +5,9 @@
#define CRAM_MD5_CONTEXTLEN 32
@@ -492,9 +492,9 @@ diff -up dovecot-2.3.14/src/lib/hmac-cram-md5.h.opensslhmac dovecot-2.3.14/src/l
const unsigned char context_digest[CRAM_MD5_CONTEXTLEN]);
-diff -up dovecot-2.3.14/src/lib/hmac.h.opensslhmac dovecot-2.3.14/src/lib/hmac.h
---- dovecot-2.3.14/src/lib/hmac.h.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/hmac.h 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib/hmac.h.opensslhmac dovecot-2.3.18/src/lib/hmac.h
+--- dovecot-2.3.18/src/lib/hmac.h.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/hmac.h 2022-02-09 09:27:15.888883345 +0100
@@ -4,60 +4,97 @@
#include "hash-method.h"
#include "sha1.h"
@@ -606,9 +606,9 @@ diff -up dovecot-2.3.14/src/lib/hmac.h.opensslhmac dovecot-2.3.14/src/lib/hmac.h
okm_buffer, okm_len);
return okm_buffer;
}
-diff -up dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c
---- dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c 2021-03-22 20:44:13.023912229 +0100
+diff -up dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c
+--- dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-imap-urlauth/imap-urlauth.c 2022-02-09 09:27:15.888883345 +0100
@@ -85,15 +85,15 @@ imap_urlauth_internal_generate(const cha
const unsigned char mailbox_key[IMAP_URLAUTH_KEY_LEN],
size_t *token_len_r)
@@ -629,10 +629,10 @@ diff -up dovecot-2.3.14/src/lib-imap-urlauth/imap-urlauth.c.opensslhmac dovecot-
*token_len_r = SHA1_RESULTLEN + 1;
return token;
-diff -up dovecot-2.3.14/src/lib/Makefile.am.opensslhmac dovecot-2.3.14/src/lib/Makefile.am
---- dovecot-2.3.14/src/lib/Makefile.am.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/Makefile.am 2021-03-22 20:44:13.023912229 +0100
-@@ -352,6 +352,9 @@ headers = \
+diff -up dovecot-2.3.18/src/lib/Makefile.am.opensslhmac dovecot-2.3.18/src/lib/Makefile.am
+--- dovecot-2.3.18/src/lib/Makefile.am.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/Makefile.am 2022-02-09 09:27:15.889883331 +0100
+@@ -354,6 +354,9 @@ headers = \
wildcard-match.h \
write-full.h
@@ -642,10 +642,10 @@ diff -up dovecot-2.3.14/src/lib/Makefile.am.opensslhmac dovecot-2.3.14/src/lib/M
test_programs = test-lib
noinst_PROGRAMS = $(test_programs)
-diff -up dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c
---- dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c 2021-03-22 20:44:13.024912217 +0100
-@@ -106,14 +106,14 @@ oauth2_validate_hmac(const struct oauth2
+diff -up dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c
+--- dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-oauth2/oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100
+@@ -144,14 +144,14 @@ oauth2_validate_hmac(const struct oauth2
if (oauth2_lookup_hmac_key(set, azp, alg, key_id, &key, error_r) < 0)
return -1;
@@ -666,10 +666,10 @@ diff -up dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c.opensslhmac dovecot-2.3.14/s
buffer_t *their_digest =
t_base64url_decode_str(BASE64_DECODE_FLAG_NO_PADDING, blobs[2]);
-diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c
---- dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c 2021-03-22 20:46:09.524440794 +0100
-@@ -236,7 +236,7 @@ static void save_key_to(const char *algo
+diff -up dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c
+--- dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib-oauth2/test-oauth2-jwt.c 2022-02-09 09:27:15.889883331 +0100
+@@ -248,7 +248,7 @@ static void save_key_azp_to(const char *
static void sign_jwt_token_hs256(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -678,7 +678,7 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-@@ -246,7 +246,7 @@ static void sign_jwt_token_hs256(buffer_
+@@ -258,7 +258,7 @@ static void sign_jwt_token_hs256(buffer_
static void sign_jwt_token_hs384(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -687,7 +687,7 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-@@ -256,7 +256,7 @@ static void sign_jwt_token_hs384(buffer_
+@@ -268,7 +268,7 @@ static void sign_jwt_token_hs384(buffer_
static void sign_jwt_token_hs512(buffer_t *tokenbuf, buffer_t *key)
{
i_assert(key != NULL);
@@ -696,9 +696,9 @@ diff -up dovecot-2.3.14/src/lib-oauth2/test-oauth2-jwt.c.opensslhmac dovecot-2.3
tokenbuf);
buffer_append(tokenbuf, ".", 1);
base64url_encode(BASE64_ENCODE_FLAG_NO_PADDING, SIZE_MAX,
-diff -up dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac dovecot-2.3.14/src/lib/pkcs5.c
---- dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/pkcs5.c 2021-03-22 20:44:13.024912217 +0100
+diff -up dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac dovecot-2.3.18/src/lib/pkcs5.c
+--- dovecot-2.3.18/src/lib/pkcs5.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/pkcs5.c 2022-02-09 09:27:15.889883331 +0100
@@ -52,7 +52,7 @@ int pkcs5_pbkdf2(const struct hash_metho
size_t l = (length + hash->digest_size - 1)/hash->digest_size; /* same as ceil(length/hash->digest_size) */
unsigned char dk[l * hash->digest_size];
@@ -733,9 +733,9 @@ diff -up dovecot-2.3.14/src/lib/pkcs5.c.opensslhmac dovecot-2.3.14/src/lib/pkcs5
for(i = 0; i < hash->digest_size; i++)
block[i] ^= U_c[i];
}
-diff -up dovecot-2.3.14/src/lib/test-hmac.c.opensslhmac dovecot-2.3.14/src/lib/test-hmac.c
---- dovecot-2.3.14/src/lib/test-hmac.c.opensslhmac 2021-03-04 09:38:06.000000000 +0100
-+++ dovecot-2.3.14/src/lib/test-hmac.c 2021-03-22 20:44:13.024912217 +0100
+diff -up dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac dovecot-2.3.18/src/lib/test-hmac.c
+--- dovecot-2.3.18/src/lib/test-hmac.c.opensslhmac 2022-02-02 12:42:23.000000000 +0100
++++ dovecot-2.3.18/src/lib/test-hmac.c 2022-02-09 09:27:15.889883331 +0100
@@ -206,11 +206,11 @@ static void test_hmac_rfc(void)
test_begin("hmac sha256 rfc4231 vectors");
for(size_t i = 0; i < N_ELEMENTS(test_vectors); i++) {
diff --git a/dovecot.spec b/dovecot.spec
index 83c58e2..dbee79d 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -4,9 +4,9 @@
Summary: Secure imap and pop3 server
Name: dovecot
Epoch: 1
-Version: 2.3.17.1
+Version: 2.3.18
%global prever %{nil}
-Release: 2%{?dist}
+Release: 1%{?dist}
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
License: MIT and LGPLv2
@@ -14,7 +14,7 @@ URL: https://www.dovecot.org/
Source: https://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz
Source1: dovecot.init
Source2: dovecot.pam
-%global pigeonholever 0.5.17.1
+%global pigeonholever 0.5.18
Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pige...
Source9: dovecot.sysconfig
Source10: dovecot.tmpfilesd
@@ -43,7 +43,6 @@ Patch16: dovecot-2.3.6-opensslhmac.patch
# FTBFS
Patch17: dovecot-2.3.15-fixvalcond.patch
Patch18: dovecot-2.3.15-valbasherr.patch
-Patch19: dovecot-2.3.16-ftbfsbigend.patch
Patch20: dovecot-2.3.14-opensslv3.patch
Source15: prestartscript
@@ -141,7 +140,6 @@ This package provides the development files for dovecot.
%patch16 -p1 -b .opensslhmac
%patch17 -p1 -b .fixvalcond
%patch18 -p1 -b .valbasherr
-%patch19 -p1 -b .ftbfsbigend
%patch20 -p1 -b .opensslv3
cp run-test-valgrind.supp dovecot-2.3-pigeonhole-%{pigeonholever}/
# valgrind would fail with shell wrapper
@@ -468,6 +466,9 @@ make check
%{_libdir}/%{name}/dict/libdriver_pgsql.so
%changelog
+* Wed Feb 09 2022 Michal Hlavinka <mhlavink(a)redhat.com> - 1:2.3.18-1
+- updated to 2.3.18, pigeonhole to 0.5.18
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:2.3.17.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 76a3cc8..d434056 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dovecot-2.3.17.1.tar.gz) = 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
-SHA512 (dovecot-2.3-pigeonhole-0.5.17.1.tar.gz) = 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
+SHA512 (dovecot-2.3.18.tar.gz) = b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
+SHA512 (dovecot-2.3-pigeonhole-0.5.18.tar.gz) = 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
2 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=c7aece4788...
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=35a5afbafa....
Change:
-%ifarch aarch64
-%ifnarch ppc64le
Thanks.
Full change:
============
commit c7aece478831dbb673b452b9a73c43f62a5efabc
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:55:42 2022 +0200
removed aarch64 unused patch
diff --git a/crossbeam-downgrade-rhbz2063961.patch b/crossbeam-downgrade-rhbz2063961.patch
deleted file mode 100644
index 428c3ec..0000000
--- a/crossbeam-downgrade-rhbz2063961.patch
+++ /dev/null
@@ -1,5110 +0,0 @@
-diff -up firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/Cargo.lock
---- firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 01:15:33.000000000 +0100
-+++ firefox-98.0/Cargo.lock 2022-03-16 09:35:09.020396771 +0100
-@@ -65,9 +65,9 @@ dependencies = [
-
- [[package]]
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
-+checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
-
- [[package]]
- name = "app_services_logger"
-@@ -148,9 +148,9 @@ source = "git+https://github.com/smol-rs
-
- [[package]]
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
-+checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -443,9 +443,9 @@ dependencies = [
-
- [[package]]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"
-+checksum = "9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"
- dependencies = [
- "cfg-if 1.0.0",
- ]
-@@ -482,7 +482,7 @@ version = "0.1.0"
- dependencies = [
- "bits_client",
- "comedy",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "libc",
- "log",
- "moz_task",
-@@ -493,9 +493,9 @@ dependencies = [
-
- [[package]]
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-+checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
- dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
-@@ -553,16 +553,16 @@ version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "jobserver",
- "num_cpus",
- ]
-
- [[package]]
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
-
- [[package]]
- name = "byte-tools"
-@@ -600,9 +600,9 @@ checksum = "c4872d67bab6358e59559027aa3b
-
- [[package]]
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
-
- [[package]]
- name = "cascade_bloom_filter"
-@@ -628,7 +628,7 @@ version = "0.0.1"
- dependencies = [
- "base64 0.10.1",
- "byteorder",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "log",
- "malloc_size_of_derive",
-@@ -977,12 +977,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
-+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1003,8 +1003,8 @@ source = "registry+https://github.com/ru
- checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-epoch 0.9.6",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-epoch 0.9.5",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1024,12 +1024,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
-+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "memoffset 0.6.5",
- "scopeguard",
-@@ -1067,9 +1067,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-@@ -2728,7 +2728,7 @@ name = "kvstore"
- version = "0.1.0"
- dependencies = [
- "atomic_refcell",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "lazy_static",
- "libc",
-@@ -4216,7 +4216,7 @@ checksum = "d78120e2c850279833f1dd3582f7
- dependencies = [
- "crossbeam-channel",
- "crossbeam-deque 0.8.1",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "num_cpus",
- ]
-@@ -4400,7 +4400,7 @@ dependencies = [
- "base64 0.13.0",
- "blake2b_simd",
- "constant_time_eq",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -6020,7 +6020,7 @@ dependencies = [
- name = "xulstore"
- version = "0.1.0"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "libc",
- "log",
-diff -up firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json
---- firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json 2022-03-16 09:33:31.989159760 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"ce2fb7f23073f4f0bd58bae44baab86fa6c3d3595f32d28b410ec52394b3f64c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"5a60bd1fe1717c044c7ab34c062ce6651c0cb08596a5878e391c2755ecac07f9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"330286a28b4d4da255db38bc267da17fb03f2333ea26684f82124973ffcaea43","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"f8bc5174219da947e6292891864f35307d5c400fd5690f51d574edaa5e39b8a4","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"5e3414ce23940106f95102f85e643cb5bed5e8ed9027557963c728d5f46d5586","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"a1a52f9874f0aa1382fb404f029c6fa88e53afe38fb2417877d5711f1f2b90c9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"f39d4684ce6ce473b585d2f9bc8b7a355cf28e5b5c936431d8072ac5c4fe94fd","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"382956f4bd3dcd1f6036efb8f11193595a7c60e0a5dbf5f2da149f1f25183abf","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"45331ef18c4c69acf4b80f5f55d2cefb55cc82f00e854b81d54c3df36a639003","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/Cargo.toml
---- firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/Cargo.toml 2022-03-16 09:33:31.989159760 +0100
-@@ -13,7 +13,7 @@
- edition = "2018"
- rust-version = "1.38"
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Flexible concrete Error type built on std::error::Error"
- documentation = "https://docs.rs/anyhow"
-@@ -32,7 +32,7 @@ version = "0.3"
- default-features = false
-
- [dev-dependencies.rustversion]
--version = "1.0.6"
-+version = "1.0"
-
- [dev-dependencies.syn]
- version = "1.0"
-diff -up firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/backtrace.rs
---- firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/backtrace.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -182,7 +182,7 @@ mod capture {
- impl Backtrace {
- fn enabled() -> bool {
- static ENABLED: AtomicUsize = AtomicUsize::new(0);
-- match ENABLED.load(Ordering::Relaxed) {
-+ match ENABLED.load(Ordering::SeqCst) {
- 0 => {}
- 1 => return false,
- _ => return true,
-@@ -194,7 +194,7 @@ mod capture {
- None => false,
- },
- };
-- ENABLED.store(enabled as usize + 1, Ordering::Relaxed);
-+ ENABLED.store(enabled as usize + 1, Ordering::SeqCst);
- enabled
- }
-
-diff -up firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/lib.rs
---- firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/lib.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -210,7 +210,7 @@
- //! will require an explicit `.map_err(Error::msg)` when working with a
- //! non-Anyhow error type inside a function that returns Anyhow's error type.
-
--#![doc(html_root_url = "https://docs.rs/anyhow/1.0.52")]
-+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.51")]
- #![cfg_attr(backtrace, feature(backtrace))]
- #![cfg_attr(doc_cfg, feature(doc_cfg))]
- #![cfg_attr(not(feature = "std"), no_std)]
-@@ -225,7 +225,6 @@
- clippy::needless_doctest_main,
- clippy::new_ret_no_self,
- clippy::redundant_else,
-- clippy::return_self_not_must_use,
- clippy::unused_self,
- clippy::used_underscore_binding,
- clippy::wildcard_imports,
-diff -up firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs
---- firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -2,7 +2,8 @@
-
- use std::error::Error as StdError;
- use std::fmt::{self, Display};
--use std::sync::atomic::{AtomicBool, Ordering};
-+use std::sync::atomic::AtomicBool;
-+use std::sync::atomic::Ordering::SeqCst;
- use std::sync::Arc;
-
- #[derive(Debug)]
-@@ -18,7 +19,7 @@ impl Flag {
- }
-
- pub fn get(&self) -> bool {
-- self.atomic.load(Ordering::Relaxed)
-+ self.atomic.load(SeqCst)
- }
- }
-
-@@ -47,7 +48,7 @@ impl Display for DetectDrop {
-
- impl Drop for DetectDrop {
- fn drop(&mut self) {
-- let already_dropped = self.has_dropped.atomic.swap(true, Ordering::Relaxed);
-+ let already_dropped = self.has_dropped.atomic.swap(true, SeqCst);
- assert!(!already_dropped);
- }
- }
-diff -up firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs
---- firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -5,7 +5,6 @@
- clippy::items_after_statements,
- clippy::let_and_return,
- clippy::let_underscore_drop,
-- clippy::logic_bug,
- clippy::match_bool,
- clippy::never_loop,
- clippy::redundant_closure_call,
-@@ -46,15 +45,13 @@ impl<T> Trait for T {}
- fn assert_err<T: Debug>(result: impl FnOnce() -> Result<T>, expected: &'static str) {
- let actual = result().unwrap_err().to_string();
-
-- // In general different rustc versions will format the interpolated lhs and
-- // rhs $:expr fragment with insignificant differences in whitespace or
-- // punctuation, so we check the message in full against nightly and do just
-- // a cursory test on older toolchains.
-- if rustversion::cfg!(nightly) && !cfg!(miri) {
-- assert_eq!(actual, expected);
-- } else {
-- assert_eq!(actual.contains(" vs "), expected.contains(" vs "));
-+ let mut accepted_alternatives = expected.split('\n');
-+ let expected = accepted_alternatives.next_back().unwrap();
-+ if accepted_alternatives.any(|alternative| actual == alternative) {
-+ return;
- }
-+
-+ assert_eq!(actual, expected);
- }
-
- #[test]
-@@ -101,7 +98,7 @@ fn test_low_precedence_binary_operator()
- let test = || Ok(ensure!(while false == true && false {} < ()));
- assert_err(
- test,
-- "Condition failed: `while false == true && false {} < ()` (() vs ())",
-+ "Condition failed: `while false == true && false { } < ()` (() vs ())",
- );
- }
-
-@@ -148,41 +145,41 @@ fn test_unary() {
- fn test_if() {
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {}.t(1) == 2));
-- assert_err(test, "Condition failed: `if false {}.t(1) == 2` (1 vs 2)");
-+ assert_err(test, "Condition failed: `if false { }.t(1) == 2` (1 vs 2)");
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else if false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else if false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else if false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -192,49 +189,53 @@ fn test_loop() {
- let test = || Ok(ensure!(1 + loop { break 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(1 + 'a: loop { break 'a 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while let None = Some(1) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while let None = Some(1) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while let None = Some(1) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for true | false in iter::empty() {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for true | false in iter::empty() {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for true | false in iter::empty() { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -263,13 +264,13 @@ fn test_atom() {
- let test = || Ok(ensure!(S + async { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async { 1 } == true` (false vs true)",
- );
-
- let test = || Ok(ensure!(S + async move { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async move { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async move { 1 } == true` (false vs true)",
- );
-
- let x = &1;
-@@ -380,7 +381,7 @@ fn test_macro() {
- let test = || Ok(ensure!(stringify! {} != ""));
- assert_err(
- test,
-- "Condition failed: `stringify! {} != \"\"` (\"\" vs \"\")",
-+ "Condition failed: `stringify! { } != \"\"` (\"\" vs \"\")",
- );
- }
-
-@@ -528,7 +529,7 @@ fn test_as() {
- let test = || Ok(ensure!(f as for<'a> fn() as usize * 0 != 0));
- assert_err(
- test,
-- "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)", // FIXME
-+ "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)",
- );
-
- let test = || Ok(ensure!(f as unsafe fn() as usize * 0 != 0));
-@@ -613,7 +614,7 @@ fn test_pat() {
- let test = || Ok(ensure!(if let -1..=1 = 0 { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let &0 = &0 { 0 } else { 1 } == 1));
-@@ -656,13 +657,13 @@ fn test_pat() {
- let test = || Ok(ensure!(if let P::<u8> {} = p { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let ::std::marker::PhantomData = p {} != ()));
- assert_err(
- test,
-- "Condition failed: `if let ::std::marker::PhantomData = p {} != ()` (() vs ())",
-+ "Condition failed: `if let ::std::marker::PhantomData = p { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let <S as Trait>::V = 0 { 0 } else { 1 } == 1));
-@@ -674,7 +675,7 @@ fn test_pat() {
- let test = || Ok(ensure!(for _ in iter::once(()) {} != ()));
- assert_err(
- test,
-- "Condition failed: `for _ in iter::once(()) {} != ()` (() vs ())",
-+ "Condition failed: `for _ in iter::once(()) { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let stringify!(x) = "x" { 0 } else { 1 } == 1));
-diff -up firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json
---- firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json 2022-03-16 09:33:31.990159794 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9168c83306a2940b86790578d9d72c23d70bad572bf67ad3def2c8265bd0c270","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"f1002235c33fc292e6784937c2c64d6e7ba105147b9a82126c830d09b86c1059","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"df12d6551ce0a8e3416f83fe92686ab2a22fb0a5dadb45499f531c8822c63c3e","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"1df5569f4615620172affeaa86da629623f32a0bb15f790a10c0837bd9da27e6","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"0f70f0bda0e86a43e6d6f6980f1ef8a1989c3e32db593bd60f920025a25728d5","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"21ce55872b2a6d57077ada797a5c3ae78a3d218570605a7509951b45afa212b3","tests/ui/missing-async-in-impl.rs":"5a5538d08d11c145211a92af0d8973eee8b21f33b90adda85430805bd3dbbc83","tests/ui/missing-async-in-impl.stderr":"2916bc8a51e25f4dd18eaf433b916d533943eac2c1afbee64e9a89e7b928040d","tests/ui/missing-async-in-trait.rs":"dc67241593f270233ba885df92e59164126416e68d49d8d62edc251666b5db6e","tests/ui/missing-async-in-trait.stderr":"67e66e7b19358830deff3ba01f5d701a9ae05c4e6fa9c081c49c1c75efbb7ade","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"e5ee994398bf8294324d61df02467a4229f68f4113bf5acc004851c03d66ec6a","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"cd7bf2fe9023021837b2b3e8cc164ffc18900b01cf704c68cde91edd07d65dc8","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"7865153d1e41ecdfa64b197901e3bda57bcda0c486bbcf11dc6e9837ceb40b29","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"01e6800bcabca87306c72269e38d1eac53ef1e8ad9951a9be052b97aff16364d","tests/ui/unreachable.rs":"be0aa7cc129fe42a1fbd85e36b3f08c6a2bd16c90ed2e33fc4c50e40ce085bcd","tests/ui/unreachable.stderr":"73beb71cb74076f2cb45485271de31658cf59f4143e62daa34b9f2a8980ddfcd","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"64fc5d45cb51330f0a1e85e69a28b69ddda12a109aa6a8ba3eaee1ac58d93b5f"},"package":"061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"fda2e0dc95a93f95edaa7dfdf9b7323593214c1b9e165789cd8b8e6057349ecb","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"231d1e732f295949939583df7169f49f950317679e7415ee6b5d38b8414f8b7b","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"8a60ea2181287bfd42bcc73df1d157398f202f60991ec91eb906029e3a1ae88b","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"fd6f80e2cae790f6370c537eaabedb17e9ff06c2b1f056d3d7071ed7f021f831","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"f3c32ae57ead984ac985641bd07f50a894b572d6b8b8269556cf606f34d05101","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"1e1cbcbbfded1da0a252666f2077d806d11e16fccea825c7d58805c1d88a9d58","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"636a03cc42933b59d73032ce6cea862e33c16efb9c7fe7f27749247998bc9f23","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"e6cb190e02f0226df6444065aaca3051f7db8ae599bba18a685155c52bb799b6","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"590ba1db336f57133b66b83a576afa6f96f2201147b9c90eea4bdc84b966b19c","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"63ed733b35b71f29ff0e863d287049e831dd0923978d16f5679ebd4d9d1c6d69","tests/ui/unreachable.rs":"7905c3fd0115753d18d64e12c39f42f3abec7a41b02572ea009c7d93f6d7751d","tests/ui/unreachable.stderr":"1fe3a63e44a99c62c489e1994176f03c2218bf382439bc20f1f12d368fe1558a","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"be1893e21e626f0f76d16799bf27ad12df304384245462515e1fa63f06a83d80"},"package":"44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/Cargo.toml
---- firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/Cargo.toml 2022-03-16 09:33:31.990159794 +0100
-@@ -11,9 +11,8 @@
-
- [package]
- edition = "2018"
--rust-version = "1.39"
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Type erasure for async trait methods"
- documentation = "https://docs.rs/async-trait"
-@@ -48,5 +47,5 @@ version = "0.1.14"
- version = "0.1.14"
-
- [dev-dependencies.trybuild]
--version = "1.0.49"
-+version = "1.0.19"
- features = ["diff"]
-diff -up firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/src/expand.rs
---- firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/src/expand.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -125,8 +125,6 @@ fn lint_suppress_with_body() -> Attribut
- parse_quote! {
- #[allow(
- clippy::let_unit_value,
-- clippy::no_effect_underscore_binding,
-- clippy::shadow_same,
- clippy::type_complexity,
- clippy::type_repetition_in_bounds,
- clippy::used_underscore_binding
-diff -up firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/test.rs
---- firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/test.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -6,7 +6,6 @@
- clippy::let_underscore_drop,
- clippy::let_unit_value,
- clippy::missing_panics_doc,
-- clippy::missing_safety_doc,
- clippy::needless_return,
- clippy::trivially_copy_pass_by_ref,
- clippy::unused_async
-@@ -1377,15 +1376,3 @@ pub mod issue169 {
-
- pub fn test(_t: &dyn Trait) {}
- }
--
--// https://github.com/dtolnay/async-trait/issues/183
--pub mod issue183 {
-- #![deny(clippy::shadow_same)]
--
-- use async_trait::async_trait;
--
-- #[async_trait]
-- trait Foo {
-- async fn foo(_n: i32) {}
-- }
--}
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,13 +1,13 @@
- error: trait objects without an explicit `dyn` are deprecated
-- --> tests/ui/bare-trait-object.rs:11:16
-+ --> $DIR/bare-trait-object.rs:11:16
- |
- 11 | impl Trait for Send + Sync {
- | ^^^^^^^^^^^ help: use `dyn`: `dyn Send + Sync`
- |
- note: the lint level is defined here
-- --> tests/ui/bare-trait-object.rs:1:9
-+ --> $DIR/bare-trait-object.rs:1:9
- |
- 1 | #![deny(bare_trait_objects)]
- | ^^^^^^^^^^^^^^^^^^
- = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-- = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promot...>
-+ = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:17:16
-+ --> $DIR/delimiter-span.rs:17:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-@@ -8,7 +8,7 @@ error: no rules expected the token `{`
- | ^ no rules expected this token in macro call
-
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:18:16
-+ --> $DIR/delimiter-span.rs:18:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error[E0726]: implicit elided lifetime not allowed here
-- --> tests/ui/lifetime-span.rs:12:6
-+ --> $DIR/lifetime-span.rs:12:6
- |
- 12 | impl Trait for A {
- | ^^^^^- help: indicate the anonymous lifetime: `<'_>`
-@@ -7,7 +7,7 @@ error[E0726]: implicit elided lifetime n
- = note: assuming a `'static` lifetime...
-
- error[E0107]: this trait takes 0 lifetime arguments but 1 lifetime argument was supplied
-- --> tests/ui/lifetime-span.rs:32:10
-+ --> $DIR/lifetime-span.rs:32:10
- |
- 32 | impl<'r> Trait2<'r> for B {
- | ^^^^^^---- help: remove these generics
-@@ -15,13 +15,13 @@ error[E0107]: this trait takes 0 lifetim
- | expected 0 lifetime arguments
- |
- note: trait defined here, with 0 lifetime parameters
-- --> tests/ui/lifetime-span.rs:22:11
-+ --> $DIR/lifetime-span.rs:22:11
- |
- 22 | pub trait Trait2 {
- | ^^^^^^
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:13:14
-+ --> $DIR/lifetime-span.rs:13:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -30,7 +30,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:18:14
-+ --> $DIR/lifetime-span.rs:18:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -39,7 +39,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:33:14
-+ --> $DIR/lifetime-span.rs:33:14
- |
- 23 | async fn method<'r>(&'r self);
- | ---- lifetimes in impl do not match this method in trait
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: associated function in `impl` without body
-- --> tests/ui/missing-body.rs:12:5
-+ --> $DIR/missing-body.rs:12:5
- |
- 12 | async fn f(&self);
- | ^^^^^^^^^^^^^^^^^-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,11 +1,11 @@
- error: unused return value of `Interface::f` that must be used
-- --> tests/ui/must-use.rs:18:5
-+ --> $DIR/must-use.rs:18:5
- |
- 18 | Thing.f();
- | ^^^^^^^^^^
- |
- note: the lint level is defined here
-- --> tests/ui/must-use.rs:1:9
-+ --> $DIR/must-use.rs:1:9
- |
- 1 | #![deny(unused_must_use)]
- | ^^^^^^^^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:17:21
-+ --> $DIR/self-span.rs:17:21
- |
- 17 | let _: () = self;
- | -- ^^^^ expected `()`, found struct `S`
-@@ -7,13 +7,13 @@ error[E0308]: mismatched types
- | expected due to this
-
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/self-span.rs:18:23
-+ --> $DIR/self-span.rs:18:23
- |
- 18 | let _: Self = Self;
- | ^^^^ help: use curly brackets: `Self { /* fields */ }`
-
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:25:21
-+ --> $DIR/self-span.rs:25:21
- |
- 25 | let _: () = self;
- | -- ^^^^ expected `()`, found enum `E`
-@@ -21,7 +21,7 @@ error[E0308]: mismatched types
- | expected due to this
-
- error[E0533]: expected unit struct, unit variant or constant, found struct variant `Self::V`
-- --> tests/ui/self-span.rs:26:23
-+ --> $DIR/self-span.rs:26:23
- |
- 26 | let _: Self = Self::V;
- | ^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:8:26
-+ --> $DIR/send-not-implemented.rs:8:26
- |
- 8 | async fn test(&self) {
- | __________________________^
-@@ -9,9 +9,9 @@ error: future cannot be sent between thr
- 12 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:11:9
-+ --> $DIR/send-not-implemented.rs:11:9
- |
- 10 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-@@ -22,7 +22,7 @@ note: future is not `Send` as this value
- = note: required for the cast to the object type `dyn Future<Output = ()> + Send`
-
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:14:38
-+ --> $DIR/send-not-implemented.rs:14:38
- |
- 14 | async fn test_ret(&self) -> bool {
- | ______________________________________^
-@@ -33,9 +33,9 @@ error: future cannot be sent between thr
- 19 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:17:9
-+ --> $DIR/send-not-implemented.rs:17:9
- |
- 16 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -12,8 +12,8 @@ pub trait Trait {
- #[async_trait]
- pub trait TraitFoo {
- async fn f() {
-- let _y = unimplemented!();
-- let _z = _y;
-+ let y = unimplemented!();
-+ let z = y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,13 +1,13 @@
- error: unreachable statement
-- --> tests/ui/unreachable.rs:16:9
-+ --> $DIR/unreachable.rs:16:9
- |
--15 | let _y = unimplemented!();
-- | ---------------- any code following this expression is unreachable
--16 | let _z = _y;
-- | ^^^^^^^^^^^^ unreachable statement
-+15 | let y = unimplemented!();
-+ | ---------------- any code following this expression is unreachable
-+16 | let z = y;
-+ | ^^^^^^^^^^ unreachable statement
- |
- note: the lint level is defined here
-- --> tests/ui/unreachable.rs:1:9
-+ --> $DIR/unreachable.rs:1:9
- |
- 1 | #![deny(warnings)]
- | ^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/unsupported-self.rs:11:17
-+ --> $DIR/unsupported-self.rs:11:17
- |
- 11 | let _ = Self;
- | ^^^^
-diff -up firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"28a1d4b7f04f3989f856789ec569d890a91b9dfdc8775ff8cbd4e0c1b2f8f9f2","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"250d841ee01b90209c6c4ad304969de145287c6c6588850b95e6f843ec4dd579","src/tests.rs":"5e62c77cfa155fd8affa8ff3c7ea688d80bce6f4956f9956582775ae3adca1a6"},"package":"bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"1da2771067c7bb47f182c75624cec456ef99daf6882314633a2a68aefc2616ad","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"6dcb62a9279ecad8cdcfe37f383282089753e28adc0f2785ca73d50040bc89e7","src/tests.rs":"f67d17aa8faed5e3838322de9b98bb0cdc58d35fe5870e3f5c65ef1ef788966e"},"package":"9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/Cargo.toml
---- firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -3,15 +3,16 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- authors = ["Ilkka Rauta <ilkka.rauta(a)gmail.com>"]
- description = "BitReader helps reading individual bits from a slice of bytes.\n\nYou can read \"unusual\" numbers of bits from the byte slice, for example 13 bits\nat once. The reader internally keeps track of position within the buffer.\n"
- homepage = "https://github.com/irauta/bitreader"
-diff -up firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/lib.rs
---- firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/lib.rs 2022-03-16 09:37:01.761157888 +0100
-@@ -50,7 +50,6 @@
- cfg_if::cfg_if!{
- if #[cfg(feature = "std")] {
- extern crate std;
-- use std::cmp::min;
- use std::prelude::v1::*;
- use std::fmt;
- use std::error::Error;
-@@ -58,7 +57,6 @@ cfg_if::cfg_if!{
- } else {
- use core::result;
- use core::fmt;
-- use core::cmp::min;
- }
- }
-
-@@ -71,9 +69,6 @@ pub struct BitReader<'a> {
- /// Position from the start of the slice, counted as bits instead of bytes
- position: u64,
- relative_offset: u64,
--
-- /// Length this reader is allowed to read from the slice, counted as bits instead of bytes.
-- length: u64,
- }
-
- impl<'a> BitReader<'a> {
-@@ -84,7 +79,6 @@ impl<'a> BitReader<'a> {
- bytes: bytes,
- position: 0,
- relative_offset: 0,
-- length: bytes.len() as u64 * 8,
- }
- }
-
-@@ -115,45 +109,6 @@ impl<'a> BitReader<'a> {
- bytes: self.bytes,
- position: self.position,
- relative_offset: self.position,
-- length: self.length - self.position,
-- }
-- }
--
-- /// Returns a copy of current BitReader, with the difference that its position() returns
-- /// positions relative to the position of the original BitReader at the construction time, and
-- /// will not allow reading more than len bits. After construction, both readers are otherwise
-- // completely independent, except of course for sharing the same source data.
-- ///
-- /// ```
-- /// use bitreader::BitReader;
-- /// use bitreader::BitReaderError;
-- ///
-- /// let bytes = &[0b11110000, 0b00001111];
-- /// let mut original = BitReader::new(bytes);
-- /// assert_eq!(original.read_u8(4).unwrap(), 0b1111);
-- /// assert_eq!(original.position(), 4);
-- ///
-- /// let mut relative = original.relative_reader_atmost(8);
-- /// assert_eq!(relative.position(), 0);
-- ///
-- /// assert_eq!(original.read_u8(8).unwrap(), 0);
-- /// assert_eq!(relative.read_u8(8).unwrap(), 0);
-- ///
-- /// assert_eq!(original.position(), 12);
-- /// assert_eq!(relative.position(), 8);
-- ///
-- /// assert_eq!(relative.read_u8(8).unwrap_err(), BitReaderError::NotEnoughData{
-- /// position: 8,
-- /// length: 8,
-- /// requested: 8
-- /// });
-- /// ```
-- pub fn relative_reader_atmost(&self, len: u64) -> BitReader<'a> {
-- BitReader {
-- bytes: self.bytes,
-- position: self.position,
-- relative_offset: self.position,
-- length: min(self.length - self.position, len),
- }
- }
-
-@@ -175,9 +130,9 @@ impl<'a> BitReader<'a> {
- let requested = output_bytes.len() as u64 * 8;
- if requested > self.remaining() {
- Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-- requested,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
-+ requested: requested,
- })
- } else {
- for byte in output_bytes.iter_mut() {
-@@ -266,10 +221,10 @@ impl<'a> BitReader<'a> {
- /// Skip arbitrary number of bits. However, you can skip at most to the end of the byte slice.
- pub fn skip(&mut self, bit_count: u64) -> Result<()> {
- let end_position = self.position + bit_count;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count,
- });
- }
-@@ -284,7 +239,8 @@ impl<'a> BitReader<'a> {
-
- /// Returns the number of bits not yet read from the underlying slice.
- pub fn remaining(&self) -> u64 {
-- self.length - self.position
-+ let total_bits = self.bytes.len() as u64 * 8;
-+ total_bits - self.position
- }
-
- /// Helper to make sure the "bit cursor" is exactly at the beginning of a byte, or at specific
-@@ -335,10 +291,10 @@ impl<'a> BitReader<'a> {
- }
- let start_position = self.position;
- let end_position = self.position + bit_count as u64;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count as u64,
- });
- }
-@@ -366,13 +322,8 @@ pub type Result<T> = result::Result<T, B
- pub enum BitReaderError {
- /// Requested more bits than there are left in the byte slice at the current position.
- NotEnoughData {
-- /// Current posititon in bits relative to the beginning of the reader.
- position: u64,
--
-- /// Total readable length in bits of the underlaying slice.
- length: u64,
--
-- /// Bits requested to be read.
- requested: u64,
- },
- /// Requested more bits than the returned variable can hold, for example more than 8 bits when
-diff -up firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/tests.rs
---- firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/tests.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -282,34 +282,3 @@ fn read_slice_too_much() {
- });
- assert_eq!(&output, &[0u8; 4]);
- }
--
--#[test]
--fn relative_reader() {
-- let bytes = &[
-- 0b0001_0010, 0b0011_0100,
-- ];
-- let mut reader = BitReader::new(bytes);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0001);
--
-- let mut relative_reader = reader.relative_reader();
--
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 16,
-- length: 16,
-- requested: 1
-- });
--
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(relative_reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 12,
-- length: 12,
-- requested: 1
-- });
--}
-diff -up firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json
---- firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"b79e2347297dee32b9483747ee3cf145bd60e8c9d14cc02929287dabde4685ff","README.md":"b90c7a163a0fbff29e2c049953968c8cbfe8aa616d7e36775f0a565761dcc671","src/avx2.rs":"b79f36e3a7442d241e3fdf2ec159866aea31b78883660a63cdc9b1a262f18d10","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"b0404c81988e4de8d8864437c512937d9e888c681ef4739ef2d5db1650bd8766","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"a274acd298a394c014096a8214a0dc1db7439d1e920bd2ad75707fadcc501e10","src/sse41.rs":"58e9e2ec97d266e9fb4cfa874f8cfcf5ee046911837824ceea4b99cd4007560b","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"648c10063fa1a16a961df45f194f50982bdf3d41d04586a48d2cc6d69e0252c1","README.md":"2253eba78d5af06642073c5dfd41253fb8be73d3a0e823bc3d7642c9d0ad0c6c","src/avx2.rs":"a97ec761e4e7f70ff6311f4c1e67cb5136ac66cfc51bc49525b81f9e23814d81","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"67723a3abc30dc7f3d488f434ced884b5ce962a807991c8f1cc9940df869c342","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"c47baa15b311bc95d49f3d189111fe45756fb7d623a1f48f0050ae591817aedf","src/sse41.rs":"7a644b1056b804ada9ddc7586552a4a5c769e576d610ffe7ec74065f7eaff491","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml
---- firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -13,12 +13,11 @@
- [package]
- edition = "2018"
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- authors = ["Jack O'Connor"]
- description = "a pure Rust BLAKE2b implementation with dynamic SIMD"
- documentation = "https://docs.rs/blake2b_simd"
- readme = "README.md"
--keywords = ["blake2b", "blake2bp", "blake2"]
- license = "MIT"
- repository = "https://github.com/oconnor663/blake2_simd"
- [dependencies.arrayref]
-@@ -34,4 +33,3 @@ version = "0.1.3"
- [features]
- default = ["std"]
- std = []
--uninline_portable = []
-diff -up firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/README.md
---- firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/README.md 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
-
- An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- [`blake2s_simd`](../blake2s).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -74,33 +74,32 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 32), _mm256_slli_epi64(x, 64 - 32))
-+ _mm256_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 24), _mm256_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm256_setr_epi8(
-+ 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10, 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13,
-+ 14, 15, 8, 9, 10,
-+ );
-+ _mm256_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 16), _mm256_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm256_setr_epi8(
-+ 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9, 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12,
-+ 13, 14, 15, 8, 9,
-+ );
-+ _mm256_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 63), _mm256_slli_epi64(x, 64 - 63))
-+ _mm256_or_si256(_mm256_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
- //!
- //! An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- //! [`blake2s_simd`](https://docs.rs/blake2s_simd).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -23,9 +23,7 @@ fn g(v: &mut [Word; 16], a: usize, b: us
- v[b] = (v[b] ^ v[c]).rotate_right(63);
- }
-
--// This is too much inlining for some small chips like ARM Cortex-M0, so the
--// uninline_portable feature is provided to disable it.
--#[cfg_attr(not(feature = "uninline_portable"), inline(always))]
-+#[inline(always)]
- fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
- // Select the message schedule based on the round.
- let s = SIGMA[r];
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -70,33 +70,26 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 32), _mm_slli_epi64(x, 64 - 32))
-+ _mm_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 24), _mm_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm_setr_epi8(3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10);
-+ _mm_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 16), _mm_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm_setr_epi8(2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9);
-+ _mm_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 63), _mm_slli_epi64(x, 64 - 63))
-+ _mm_or_si128(_mm_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"31820be449d15a59a3fd124c89c5c5108bd8934fbd1c11d8d31cca3f9b082aee","Cargo.toml":"9a34d33f35a8271f6fed49f54b096ed9dcf80dd899f60205cf58962529abb4b9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"9a3b4407bab9fdf0f4a2acf5c2d3876f4c78fd25f1b8159462f07343a234fc8e","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"a0dcc1b5691e4a445f35fe84be46a938515dfdca1651396b880682547ae91292","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"d8d997589a7449f14cdd21fb85583f6c94eb0d3ea2c832d3c4c570e92a0a5cdd","src/lib.rs":"835cbcfa2ac45d9d8d40a13258922419027f60c9481e2cbc1b22690edea2f481"},"package":"a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"fb807cac318c99faa6fe40bcb6ddefd867c2048b9f2badd813281ddc808191b8","Cargo.toml":"74ed9ce9af6ed0be99c388989ab7e919ca1272fdd7e8a0d223506c790a74f1d5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"84d13918b74c4175683118042305b0a4ff90333da9abf214bcf46d9b546ae319","README.tpl":"ec385000e14590a306855e7893daed0168102f33166bdc1e5cf5fa5599dac03f","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"d18d363677a97a73225cb5c5b90e6187f7b5aae93979a41e40417fdd5a3f9975","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"8f445224c914c7a4f532636798f2b6ac254e650aa58aa57bd61aee1003d7f6af","src/lib.rs":"05bee63bd4bbfcf09a31b6511b5ec3f56ea1e973d079b398ff15d77be9a13d4a"},"package":"8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/Cargo.toml
---- firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -12,7 +12,7 @@
- [package]
- edition = "2018"
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- authors = ["Nick Fitzgerald <fitzgen(a)gmail.com>"]
- exclude = ["/.github/*", "/benches", "/tests", "valgrind.supp", "bumpalo.png"]
- description = "A fast bump allocation arena for Rust."
-diff -up firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md
---- firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -28,30 +28,6 @@ Released YYYY-MM-DD.
-
- --------------------------------------------------------------------------------
-
--## 3.9.1
--
--Released 2022-01-06.
--
--### Fixed
--
--* Fixed link to logo in docs and README.md
--
----------------------------------------------------------------------------------
--
--## 3.9.0
--
--Released 2022-01-05.
--
--### Changed
--
--* The minimum supported Rust version (MSRV) has been raised to Rust 1.54.0.
--
--* `bumpalo::collections::Vec<T>` implements relevant traits for all arrays of
-- any size `N` via const generics. Previously, it was just arrays up to length
-- 32. Similar for `bumpalo::boxed::Box<[T; N]>`.
--
----------------------------------------------------------------------------------
--
- ## 3.8.0
-
- Released 2021-10-19.
-diff -up firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.md
---- firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,5 +1,6 @@
- # `bumpalo`
-
-+
- **A fast bump allocation arena for Rust.**
-
- [![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-@@ -7,7 +8,7 @@
- [![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
- [![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-
--![](https://github.com/fitzgen/bumpalo/raw/main/bumpalo.png)
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-
- ### Bump Allocation
-
-@@ -32,12 +33,11 @@ pointer back to the start of the arena's
- deallocation *extremely* fast, but allocated objects' `Drop` implementations are
- not invoked.
-
--> **However:** [`bumpalo::boxed::Box<T>`][box] can be used to wrap
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
- > `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
- > implementation when the `Box<T>` wrapper goes out of scope. This is similar to
- > how [`std::boxed::Box`] works, except without deallocating its backing memory.
-
--[box]: https://docs.rs/bumpalo/latest/bumpalo/boxed/struct.Box.html
- [`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-
- ### What happens when the memory chunk is full?
-@@ -80,22 +80,19 @@ collection types are modified to allocat
- arenas.
-
- ```rust
--#[cfg(feature = "collections")]
--{
-- use bumpalo::{Bump, collections::Vec};
--
-- // Create a new bump arena.
-- let bump = Bump::new();
--
-- // Create a vector of integers whose storage is backed by the bump arena. The
-- // vector cannot outlive its backing arena, and this property is enforced with
-- // Rust's lifetime rules.
-- let mut v = Vec::new_in(&bump);
--
-- // Push a bunch of integers onto `v`!
-- for i in 0..100 {
-- v.push(i);
-- }
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
- }
- ```
-
-@@ -117,36 +114,33 @@ can use this to work around the fact tha
- in its space itself.
-
- ```rust
--#[cfg(feature = "boxed")]
--{
-- use bumpalo::{Bump, boxed::Box};
-- use std::sync::atomic::{AtomicUsize, Ordering};
--
-- static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
--
-- struct CountDrops;
--
-- impl Drop for CountDrops {
-- fn drop(&mut self) {
-- NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-- }
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
- }
-+}
-
-- // Create a new bump arena.
-- let bump = Bump::new();
-+// Create a new bump arena.
-+let bump = Bump::new();
-
-- // Create a `CountDrops` inside the bump arena.
-- let mut c = Box::new_in(CountDrops, &bump);
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-
-- // No `CountDrops` have been dropped yet.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-
-- // Drop our `Box<CountDrops>`.
-- drop(c);
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-
-- // Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
--}
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
- ```
-
- ### `#![no_std]` Support
-@@ -180,14 +174,14 @@ bumpalo = { version = "3.4.0", features
-
- Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- ```
-
- Finally, use `std` collections with `Bump`, so that their internal heap
- allocations are made within the given bump arena:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- use bumpalo::Bump;
-
-@@ -203,8 +197,9 @@ v.push(2);
-
- #### Minimum Supported Rust Version (MSRV)
-
--This crate is guaranteed to compile on stable Rust **1.54** and up. It might
--compile with older versions but that may change in any new patch release.
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-
- We reserve the right to increment the MSRV on minor releases, however we will strive
- to only do it deliberately and for good reasons.
-+
-diff -up firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.tpl
---- firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 2022-03-16 09:33:31.992159860 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.tpl 2022-03-16 09:33:31.992159860 +0100
-@@ -0,0 +1,3 @@
-+# `{{crate}}`
-+
-+{{readme}}
-diff -up firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/boxed.rs
---- firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/boxed.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -647,25 +647,39 @@ impl<'a, F: ?Sized + Future + Unpin> Fut
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> From<Box<'a, [T; N]>> for Box<'a, [T]> {
-- fn from(mut arr: Box<'a, [T; N]>) -> Box<'a, [T]> {
-- let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), N);
-- mem::forget(arr);
-- unsafe { Box::from_raw(ptr) }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> From<Box<'a, [T; $N]>> for Box<'a, [T]> {
-+ fn from(mut arr: Box<'a, [T; $N]>) -> Box<'a, [T]> {
-+ let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), $N);
-+ mem::forget(arr);
-+ unsafe { Box::from_raw(ptr) }
-+ }
-+ }
-+
-+
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> TryFrom<Box<'a, [T]>> for Box<'a, [T; $N]> {
-+ type Error = Box<'a, [T]>;
-+ fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; $N]>, Box<'a, [T]>> {
-+ if slice.len() == $N {
-+ let ptr = slice.as_mut_ptr() as *mut [T; $N];
-+ mem::forget(slice);
-+ Ok(unsafe { Box::from_raw(ptr) })
-+ } else {
-+ Err(slice)
-+ }
-+ }
-+ }
-+ )+
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> TryFrom<Box<'a, [T]>> for Box<'a, [T; N]> {
-- type Error = Box<'a, [T]>;
-- fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; N]>, Box<'a, [T]>> {
-- if slice.len() == N {
-- let ptr = slice.as_mut_ptr() as *mut [T; N];
-- mem::forget(slice);
-- Ok(unsafe { Box::from_raw(ptr) })
-- } else {
-- Err(slice)
-- }
-- }
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
- }
-diff -up firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs
---- firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1983,23 +1983,26 @@ __impl_slice_eq1! { Vec<'a, A>, &'b [B]
- __impl_slice_eq1! { Vec<'a, A>, &'b mut [B] }
- // __impl_slice_eq1! { Cow<'a, [A]>, Vec<'b, B>, Clone }
-
--macro_rules! __impl_slice_eq1_array {
-- ($Lhs: ty, $Rhs: ty) => {
-- impl<'a, 'b, A, B, const N: usize> PartialEq<$Rhs> for $Lhs
-- where
-- A: PartialEq<B>,
-- {
-- #[inline]
-- fn eq(&self, other: &$Rhs) -> bool {
-- self[..] == other[..]
-- }
-- }
-- };
--}
--
--__impl_slice_eq1_array! { Vec<'a, A>, [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b mut [B; N] }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ // NOTE: some less important impls are omitted to reduce code bloat
-+ __impl_slice_eq1! { Vec<'a, A>, [B; $N] }
-+ __impl_slice_eq1! { Vec<'a, A>, &'b [B; $N] }
-+ // __impl_slice_eq1! { Vec<A>, &'b mut [B; $N] }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b mut [B; $N], Clone }
-+ )+
-+ }
-+}
-+
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
-+}
-
- /// Implements comparison of vectors, lexicographically.
- impl<'bump, T: 'bump + PartialOrd> PartialOrd for Vec<'bump, T> {
-@@ -2070,18 +2073,6 @@ impl<'bump, T: 'bump> BorrowMut<[T]> for
- }
- }
-
--impl<'bump, T> Drop for Vec<'bump, T> {
-- fn drop(&mut self) {
-- unsafe {
-- // use drop for [T]
-- // use a raw slice to refer to the elements of the vector as weakest necessary type;
-- // could avoid questions of validity in certain cases
-- ptr::drop_in_place(ptr::slice_from_raw_parts_mut(self.as_mut_ptr(), self.len))
-- }
-- // RawVec handles deallocation
-- }
--}
--
- ////////////////////////////////////////////////////////////////////////////////
- // Clone-on-write
- ////////////////////////////////////////////////////////////////////////////////
-diff -up firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/lib.rs
---- firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/lib.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1,4 +1,222 @@
--#![doc = include_str!("../README.md")]
-+/*!
-+
-+**A fast bump allocation arena for Rust.**
-+
-+[![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-+[![](https://img.shields.io/crates/v/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-+
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-+
-+## Bump Allocation
-+
-+Bump allocation is a fast, but limited approach to allocation. We have a chunk
-+of memory, and we maintain a pointer within that memory. Whenever we allocate an
-+object, we do a quick test that we have enough capacity left in our chunk to
-+allocate the object and then update the pointer by the object's size. *That's
-+it!*
-+
-+The disadvantage of bump allocation is that there is no general way to
-+deallocate individual objects or reclaim the memory region for a
-+no-longer-in-use object.
-+
-+These trade offs make bump allocation well-suited for *phase-oriented*
-+allocations. That is, a group of objects that will all be allocated during the
-+same program phase, used, and then can all be deallocated together as a group.
-+
-+## Deallocation en Masse, but No `Drop`
-+
-+To deallocate all the objects in the arena at once, we can simply reset the bump
-+pointer back to the start of the arena's memory chunk. This makes mass
-+deallocation *extremely* fast, but allocated objects' `Drop` implementations are
-+not invoked.
-+
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
-+> `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
-+> implementation when the `Box<T>` wrapper goes out of scope. This is similar to
-+> how [`std::boxed::Box`] works, except without deallocating its backing memory.
-+
-+[`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-+
-+## What happens when the memory chunk is full?
-+
-+This implementation will allocate a new memory chunk from the global allocator
-+and then start bump allocating into this new memory chunk.
-+
-+## Example
-+
-+```
-+use bumpalo::Bump;
-+use std::u64;
-+
-+struct Doggo {
-+ cuteness: u64,
-+ age: u8,
-+ scritches_required: bool,
-+}
-+
-+// Create a new arena to bump allocate into.
-+let bump = Bump::new();
-+
-+// Allocate values into the arena.
-+let scooter = bump.alloc(Doggo {
-+ cuteness: u64::max_value(),
-+ age: 8,
-+ scritches_required: true,
-+});
-+
-+// Exclusive, mutable references to the just-allocated value are returned.
-+assert!(scooter.scritches_required);
-+scooter.age += 1;
-+```
-+
-+## Collections
-+
-+When the `"collections"` cargo feature is enabled, a fork of some of the `std`
-+library's collections are available in the `collections` module. These
-+collection types are modified to allocate their space inside `bumpalo::Bump`
-+arenas.
-+
-+```rust
-+# #[cfg(feature = "collections")]
-+# {
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
-+}
-+# }
-+```
-+
-+Eventually [all `std` collection types will be parameterized by an
-+allocator](https://github.com/rust-lang/rust/issues/42774) and we can remove
-+this `collections` module and use the `std` versions.
-+
-+For unstable, nightly-only support for custom allocators in `std`, see the
-+`allocator_api` section below.
-+
-+## `bumpalo::boxed::Box`
-+
-+When the `"boxed"` cargo feature is enabled, a fork of `std::boxed::Box` library
-+is available in the `boxed` module. This `Box` type is modified to allocate its
-+space inside `bumpalo::Bump` arenas.
-+
-+**A `Box<T>` runs `T`'s drop implementation when the `Box<T>` is dropped.** You
-+can use this to work around the fact that `Bump` does not drop values allocated
-+in its space itself.
-+
-+```rust
-+# #[cfg(feature = "boxed")]
-+# {
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-+ }
-+}
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-+
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-+
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
-+# }
-+```
-+
-+## `#![no_std]` Support
-+
-+Bumpalo is a `no_std` crate. It depends only on the `alloc` and `core` crates.
-+
-+## Thread support
-+
-+The `Bump` is `!Sync`, which makes it hard to use in certain situations around threads ‒ for
-+example in `rayon`.
-+
-+The [`bumpalo-herd`](https://crates.io/crates/bumpalo-herd) crate provides a pool of `Bump`
-+allocators for use in such situations.
-+
-+## Nightly Rust `feature(allocator_api)` Support
-+
-+The unstable, nightly-only Rust `allocator_api` feature defines an `Allocator`
-+trait and exposes custom allocators for `std` types. Bumpalo has a matching
-+`allocator_api` cargo feature to enable implementing `Allocator` and using
-+`Bump` with `std` collections. Note that, as `feature(allocator_api)` is
-+unstable and only in nightly Rust, Bumpalo's matching `allocator_api` cargo
-+feature should be considered unstable, and will not follow the semver
-+conventions that the rest of the crate does.
-+
-+First, enable the `allocator_api` feature in your `Cargo.toml`:
-+
-+```toml
-+[dependencies]
-+bumpalo = { version = "3.4.0", features = ["allocator_api"] }
-+```
-+
-+Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-+
-+```rust
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+# }
-+```
-+
-+Finally, use `std` collections with `Bump`, so that their internal heap
-+allocations are made within the given bump arena:
-+
-+```
-+# #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+use bumpalo::Bump;
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `Vec` whose elements are allocated within the bump arena.
-+let mut v = Vec::new_in(&bump);
-+v.push(0);
-+v.push(1);
-+v.push(2);
-+# }
-+```
-+
-+### Minimum Supported Rust Version (MSRV)
-+
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-+
-+We reserve the right to increment the MSRV on minor releases, however we will strive
-+to only do it deliberately and for good reasons.
-+
-+ */
-+
- #![deny(missing_debug_implementations)]
- #![deny(missing_docs)]
- #![no_std]
-@@ -202,7 +420,7 @@ impl<E: Display> Display for AllocOrInit
- ///
- /// Even when optimizations are on, these functions do not **guarantee** that
- /// the value is constructed on the heap. To the best of our knowledge no such
--/// guarantee can be made in stable Rust as of 1.51.
-+/// guarantee can be made in stable Rust as of 1.44.
- ///
- /// ### Fallible Initialization: The `_try_with` Method Suffix
- ///
-diff -up firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json
---- firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"01efe9c9a75e5a305dac0e12676ed451f746049a825aa86acef0d8ee90742f71","Cargo.toml":"ea55c73cacac2dcc3bdcb2c657e057d9b73214e76f8654799236b13c853e97bd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"61d450a57f8699dfc1c39e3bb69236f7d10f31f4503b03aa8b2b37b2448b8b69","src/lib.rs":"4bcb45fe37cdca78ba0e403d9e531102c521ad42e9ffd2ecbb154b4509864978","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"50d6fbb00aa801cffefd2ecbbb43bba8686925658b3bf5e304b5af735f90bf08","Cargo.toml":"7ff90cd0fd3bc7449b8f55dea7de4d7d51f7c11948119512a274369733a94321","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"106c91d873d7c2681ca6264195737d7f2ea73f91cc74dd4c200f3fe9c5ea4907","src/lib.rs":"d2b1a7280c5cb8c1e946a5839862a1496749c445851f7ed196debf8386a4e646","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/Cargo.toml
---- firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -3,20 +3,23 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- authors = ["Stjepan Glavina <stjepang(a)gmail.com>"]
- description = "Prevent false sharing by padding and aligning to the length of a cache line"
--homepage = "https://github.com/smol-rs/cache-padded"
-+homepage = "https://github.com/stjepang/cache-padded"
-+documentation = "https://docs.rs/cache-padded"
-+readme = "README.md"
- keywords = ["cache", "padding", "lock-free", "atomic"]
- categories = ["concurrency", "no-std"]
- license = "Apache-2.0 OR MIT"
--repository = "https://github.com/smol-rs/cache-padded"
-+repository = "https://github.com/stjepang/cache-padded"
-diff -up firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md
---- firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,7 +1,3 @@
--# Version 1.2.0
--
--- Improve implementation of `CachePadded`.
--
- # Version 1.1.1
-
- - Forbid unsafe code.
-diff -up firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/README.md
---- firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,9 +1,9 @@
- # cache-padded
-
--[![Build](https://github.com/smol-rs/cache-padded/workflows/Build%20and%20test/badge.svg)](
--https://github.com/smol-rs/cache-padded/actions)
--[![License](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg)](
--https://github.com/smol-rs/cache-padded)
-+[![Build](https://github.com/stjepang/cache-padded/workflows/Build%20and%20test/badge.svg)](
-+https://github.com/stjepang/cache-padded/actions)
-+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
-+https://github.com/stjepang/cache-padded)
- [![Cargo](https://img.shields.io/crates/v/cache-padded.svg)](
- https://crates.io/crates/cache-padded)
- [![Documentation](https://docs.rs/cache-padded/badge.svg)](
-diff -up firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/src/lib.rs
---- firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/src/lib.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,7 @@
- //! Prevent false sharing by padding and aligning to the length of a cache line.
- //!
- //! In concurrent programming, sometimes it is desirable to make sure commonly accessed shared data
--//! is not all placed into the same cache line. Updating an atomic value invalidates the whole cache
-+//! is not all placed into the same cache line. Updating an atomic value invalides the whole cache
- //! line it belongs to, which makes the next access to the same cache line slower for other CPU
- //! cores. Use [`CachePadded`] to ensure updating one piece of data doesn't invalidate other cached
- //! data.
-@@ -10,9 +10,8 @@
- //!
- //! Cache lines are assumed to be N bytes long, depending on the architecture:
- //!
--//! * On x86-64, aarch64, and powerpc64, N = 128.
--//! * On arm, mips, mips64, and riscv64, N = 32.
--//! * On s390x, N = 256.
-+//! * On x86-64 and aarch64, N = 128.
-+//! * On all others, N = 64.
- //!
- //! Note that N is just a reasonable guess and is not guaranteed to match the actual cache line
- //! length of the machine the program is running on.
-@@ -68,63 +67,14 @@ use core::ops::{Deref, DerefMut};
- // - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-i...
- // - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73b...
- //
--// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache line size.
-+// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache lines.
- //
- // Sources:
- // - https://www.mono-project.com/news/2016/09/12/arm64-icache/
- //
--// powerpc64 has 128-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- ),
-- repr(align(128))
--)]
--// arm, mips, mips64, and riscv64 have 32-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- ),
-- repr(align(32))
--)]
--// s390x has 256-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(target_arch = "s390x", repr(align(256)))]
--// x86 and wasm have 64-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a90723...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--//
--// All others are assumed to have 64-byte cache line size.
-+#[cfg_attr(any(target_arch = "x86_64", target_arch = "aarch64"), repr(align(128)))]
- #[cfg_attr(
-- not(any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- target_arch = "s390x",
-- )),
-+ not(any(target_arch = "x86_64", target_arch = "aarch64")),
- repr(align(64))
- )]
- #[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -13,7 +13,7 @@ mod unbounded {
-
- #[bench]
- fn create(b: &mut Bencher) {
-- b.iter(unbounded::<i32>);
-+ b.iter(|| unbounded::<i32>());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json 2022-03-16 09:33:31.993159893 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"e70d1a5fa6697a8b24e193e3934975317df12279c167b90fcb9616291792197c","Cargo.lock":"0f4e59f28bdd52c4781d102fc7d1f16d1ea417aaec0a4846432444a4019b2537","Cargo.toml":"c8334f658b699a1a0e25d997d752a9493a627f9ddcb7aab739c7319ea583882f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"96cb1abd23cac3ef8a7174a802e94609926b555bb02c9658c78723d433f1dd92","examples/fibonacci.rs":"4e88fa40048cdc31e9c7bb60347d46f92543d7ddf39cab3b52bfe44affdb6a02","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"d02121258f08d56f1eb7997e19bcb9bacb6836cfa0abbba90a9e59d8a50ae5cf","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ff4d39639ddf16aaab582d4a5f3d10ef2c71afe1abbf4e60f3d9d2ddbd72c230","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"853c2ad068f912cfb49877bcd41e241f34b25026b709bf0629523f19952e3adc","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"012a53f56b86df22ce49866da95e5f457fb99a18a098f0f64779c6d1cdd7092f","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"66eb10a6cbdf8dd0869f2a7cac9992fdaee36c9e2a01d708d39d7c794572935b","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"591ee70bf62ccad5aa2fac7b92d444183b02790a79c024f016c78de2396d08a3","tests/after.rs":"0154a8e152880db17a20514ecdd49dabc361d3629858d119b9746b5e932c780c","tests/array.rs":"e5f25e8991863a9a86d61a66be646d04feae527f35b1697fd215b97af4383736","tests/golang.rs":"dc85669c9c4e902b1bb263d00f5cb6f9ecb6d42b19fe53425b55ce97c887da49","tests/iter.rs":"25dc02135bbae9d47a30f9047661648e66bdc134e40ba78bc2fbacbb8b3819bc","tests/list.rs":"de865ef097f3bcb35c1c814554e6108fed43b3dbb1533c8bbcf8688cceb6b6ab","tests/mpsc.rs":"401aa3c6923815058881ddce98070df68ebab283913c89c007436bb8af7ca0ea","tests/never.rs":"ee40c4fc4dd5af4983fae8de6927f52b81174d222c162f745b26c4a6c7108e4f","tests/ready.rs":"d349702f123925a0781b48d677e6dcf64fc5d1fc788a7bf1e151a3d57e81871c","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"d20259a45f387cbce80c2c876ae81ea3883f36ea01c5151c159d58c362f6ba07","tests/select_macro.rs":"d3af2dc98e0dd03dc4ffab464b8ccb2f8b7504e8bb830948a04c015b92f0b296","tests/thread_locals.rs":"a1ce59e2aff69161621c0cb215eb6ea238088c06a31a8507a74cf179fd5a4299","tests/tick.rs":"5f697bd14c48505d932e82065b5302ef668e1cc19cac18e8ac22e0c83c221c1d","tests/zero.rs":"afbd838001d4196daddf17133e60ccea31529cc48ee01e245ac0d6366d1e30b9"},"package":"e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"74ac49b84461217698d4430f81b1cdcba0595bc4e57216ffc52b8296ac44cd41","Cargo.lock":"7956079bcac40cc40c894f0260266365ecdb1c01c48636ae4c4080977603e7b8","Cargo.toml":"6a7acaffaa30dab2b5ea1f5ab86b20bc97370314ed03472288745b3b969786dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"f5720508d3458f2451271b9887f7557823304bd38288c928b0d6aa1f459865e5","examples/fibonacci.rs":"6a26ecd74c7493d2c93f4280c0804afc19adc612b77b3d9fea433119ff472a44","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"f9a00477b41823199e4af06bddeb0c6cfd22e272340eec1b98b333fc59ee6a1f","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ad24cabfc50dd5e6ae84aa46a0246da12da1f1a6fa19043244ad25136075c6ca","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"c125146771265058ac320226456b1e21667e93649531a3d20157f71cd715881d","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"1bda0c5483b04d53f36f9f4a6fe6f87b69f698068771e637e224c09400c6ce83","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"4eb4b1988c5dffff3e3d2138d14a1b86613bf62b78c45a5c70f65aaee92c11bb","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"9058cc441d467539c439ef88f0be1a187bf122d26fc116ce3e3a0265a693761f","tests/after.rs":"324c7d773f72bef62d150171f74ba7b7ac1b06f6030b3d4d2b1a35d211956b21","tests/array.rs":"574bff53aff0b0a8c365bf3f9ad77bb64675df9e6e0714be9c16eeeeac22e4d5","tests/golang.rs":"ec03806945fecd381cfce0634e2d776741423589c92e1bd4d8a431ac20f5d2d0","tests/iter.rs":"7563dc7fdf4c63e31dd74ee3fedecdd3aed490f7ef599b98f6f75f929cf79edb","tests/list.rs":"cc2971e69fd7f6a94b5463c9d4e9079df7955b37552e16dd66f4c6e65db60d96","tests/mpsc.rs":"0c4c6b056f5cec77ca19eca45f99b083632700a4b67133e88071a1d22a61d6fe","tests/never.rs":"665441a9fb004f7cd44047619637ebe6766cf2faf58e68e6481397bbfc682e11","tests/ready.rs":"eae3d7f16e817e63f3a6ceda062fece3de5e11c7a9631b32b02f23396a9d59c1","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"3603f450b23f5e0d1e4014a167a9b23ab149b5f418c8b89636f1c02c90501569","tests/select_macro.rs":"00dd7963f79b96abf30851fdab29e86c8424b502a8a7d34abf4bc1714f493ecf","tests/thread_locals.rs":"3611db5502e6af0a8d15187d09fd195381819795544208b946e9f99b04579a81","tests/tick.rs":"dc4a7d3c8dd888ce135fe8a8c67f5dc8b5ab0c3fa57a48459f96d51fa0f1e6d5","tests/zero.rs":"0ff0587cc74569bfe389e0c619217799a960a0dfc5e6354603c88e6eea1b79a1"},"package":"06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock 2022-03-16 09:33:31.993159893 +0100
-@@ -3,6 +3,12 @@
- version = 3
-
- [[package]]
-+name = "autocfg"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-+
-+[[package]]
- name = "cfg-if"
- version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10,7 +16,7 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- dependencies = [
- "cfg-if",
- "crossbeam-utils",
-@@ -21,19 +27,20 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
- dependencies = [
-+ "autocfg",
- "cfg-if",
- "lazy_static",
- ]
-
- [[package]]
- name = "getrandom"
--version = "0.2.3"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
- dependencies = [
- "cfg-if",
- "libc",
-@@ -42,9 +49,9 @@ dependencies = [
-
- [[package]]
- name = "hermit-abi"
--version = "0.1.19"
-+version = "0.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
- dependencies = [
- "libc",
- ]
-@@ -57,15 +64,15 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
-
- [[package]]
- name = "num_cpus"
--version = "1.13.1"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
- dependencies = [
- "hermit-abi",
- "libc",
-@@ -73,15 +80,15 @@ dependencies = [
-
- [[package]]
- name = "ppv-lite86"
--version = "0.2.16"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -91,9 +98,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -101,27 +108,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
- name = "signal-hook"
--version = "0.3.13"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
-+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
- dependencies = [
- "libc",
- "signal-hook-registry",
-@@ -129,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "signal-hook-registry"
--version = "1.4.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
- dependencies = [
- "libc",
- ]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml 2022-03-16 09:33:31.993159893 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
-+authors = ["The Crossbeam Project Developers"]
- description = "Multi-producer multi-consumer channels for message passing"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
-+documentation = "https://docs.rs/crossbeam-channel"
- keywords = ["channel", "mpmc", "select", "golang", "message"]
- categories = ["algorithms", "concurrency", "data-structures"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,3 @@
--# Version 0.5.2
--
--- Fix stacked borrows violations. (#763, #764)
--
- # Version 0.5.1
-
- - Fix memory leak in unbounded channel. (#669)
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@ fn fibonacci(sender: Sender<u64>) {
- while sender.send(x).is_ok() {
- let tmp = x;
- x = y;
-- y += tmp;
-+ y = tmp + y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -33,7 +33,11 @@ fn main() {
-
- // Prints the elapsed time.
- fn show(dur: Duration) {
-- println!("Elapsed: {}.{:03} sec", dur.as_secs(), dur.subsec_millis());
-+ println!(
-+ "Elapsed: {}.{:03} sec",
-+ dur.as_secs(),
-+ dur.subsec_nanos() / 1_000_000
-+ );
- }
-
- let start = Instant::now();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,8 +1,7 @@
- //! Thread-local context used in select.
-
- use std::cell::Cell;
--use std::ptr;
--use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
-+use std::sync::atomic::{AtomicUsize, Ordering};
- use std::sync::Arc;
- use std::thread::{self, Thread, ThreadId};
- use std::time::Instant;
-@@ -12,7 +11,6 @@ use crossbeam_utils::Backoff;
- use crate::select::Selected;
-
- /// Thread-local context used in select.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Clone)]
- pub struct Context {
- inner: Arc<Inner>,
-@@ -25,7 +23,7 @@ struct Inner {
- select: AtomicUsize,
-
- /// A slot into which another thread may store a pointer to its `Packet`.
-- packet: AtomicPtr<()>,
-+ packet: AtomicUsize,
-
- /// Thread handle.
- thread: Thread,
-@@ -47,7 +45,7 @@ impl Context {
- }
-
- let mut f = Some(f);
-- let mut f = |cx: &Context| -> R {
-+ let mut f = move |cx: &Context| -> R {
- let f = f.take().unwrap();
- f(cx)
- };
-@@ -71,7 +69,7 @@ impl Context {
- Context {
- inner: Arc::new(Inner {
- select: AtomicUsize::new(Selected::Waiting.into()),
-- packet: AtomicPtr::new(ptr::null_mut()),
-+ packet: AtomicUsize::new(0),
- thread: thread::current(),
- thread_id: thread::current().id(),
- }),
-@@ -84,7 +82,7 @@ impl Context {
- self.inner
- .select
- .store(Selected::Waiting.into(), Ordering::Release);
-- self.inner.packet.store(ptr::null_mut(), Ordering::Release);
-+ self.inner.packet.store(0, Ordering::Release);
- }
-
- /// Attempts to select an operation.
-@@ -114,19 +112,19 @@ impl Context {
- ///
- /// This method must be called after `try_select` succeeds and there is a packet to provide.
- #[inline]
-- pub fn store_packet(&self, packet: *mut ()) {
-- if !packet.is_null() {
-+ pub fn store_packet(&self, packet: usize) {
-+ if packet != 0 {
- self.inner.packet.store(packet, Ordering::Release);
- }
- }
-
- /// Waits until a packet is provided and returns it.
- #[inline]
-- pub fn wait_packet(&self) -> *mut () {
-+ pub fn wait_packet(&self) -> usize {
- let backoff = Backoff::new();
- loop {
- let packet = self.inner.packet.load(Ordering::Acquire);
-- if !packet.is_null() {
-+ if packet != 0 {
- return packet;
- }
- backoff.snooze();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@
-
- use std::cell::UnsafeCell;
- use std::marker::PhantomData;
--use std::mem::MaybeUninit;
-+use std::mem::{self, MaybeUninit};
- use std::ptr;
- use std::sync::atomic::{self, AtomicUsize, Ordering};
- use std::time::Instant;
-@@ -110,7 +110,7 @@ impl<T> Channel<T> {
- // Allocate a buffer of `cap` slots initialized
- // with stamps.
- let buffer = {
-- let boxed: Box<[Slot<T>]> = (0..cap)
-+ let mut boxed: Box<[Slot<T>]> = (0..cap)
- .map(|i| {
- // Set the stamp to `{ lap: 0, mark: 0, index: i }`.
- Slot {
-@@ -119,7 +119,9 @@ impl<T> Channel<T> {
- }
- })
- .collect();
-- Box::into_raw(boxed) as *mut Slot<T>
-+ let ptr = boxed.as_mut_ptr();
-+ mem::forget(boxed);
-+ ptr
- };
-
- Channel {
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -6,7 +6,6 @@ use std::cell::UnsafeCell;
- use std::marker::PhantomData;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::time::Instant;
--use std::{fmt, ptr};
-
- use crossbeam_utils::Backoff;
-
-@@ -17,19 +16,7 @@ use crate::utils::Spinlock;
- use crate::waker::Waker;
-
- /// A pointer to a packet.
--pub struct ZeroToken(*mut ());
--
--impl Default for ZeroToken {
-- fn default() -> Self {
-- Self(ptr::null_mut())
-- }
--}
--
--impl fmt::Debug for ZeroToken {
-- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-- fmt::Debug::fmt(&(self.0 as usize), f)
-- }
--}
-+pub(crate) type ZeroToken = usize;
-
- /// A slot for passing one message from a sender to a receiver.
- struct Packet<T> {
-@@ -130,10 +117,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -143,11 +130,11 @@ impl<T> Channel<T> {
- /// Writes a message into the packet.
- pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(msg);
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
- packet.msg.get().write(Some(msg));
- packet.ready.store(true, Ordering::Release);
- Ok(())
-@@ -159,10 +146,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -172,11 +159,11 @@ impl<T> Channel<T> {
- /// Reads a message from the packet.
- pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(());
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
-
- if packet.on_stack {
- // The message has been in the packet from the beginning, so there is no need to wait
-@@ -190,7 +177,7 @@ impl<T> Channel<T> {
- // heap-allocated packet.
- packet.wait_ready();
- let msg = packet.msg.get().replace(None).unwrap();
-- drop(Box::from_raw(token.zero.0 as *mut Packet<T>));
-+ drop(Box::from_raw(packet as *const Packet<T> as *mut Packet<T>));
- Ok(msg)
- }
- }
-@@ -202,7 +189,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -226,7 +213,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -241,10 +228,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a receiver wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::message_on_stack(msg);
-+ let packet = Packet::<T>::message_on_stack(msg);
- inner
- .senders
-- .register_with_packet(oper, &mut packet as *mut Packet<T> as *mut (), cx);
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.receivers.notify();
- drop(inner);
-
-@@ -279,7 +266,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
- } else if inner.is_disconnected {
-@@ -296,7 +283,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- return self.read(token).map_err(|_| RecvTimeoutError::Disconnected);
-@@ -310,12 +297,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a sender wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::empty_on_stack();
-- inner.receivers.register_with_packet(
-- oper,
-- &mut packet as *mut Packet<T> as *mut (),
-- cx,
-- );
-+ let packet = Packet::<T>::empty_on_stack();
-+ inner
-+ .receivers
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.senders.notify();
- drop(inner);
-
-@@ -400,7 +385,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- let mut inner = self.0.inner.lock();
- inner
- .receivers
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.senders.notify();
- inner.senders.can_select() || inner.is_disconnected
- }
-@@ -414,7 +399,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-@@ -450,7 +435,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- let mut inner = self.0.inner.lock();
- inner
- .senders
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.receivers.notify();
- inner.receivers.can_select() || inner.is_disconnected
- }
-@@ -464,7 +449,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -19,7 +19,6 @@ use crate::utils;
- /// `read` or `write`.
- ///
- /// Each field contains data associated with a specific channel flavor.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Default)]
- pub struct Token {
- pub at: flavors::at::AtToken,
-@@ -94,7 +93,6 @@ impl Into<usize> for Selected {
- ///
- /// This is a handle that assists select in executing an operation, registration, deciding on the
- /// appropriate deadline for blocking, etc.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- pub trait SelectHandle {
- /// Attempts to select an operation and returns `true` on success.
- fn try_select(&self, token: &mut Token) -> bool;
-@@ -444,7 +442,6 @@ fn run_ready(
- }
-
- /// Attempts to select one of the operations without blocking.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn try_select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -461,7 +458,6 @@ pub fn try_select<'a>(
- }
-
- /// Blocks until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -480,7 +476,6 @@ pub fn select<'a>(
- }
-
- /// Blocks for a limited time until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select_timeout<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,6 +1,5 @@
- //! Waking mechanism for threads blocked on channel operations.
-
--use std::ptr;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::thread::{self, ThreadId};
-
-@@ -14,7 +13,7 @@ pub(crate) struct Entry {
- pub(crate) oper: Operation,
-
- /// Optional packet.
-- pub(crate) packet: *mut (),
-+ pub(crate) packet: usize,
-
- /// Context associated with the thread owning this operation.
- pub(crate) cx: Context,
-@@ -45,12 +44,12 @@ impl Waker {
- /// Registers a select operation.
- #[inline]
- pub(crate) fn register(&mut self, oper: Operation, cx: &Context) {
-- self.register_with_packet(oper, ptr::null_mut(), cx);
-+ self.register_with_packet(oper, 0, cx);
- }
-
- /// Registers a select operation and a packet.
- #[inline]
-- pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: *mut (), cx: &Context) {
-+ pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
- self.selectors.push(Entry {
- oper,
- packet,
-@@ -77,26 +76,34 @@ impl Waker {
- /// Attempts to find another thread's entry, select the operation, and wake it up.
- #[inline]
- pub(crate) fn try_select(&mut self) -> Option<Entry> {
-- self.selectors
-- .iter()
-- .position(|selector| {
-+ let mut entry = None;
-+
-+ if !self.selectors.is_empty() {
-+ let thread_id = current_thread_id();
-+
-+ for i in 0..self.selectors.len() {
- // Does the entry belong to a different thread?
-- selector.cx.thread_id() != current_thread_id()
-- && selector // Try selecting this operation.
-- .cx
-- .try_select(Selected::Operation(selector.oper))
-- .is_ok()
-- && {
-+ if self.selectors[i].cx.thread_id() != thread_id {
-+ // Try selecting this operation.
-+ let sel = Selected::Operation(self.selectors[i].oper);
-+ let res = self.selectors[i].cx.try_select(sel);
-+
-+ if res.is_ok() {
- // Provide the packet.
-- selector.cx.store_packet(selector.packet);
-+ self.selectors[i].cx.store_packet(self.selectors[i].packet);
- // Wake the thread up.
-- selector.cx.unpark();
-- true
-+ self.selectors[i].cx.unpark();
-+
-+ // Remove the entry from the queue to keep it clean and improve
-+ // performance.
-+ entry = Some(self.selectors.remove(i));
-+ break;
- }
-- })
-- // Remove the entry from the queue to keep it clean and improve
-- // performance.
-- .map(|pos| self.selectors.remove(pos))
-+ }
-+ }
-+ }
-+
-+ entry
- }
-
- /// Returns `true` if there is an entry which can be selected by the current thread.
-@@ -118,7 +125,7 @@ impl Waker {
- pub(crate) fn watch(&mut self, oper: Operation, cx: &Context) {
- self.observers.push(Entry {
- oper,
-- packet: ptr::null_mut(),
-+ packet: 0,
- cx: cx.clone(),
- });
- }
-@@ -262,7 +269,7 @@ impl SyncWaker {
- impl Drop for SyncWaker {
- #[inline]
- fn drop(&mut self) {
-- debug_assert!(self.is_empty.load(Ordering::SeqCst));
-+ debug_assert_eq!(self.is_empty.load(Ordering::SeqCst), true);
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the after channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -58,20 +56,20 @@ fn len_empty_full() {
- let r = after(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -213,7 +211,7 @@ fn select() {
- break;
- }
- i => {
-- oper.recv(v[i]).unwrap();
-+ oper.recv(&v[i]).unwrap();
- hits.fetch_add(1, Ordering::SeqCst);
- }
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the array channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::any::Any;
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
-@@ -45,38 +43,38 @@ fn len_empty_full() {
- let (s, r) = bounded(2);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 2);
-- assert!(!s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 2);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -9,8 +9,6 @@
- //! - https://golang.org/LICENSE
- //! - https://golang.org/PATENTS
-
--#![allow(clippy::mutex_atomic, clippy::redundant_clone)]
--
- use std::alloc::{GlobalAlloc, Layout, System};
- use std::any::Any;
- use std::cell::Cell;
-@@ -178,7 +176,7 @@ unsafe impl GlobalAlloc for Counter {
- if !ret.is_null() {
- ALLOCATED.fetch_add(layout.size(), SeqCst);
- }
-- ret
-+ return ret;
- }
-
- unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-@@ -234,9 +232,6 @@ macro_rules! go {
- mod doubleselect {
- use super::*;
-
-- #[cfg(miri)]
-- const ITERATIONS: i32 = 100;
-- #[cfg(not(miri))]
- const ITERATIONS: i32 = 10_000;
-
- fn sender(n: i32, c1: Chan<i32>, c2: Chan<i32>, c3: Chan<i32>, c4: Chan<i32>) {
-@@ -696,11 +691,6 @@ mod select {
- mod select2 {
- use super::*;
-
-- #[cfg(miri)]
-- const N: i32 = 1000;
-- #[cfg(not(miri))]
-- const N: i32 = 100000;
--
- #[test]
- fn main() {
- fn sender(c: &Chan<i32>, n: i32) {
-@@ -712,7 +702,9 @@ mod select2 {
- fn receiver(c: &Chan<i32>, dummy: &Chan<i32>, n: i32) {
- for _ in 0..n {
- select! {
-- recv(c.rx()) -> _ => {}
-+ recv(c.rx()) -> _ => {
-+ ()
-+ }
- recv(dummy.rx()) -> _ => {
- panic!("dummy");
- }
-@@ -725,18 +717,15 @@ mod select2 {
-
- ALLOCATED.store(0, SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
- let alloc = ALLOCATED.load(SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
-- assert!(
-- !(ALLOCATED.load(SeqCst) > alloc
-- && (ALLOCATED.load(SeqCst) - alloc) > (N as usize + 10000))
-- )
-+ assert!(!(ALLOCATED.load(SeqCst) > alloc && (ALLOCATED.load(SeqCst) - alloc) > 110000))
- }
- }
-
-@@ -924,9 +913,6 @@ mod chan_test {
-
- #[test]
- fn test_chan() {
-- #[cfg(miri)]
-- const N: i32 = 20;
-- #[cfg(not(miri))]
- const N: i32 = 200;
-
- for cap in 0..N {
-@@ -1066,9 +1052,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_recv_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- for _ in 0..N {
-@@ -1090,9 +1073,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1126,9 +1106,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race2() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1165,11 +1142,6 @@ mod chan_test {
- // Ensure that send/recv on the same chan in select
- // does not crash nor deadlock.
-
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 1000;
--
- for &cap in &[0, 10] {
- let wg = WaitGroup::new();
- wg.add(2);
-@@ -1179,7 +1151,7 @@ mod chan_test {
- let p = p;
- go!(wg, p, c, {
- defer! { wg.done() }
-- for i in 0..N {
-+ for i in 0..1000 {
- if p == 0 || i % 2 == 0 {
- select! {
- send(c.tx(), p) -> _ => {}
-@@ -1208,11 +1180,6 @@ mod chan_test {
-
- #[test]
- fn test_select_stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let c = vec![
- make::<i32>(0),
- make::<i32>(0),
-@@ -1220,6 +1187,8 @@ mod chan_test {
- make::<i32>(3),
- ];
-
-+ const N: usize = 10000;
-+
- // There are 4 goroutines that send N values on each of the chans,
- // + 4 goroutines that receive N values on each of the chans,
- // + 1 goroutine that sends N values on each of the chans in a single select,
-@@ -1317,9 +1286,6 @@ mod chan_test {
-
- #[test]
- fn test_select_fairness() {
-- #[cfg(miri)]
-- const TRIALS: usize = 100;
-- #[cfg(not(miri))]
- const TRIALS: usize = 10000;
-
- let c1 = make::<u8>(TRIALS + 1);
-@@ -1403,9 +1369,6 @@ mod chan_test {
-
- #[test]
- fn test_pseudo_random_send() {
-- #[cfg(miri)]
-- const N: usize = 20;
-- #[cfg(not(miri))]
- const N: usize = 100;
-
- for cap in 0..N {
-@@ -1449,9 +1412,6 @@ mod chan_test {
- #[test]
- fn test_multi_consumer() {
- const NWORK: usize = 23;
-- #[cfg(miri)]
-- const NITER: usize = 100;
-- #[cfg(not(miri))]
- const NITER: usize = 271828;
-
- let pn = [2, 3, 7, 11, 13, 17, 19, 23, 27, 31];
-@@ -1550,9 +1510,6 @@ mod chan1 {
- use super::*;
-
- // sent messages
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
- // receiving "goroutines"
- const M: usize = 10;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -93,7 +93,7 @@ fn recv_into_iter_owned() {
-
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -106,5 +106,5 @@ fn recv_into_iter_borrowed() {
- let mut iter = (&r).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -41,29 +41,29 @@ fn len_empty_full() {
- let (s, r) = unbounded();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -239,9 +239,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = unbounded();
-@@ -264,9 +261,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -301,9 +295,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -319,9 +310,6 @@ fn stress_oneshot() {
-
- #[test]
- fn stress_iter() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (request_s, request_r) = unbounded();
-@@ -383,11 +371,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -401,7 +386,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..10_000);
- let additional = rng.gen_range(0..1000);
-
-@@ -436,9 +421,6 @@ fn drops() {
-
- #[test]
- fn linearizable() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -459,9 +441,6 @@ fn linearizable() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -484,9 +463,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = unbounded();
-@@ -520,9 +496,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -20,12 +20,6 @@
- //! - https://github.com/rust-lang/rust/blob/master/COPYRIGHT
- //! - https://www.rust-lang.org/en-US/legal.html
-
--#![allow(
-- clippy::drop_copy,
-- clippy::match_single_binding,
-- clippy::redundant_clone
--)]
--
- use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
- use std::sync::mpsc::{SendError, TrySendError};
- use std::thread::JoinHandle;
-@@ -182,7 +176,7 @@ macro_rules! select {
- ) => ({
- cc::crossbeam_channel_internal! {
- $(
-- $meth(($rx).inner) -> res => {
-+ recv(($rx).inner) -> res => {
- let $name = res.map_err(|_| ::std::sync::mpsc::RecvError);
- $code
- }
-@@ -320,18 +314,13 @@ mod channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
-- const COUNT: usize = 10000;
--
- let (tx, rx) = channel::<i32>();
- let t = thread::spawn(move || {
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().ok().unwrap();
-@@ -339,9 +328,6 @@ mod channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 500;
-- #[cfg(not(miri))]
- const AMT: u32 = 10000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = channel::<i32>();
-@@ -350,7 +336,10 @@ mod channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- });
-
- let mut ts = Vec::with_capacity(NTHREADS as usize);
-@@ -746,17 +735,12 @@ mod channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
- let (tx, rx) = channel();
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -896,7 +880,7 @@ mod channel_tests {
- };
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -908,7 +892,7 @@ mod channel_tests {
- let mut iter = (&rx).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -1095,18 +1079,13 @@ mod sync_channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..N {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().unwrap();
-@@ -1114,15 +1093,10 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_recv_timeout_two_threads() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
-
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-@@ -1139,15 +1113,12 @@ mod sync_channel_tests {
- }
- }
-
-- assert_eq!(recv_count, N);
-+ assert_eq!(recv_count, 10000);
- t.join().unwrap();
- }
-
- #[test]
- fn stress_recv_timeout_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1194,9 +1165,6 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1206,7 +1174,10 @@ mod sync_channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- dtx.send(()).unwrap();
- });
-
-@@ -1478,17 +1449,12 @@ mod sync_channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
-- let (tx, rx) = sync_channel(N);
-- for _ in 0..N {
-+ let (tx, rx) = sync_channel(10000);
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -1826,11 +1792,7 @@ mod select_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const AMT: i32 = 100;
-- #[cfg(not(miri))]
- const AMT: i32 = 10000;
--
- let (tx1, rx1) = channel::<i32>();
- let (tx2, rx2) = channel::<i32>();
- let (tx3, rx3) = channel::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -65,8 +65,8 @@ fn capacity() {
- fn len_empty_full() {
- let r = never::<i32>();
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel readiness using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -492,9 +490,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -532,9 +527,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -569,9 +561,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -677,9 +666,6 @@ fn send_recv_same_channel() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -736,9 +722,6 @@ fn channel_through_channel() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -784,9 +767,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s1, r1) = unbounded::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,6 @@
- //! Tests for the `select!` macro.
-
- #![forbid(unsafe_code)] // select! is safe.
--#![allow(clippy::drop_copy, clippy::match_single_binding)]
-
- use std::any::Any;
- use std::cell::Cell;
-@@ -284,7 +283,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -487,9 +485,6 @@ fn panic_receiver() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -523,9 +518,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -556,9 +548,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -692,9 +681,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -740,9 +726,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_default() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -787,9 +770,6 @@ fn linearizable_default() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -834,9 +814,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -861,9 +838,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -901,9 +875,6 @@ fn fairness2() {
-
- #[test]
- fn fairness_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -926,9 +897,6 @@ fn fairness_recv() {
-
- #[test]
- fn fairness_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, _r1) = bounded::<()>(COUNT);
-@@ -944,7 +912,6 @@ fn fairness_send() {
- assert!(hits.iter().all(|x| *x >= COUNT / 4));
- }
-
--#[allow(clippy::or_fun_call)] // This is intentional.
- #[test]
- fn references() {
- let (s, r) = unbounded::<i32>();
-@@ -991,7 +958,6 @@ fn case_blocks() {
- drop(s);
- }
-
--#[allow(clippy::redundant_closure_call)] // This is intentional.
- #[test]
- fn move_handles() {
- let (s, r) = unbounded::<i32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel selection using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -408,7 +406,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -693,9 +690,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -734,9 +728,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -772,9 +763,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -907,12 +895,12 @@ fn matching() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -933,12 +921,12 @@ fn matching_with_leftover() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -952,9 +940,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -1013,9 +998,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_try() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1068,9 +1050,6 @@ fn linearizable_try() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1123,9 +1102,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -1172,9 +1148,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -1239,8 +1212,8 @@ fn sync_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let sel = &sel;
-
- scope(|scope| {
-@@ -1249,8 +1222,8 @@ fn sync_and_clone() {
- let mut sel = sel.clone();
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1268,8 +1241,8 @@ fn send_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
-
- scope(|scope| {
- for i in 0..THREADS {
-@@ -1277,8 +1250,8 @@ fn send_and_clone() {
- scope.spawn(move |_| {
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1291,9 +1264,6 @@ fn send_and_clone() {
-
- #[test]
- fn reuse() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests that make sure accessing thread-locals while exiting the thread doesn't cause panics.
-
--#![cfg(not(miri))] // error: abnormal termination: the evaluated program aborted execution
--
- use std::thread;
- use std::time::Duration;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the tick channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -80,20 +78,20 @@ fn len_empty_full() {
- let r = tick(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -35,11 +35,11 @@ fn len_empty_full() {
- let (s, r) = bounded(0);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
-
- scope(|scope| {
- scope.spawn(|_| s.send(0).unwrap());
-@@ -48,11 +48,11 @@ fn len_empty_full() {
- .unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-@@ -187,9 +187,6 @@ fn send_timeout() {
-
- #[test]
- fn len() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
-
- let (s, r) = bounded(0);
-@@ -252,9 +249,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = bounded(0);
-@@ -277,9 +271,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -312,9 +303,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -328,7 +316,6 @@ fn stress_oneshot() {
- }
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn stress_iter() {
- const COUNT: usize = 1000;
-@@ -396,11 +383,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -414,7 +398,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..3_000);
-
- DROPS.store(0, Ordering::SeqCst);
-@@ -444,9 +428,6 @@ fn drops() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(0);
-@@ -478,9 +459,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = bounded::<()>(0);
-@@ -539,9 +517,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -8,7 +8,7 @@ use test::Bencher;
-
- #[bench]
- fn single_pin(b: &mut Bencher) {
-- b.iter(epoch::pin);
-+ b.iter(|| epoch::pin());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/build.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/build.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -4,19 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json 2022-03-16 09:33:31.995159961 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"40b65a13f12e97a24c838fe2254a3563a5fe00922053ef7256ed4752876614fa","Cargo.lock":"35b1db42b892c01e72ff1f99fc7767e5e47208d083203866337f6f2f7d0738eb","Cargo.toml":"eab75399db818408fd4f45a91919b08e050e56547014816683a269270e292055","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"80f9e65ba04a2ddec7a330172d0b0fbc698e20c221b3d8cdc70cc42e3b9099d1","build.rs":"c8684300062c73e96eae8877d03e145ee95e0cd99d4d933696caa582c08e2416","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic.rs":"631d3062e3c30d8e505fda3a7e2c68a88abf7617881035d6131c39cb8fdddce0","src/collector.rs":"7d636f3f96fafd033298d1c2ab126205438a46deb84895d8e28bea9eef67798a","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"1ee67bd3200d3891076aac8cfc9767abdddc194602f2084d11455484096005ea","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"f3f8131819b2a4ec4d1a6d392c734688324f3ae708bac6745e88f2930657eba1","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"262e0d8f343e97df9e2a738461e4255e339710e81c479e484f9efe517ae47135","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock 2022-03-16 09:33:31.995159961 +0100
-@@ -3,15 +3,6 @@
- version = 3
-
- [[package]]
--name = "ansi_term"
--version = "0.12.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
--dependencies = [
-- "winapi",
--]
--
--[[package]]
- name = "autocfg"
- version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -19,9 +10,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffe
-
- [[package]]
- name = "cc"
--version = "1.0.72"
-+version = "1.0.68"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
-
- [[package]]
- name = "cfg-if"
-@@ -31,13 +22,13 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "const_fn"
--version = "0.4.9"
-+version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- dependencies = [
- "cfg-if",
- "const_fn",
-@@ -51,9 +42,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if",
- "lazy_static",
-@@ -92,9 +83,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.95"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-
- [[package]]
- name = "log"
-@@ -107,76 +98,35 @@ dependencies = [
-
- [[package]]
- name = "loom"
--version = "0.5.4"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
-+checksum = "7aa5348dc45fa5f2419b6dd4ea20345e6b01b1fcc9d176a322eada1ac3f382ba"
- dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
-- "tracing",
-- "tracing-subscriber",
--]
--
--[[package]]
--name = "matchers"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
--dependencies = [
-- "regex-automata",
- ]
-
- [[package]]
- name = "memoffset"
--version = "0.6.5"
-+version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
- dependencies = [
- "autocfg",
- ]
-
- [[package]]
--name = "once_cell"
--version = "1.9.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
--
--[[package]]
--name = "pin-project-lite"
--version = "0.2.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
--
--[[package]]
- name = "ppv-lite86"
--version = "0.2.16"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
--
--[[package]]
--name = "proc-macro2"
--version = "1.0.36"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
--dependencies = [
-- "unicode-xid",
--]
--
--[[package]]
--name = "quote"
--version = "1.0.14"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
--dependencies = [
-- "proc-macro2",
--]
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -186,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -196,51 +146,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
--name = "regex"
--version = "1.5.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-automata"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-syntax"
--version = "0.6.25"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
--
--[[package]]
- name = "rustversion"
--version = "1.0.6"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-+checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
-
- [[package]]
- name = "scoped-tls"
-@@ -255,108 +181,6 @@ source = "registry+https://github.com/ru
- checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
- [[package]]
--name = "sharded-slab"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "smallvec"
--version = "1.7.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
--
--[[package]]
--name = "syn"
--version = "1.0.85"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "unicode-xid",
--]
--
--[[package]]
--name = "thread_local"
--version = "1.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
--dependencies = [
-- "once_cell",
--]
--
--[[package]]
--name = "tracing"
--version = "0.1.29"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
--dependencies = [
-- "cfg-if",
-- "pin-project-lite",
-- "tracing-attributes",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-attributes"
--version = "0.1.18"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn",
--]
--
--[[package]]
--name = "tracing-core"
--version = "0.1.21"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "tracing-log"
--version = "0.1.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
--dependencies = [
-- "lazy_static",
-- "log",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-subscriber"
--version = "0.3.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
--dependencies = [
-- "ansi_term",
-- "lazy_static",
-- "matchers",
-- "regex",
-- "sharded-slab",
-- "smallvec",
-- "thread_local",
-- "tracing",
-- "tracing-core",
-- "tracing-log",
--]
--
--[[package]]
--name = "unicode-xid"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
--
--[[package]]
- name = "wasi"
- version = "0.10.2+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml 2022-03-16 09:33:31.995159961 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Epoch-based garbage collection"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch"
-+documentation = "https://docs.rs/crossbeam-epoch"
- keywords = ["lock-free", "rcu", "atomic", "garbage"]
- categories = ["concurrency", "memory-management", "no-std"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md 2022-03-16 09:33:31.995159961 +0100
-@@ -1,16 +1,12 @@
--# Version 0.9.6
--
--- Add `Atomic::fetch_update`. (#706)
--
- # Version 0.9.5
-
--- Fix UB in `Pointable` impl of `[MaybeUninit<T>]`. (#694)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
--- Fix breakage with nightly feature due to rust-lang/rust#84510. (#692)
-+- Fix UB in `Pointable` impl of `[MaybeUninit<T>]` (#694)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-+- Fix breakage with nightly feature due to rust-lang/rust#84510 (#692)
-
- # Version 0.9.4
-
--- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation. (#690)
-+- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation (#690)
- - Bump `loom` dependency to version 0.5. (#686)
-
- # Version 0.9.3
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -562,65 +562,6 @@ impl<T: ?Sized + Pointable> Atomic<T> {
- })
- }
-
-- /// Fetches the pointer, and then applies a function to it that returns a new value.
-- /// Returns a `Result` of `Ok(previous_value)` if the function returned `Some`, else `Err(_)`.
-- ///
-- /// Note that the given function may be called multiple times if the value has been changed by
-- /// other threads in the meantime, as long as the function returns `Some(_)`, but the function
-- /// will have been applied only once to the stored value.
-- ///
-- /// `fetch_update` takes two [`Ordering`] arguments to describe the memory
-- /// ordering of this operation. The first describes the required ordering for
-- /// when the operation finally succeeds while the second describes the
-- /// required ordering for loads. These correspond to the success and failure
-- /// orderings of [`Atomic::compare_exchange`] respectively.
-- ///
-- /// Using [`Acquire`] as success ordering makes the store part of this
-- /// operation [`Relaxed`], and using [`Release`] makes the final successful
-- /// load [`Relaxed`]. The (failed) load ordering can only be [`SeqCst`],
-- /// [`Acquire`] or [`Relaxed`] and must be equivalent to or weaker than the
-- /// success ordering.
-- ///
-- /// [`Relaxed`]: Ordering::Relaxed
-- /// [`Acquire`]: Ordering::Acquire
-- /// [`Release`]: Ordering::Release
-- /// [`SeqCst`]: Ordering::SeqCst
-- ///
-- /// # Examples
-- ///
-- /// ```
-- /// use crossbeam_epoch::{self as epoch, Atomic};
-- /// use std::sync::atomic::Ordering::SeqCst;
-- ///
-- /// let a = Atomic::new(1234);
-- /// let guard = &epoch::pin();
-- ///
-- /// let res1 = a.fetch_update(SeqCst, SeqCst, guard, |x| Some(x.with_tag(1)));
-- /// assert!(res1.is_ok());
-- ///
-- /// let res2 = a.fetch_update(SeqCst, SeqCst, guard, |x| None);
-- /// assert!(res2.is_err());
-- /// ```
-- pub fn fetch_update<'g, F>(
-- &self,
-- set_order: Ordering,
-- fail_order: Ordering,
-- guard: &'g Guard,
-- mut func: F,
-- ) -> Result<Shared<'g, T>, Shared<'g, T>>
-- where
-- F: FnMut(Shared<'g, T>) -> Option<Shared<'g, T>>,
-- {
-- let mut prev = self.load(fail_order, guard);
-- while let Some(next) = func(prev) {
-- match self.compare_exchange_weak(prev, next, set_order, fail_order, guard) {
-- Ok(shared) => return Ok(shared),
-- Err(next_prev) => prev = next_prev.current,
-- }
-- }
-- Err(prev)
-- }
--
- /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
- /// value is the same as `current`. The tag is also taken into account, so two pointers to the
- /// same object, but with different tags, will not be considered equal.
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -178,18 +178,13 @@ mod tests {
-
- #[test]
- fn pin_holds_advance() {
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 500_000;
--
- let collector = Collector::new();
-
- thread::scope(|scope| {
- for _ in 0..NUM_THREADS {
- scope.spawn(|_| {
- let handle = collector.register();
-- for _ in 0..N {
-+ for _ in 0..500_000 {
- let guard = &handle.pin();
-
- let before = collector.global.epoch.load(Ordering::Relaxed);
-@@ -207,9 +202,6 @@ mod tests {
- #[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to `cfg(crossbeam_sanitize)` reduce `internal::MAX_OBJECTS`
- #[test]
- fn incremental() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -238,16 +230,12 @@ mod tests {
- let guard = &handle.pin();
- collector.global.collect(guard);
- }
-- assert!(DESTROYS.load(Ordering::Relaxed) == COUNT);
-+ assert!(DESTROYS.load(Ordering::Relaxed) == 100_000);
- }
-
- #[test]
- fn buffering() {
- const COUNT: usize = 10;
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
- let collector = Collector::new();
-@@ -264,7 +252,7 @@ mod tests {
- }
- }
-
-- for _ in 0..N {
-+ for _ in 0..100_000 {
- collector.global.collect(&handle.pin());
- }
- assert!(DESTROYS.load(Ordering::Relaxed) < COUNT);
-@@ -280,9 +268,6 @@ mod tests {
-
- #[test]
- fn count_drops() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -316,9 +301,6 @@ mod tests {
-
- #[test]
- fn count_destroy() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -385,9 +367,6 @@ mod tests {
-
- #[test]
- fn destroy_array() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -423,9 +402,6 @@ mod tests {
- #[test]
- fn stress() {
- const THREADS: usize = 8;
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -81,8 +81,6 @@ impl Deferred {
-
- #[cfg(all(test, not(crossbeam_loom)))]
- mod tests {
-- #![allow(clippy::drop_copy)]
--
- use super::Deferred;
- use std::cell::Cell;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -101,7 +101,7 @@ impl Bag {
-
- /// Seals the bag with the given epoch.
- fn seal(self, epoch: Epoch) -> SealedBag {
-- SealedBag { epoch, _bag: self }
-+ SealedBag { epoch, bag: self }
- }
- }
-
-@@ -216,7 +216,7 @@ fn no_op_func() {}
- #[derive(Default, Debug)]
- struct SealedBag {
- epoch: Epoch,
-- _bag: Bag,
-+ bag: Bag,
- }
-
- /// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.
-@@ -311,7 +311,7 @@ impl Global {
- // TODO(stjepang): `Local`s are stored in a linked list because linked lists are fairly
- // easy to implement in a lock-free manner. However, traversal can be slow due to cache
- // misses and data dependencies. We should experiment with other data structures as well.
-- for local in self.locals.iter(guard) {
-+ for local in self.locals.iter(&guard) {
- match local {
- Err(IterError::Stalled) => {
- // A concurrent thread stalled this iteration. That thread might also try to
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -259,9 +259,6 @@ mod test {
- }
- }
-
-- #[cfg(miri)]
-- const CONC_COUNT: i64 = 1000;
-- #[cfg(not(miri))]
- const CONC_COUNT: i64 = 1000000;
-
- #[test]
-@@ -425,8 +422,8 @@ mod test {
-
- let mut vl2 = vl.clone();
- let mut vr2 = vr.clone();
-- vl2.sort_unstable();
-- vr2.sort_unstable();
-+ vl2.sort();
-+ vr2.sort();
-
- assert_eq!(vl, vl2);
- assert_eq!(vr, vr2);
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/build.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/build.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -4,31 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic`
--// Assume the target does *not* support any atomic operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic_64`
--// Assume the target does *not* support AtomicU64/AtomicI64.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json 2022-03-16 09:33:31.996159993 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"097eb3484f4f13471dfe6879ce61450cc60d4453aecb924f38a8f0e4af593cdd","Cargo.toml":"2734493ab832f12a4f849c333d2dd11760c6ce614b88355da21118f77acdcd70","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"39cf39e855e52559c8f68880a02b3e2778ae2d8f089650af1b3e34a85898aed7","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic/atomic_cell.rs":"9d0785073f506b75c110270947f6a8367ead7faaf29c507d4ede37125310cff6","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"ba2e34ed1e27f0d0d4f1bb8a5feb4eb8131f756adb27a719de52c26ee7b86b9c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml 2022-03-16 09:33:31.996159993 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Utilities for concurrent programming"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
-+documentation = "https://docs.rs/crossbeam-utils"
- keywords = ["scoped", "thread", "atomic", "cache"]
- categories = ["algorithms", "concurrency", "data-structures", "no-std"]
- license = "MIT OR Apache-2.0"
-@@ -29,9 +31,6 @@ optional = true
- [dev-dependencies.rand]
- version = "0.8"
-
--[dev-dependencies.rustversion]
--version = "1"
--
- [features]
- default = ["std"]
- nightly = []
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md 2022-03-16 09:33:31.996159993 +0100
-@@ -1,12 +1,7 @@
--# Version 0.8.6
--
--- Re-add `AtomicCell<{i,u}64>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0 on targets that do not support `Atomic{I,U}64`. (#767)
--- Re-add `AtomicCell<{i,u}128>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0. (#767)
--
- # Version 0.8.5
-
--- Add `AtomicCell::fetch_update`. (#704)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
-+- Add `AtomicCell::fetch_update` (#704)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-
- # Version 0.8.4
-
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -295,7 +295,7 @@ impl<T: Copy + Eq> AtomicCell<T> {
- }
-
- macro_rules! impl_arithmetic {
-- ($t:ty, fallback, $example:tt) => {
-+ ($t:ty, $example:tt) => {
- impl AtomicCell<$t> {
- /// Increments the current value by `val` and returns the previous value.
- ///
-@@ -313,13 +313,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_add(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_add(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -344,13 +341,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_sub(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_sub(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -373,13 +367,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_and(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_and(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -402,13 +393,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_or(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_or(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -431,13 +419,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_xor(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_xor(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -556,15 +541,9 @@ impl_arithmetic!(i32, atomic::AtomicI32,
- impl_arithmetic!(u64, atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
- #[cfg(not(crossbeam_no_atomic_64))]
- impl_arithmetic!(i64, atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(u64, fallback, "let a = AtomicCell::new(7u64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(i64, fallback, "let a = AtomicCell::new(7i64);");
- // TODO: AtomicU128 is unstable
- // impl_arithmetic!(u128, atomic::AtomicU128, "let a = AtomicCell::new(7u128);");
- // impl_arithmetic!(i128, atomic::AtomicI128, "let a = AtomicCell::new(7i128);");
--impl_arithmetic!(u128, fallback, "let a = AtomicCell::new(7u128);");
--impl_arithmetic!(i128, fallback, "let a = AtomicCell::new(7i128);");
-
- impl_arithmetic!(
- usize,
-@@ -704,13 +683,105 @@ fn lock(addr: usize) -> &'static SeqLock
- // stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
- // In order to protect from such cases, we simply choose a large prime number for `LEN`.
- const LEN: usize = 97;
-- #[allow(clippy::declare_interior_mutable_const)]
-- const L: SeqLock = SeqLock::new();
-+
- static LOCKS: [SeqLock; LEN] = [
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L,
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
- ];
-
- // If the modulus is a constant number, the compiler will use crazy math to transform this into
-@@ -762,6 +833,7 @@ macro_rules! atomic {
- ($t:ty, $a:ident, $atomic_op:expr, $fallback_op:expr) => {
- loop {
- atomic!(@check, $t, AtomicUnit, $a, $atomic_op);
-+ atomic!(@check, $t, atomic::AtomicUsize, $a, $atomic_op);
-
- atomic!(@check, $t, atomic::AtomicU8, $a, $atomic_op);
- atomic!(@check, $t, atomic::AtomicU16, $a, $atomic_op);
-@@ -783,6 +855,7 @@ macro_rules! atomic {
- const fn atomic_is_lock_free<T>() -> bool {
- // HACK(taiki-e): This is equivalent to `atomic! { T, _a, true, false }`, but can be used in const fn even in Rust 1.36.
- let is_lock_free = can_transmute::<T, AtomicUnit>()
-+ | can_transmute::<T, atomic::AtomicUsize>()
- | can_transmute::<T, atomic::AtomicU8>()
- | can_transmute::<T, atomic::AtomicU16>()
- | can_transmute::<T, atomic::AtomicU32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -175,7 +175,6 @@ impl Parker {
- ///
- /// let p = Parker::new();
- /// let raw = Parker::into_raw(p);
-- /// # let _ = unsafe { Parker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Parker) -> *const () {
- Unparker::into_raw(this.unparker)
-@@ -259,7 +258,6 @@ impl Unparker {
- /// let p = Parker::new();
- /// let u = p.unparker().clone();
- /// let raw = Unparker::into_raw(u);
-- /// # let _ = unsafe { Unparker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Unparker) -> *const () {
- Arc::into_raw(this.inner) as *const ()
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -446,7 +446,7 @@ impl<'scope, 'env> ScopedThreadBuilder<'
- unsafe { mem::transmute(closure) };
-
- // Finally, spawn the closure.
-- self.builder.spawn(closure)?
-+ self.builder.spawn(move || closure())?
- };
-
- let thread = handle.thread().clone();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -264,22 +264,3 @@ fn const_atomic_cell_new() {
- CELL.store(1);
- assert_eq!(CELL.load(), 1);
- }
--
--// https://github.com/crossbeam-rs/crossbeam/issues/748
--#[cfg_attr(miri, ignore)] // TODO
--#[rustversion::since(1.37)] // #[repr(align(N))] requires Rust 1.37
--#[test]
--fn issue_748() {
-- #[allow(dead_code)]
-- #[repr(align(8))]
-- #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-- enum Test {
-- Field(u32),
-- FieldLess,
-- }
--
-- assert_eq!(mem::size_of::<Test>(), 8);
-- assert!(AtomicCell::<Test>::is_lock_free());
-- let x = AtomicCell::new(Test::FieldLess);
-- assert_eq!(x.load(), Test::FieldLess);
--}
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -21,9 +21,6 @@ fn smoke() {
- #[test]
- fn frob() {
- const N: u32 = 10;
-- #[cfg(miri)]
-- const M: usize = 100;
-- #[cfg(not(miri))]
- const M: usize = 1000;
-
- let r = Arc::new(ShardedLock::new(()));
diff --git a/firefox.spec b/firefox.spec
index 238bca8..23f2eb0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -216,7 +216,6 @@ Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
# Test patches
@@ -459,9 +458,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-%ifarch aarch64
-%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
-%endif
%patch71 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
# Test patches
commit 3b1730925b4ef954a27f291ab3eed5b0667bc067
Merge: 35a5afb f14b870
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:11 2022 +0200
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
commit 35a5afbafa9e3f85b82856171e9da0670e91d5ab
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:00 2022 +0200
Updated to 99.0
diff --git a/.gitignore b/.gitignore
index c32b695..85b9eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -501,3 +501,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-98.0-20220305.tar.xz
/firefox-98.0.2.source.tar.xz
/firefox-langpacks-98.0.2-20220331.tar.xz
+/firefox-99.0.source.tar.xz
+/firefox-langpacks-99.0-20220331.tar.xz
diff --git a/D139022.diff b/D139022.diff
deleted file mode 100644
index 9d18162..0000000
--- a/D139022.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/dom/animation/TimingParams.h b/dom/animation/TimingParams.h
---- a/dom/animation/TimingParams.h
-+++ b/dom/animation/TimingParams.h
-@@ -31,22 +31,19 @@
- struct TimingParams {
- constexpr TimingParams() = default;
-
-- constexpr TimingParams(float aDuration, float aDelay, float aIterationCount,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode)
-+ TimingParams(float aDuration, float aDelay, float aIterationCount,
-+ dom::PlaybackDirection aDirection, dom::FillMode aFillMode)
- : mIterations(aIterationCount), mDirection(aDirection), mFill(aFillMode) {
- mDuration.emplace(StickyTimeDuration::FromMilliseconds(aDuration));
- mDelay = TimeDuration::FromMilliseconds(aDelay);
- Update();
- }
-
-- constexpr TimingParams(const TimeDuration& aDuration,
-- const TimeDuration& aDelay,
-- const TimeDuration& aEndDelay, float aIterations,
-- float aIterationStart,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode,
-- Maybe<ComputedTimingFunction>&& aFunction)
-+ TimingParams(const TimeDuration& aDuration, const TimeDuration& aDelay,
-+ const TimeDuration& aEndDelay, float aIterations,
-+ float aIterationStart, dom::PlaybackDirection aDirection,
-+ dom::FillMode aFillMode,
-+ Maybe<ComputedTimingFunction>&& aFunction)
- : mDelay(aDelay),
- mEndDelay(aEndDelay),
- mIterations(aIterations),
-
diff --git a/D139078.diff b/D139078.diff
deleted file mode 100644
index 8198e1a..0000000
--- a/D139078.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
---- a/gfx/wr/swgl/src/glsl.h
-+++ b/gfx/wr/swgl/src/glsl.h
-@@ -2301,20 +2301,12 @@
- const vec2& operator[](int index) const { return data[index]; }
- mat2() = default;
-
-- IMPLICIT mat2(Float a) {
-- data[0] = vec2(a);
-- data[1] = vec2(a);
-- }
-+ IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
-
-- mat2(vec2 a, vec2 b) {
-- data[0] = a;
-- data[1] = b;
-- }
-+ constexpr mat2(vec2 a, vec2 b) : data{a, b} {}
- IMPLICIT mat2(const mat4& mat);
-- IMPLICIT constexpr mat2(mat2_scalar s) {
-- data[0] = vec2(s.data[0]);
-- data[1] = vec2(s.data[1]);
-- }
-+ IMPLICIT constexpr mat2(mat2_scalar s)
-+ : data{vec2(s.data[0]), vec2(s.data[1])} {}
-
- friend vec2 operator*(mat2 m, vec2 v) {
- vec2 u;
-@@ -2404,30 +2396,19 @@
- vec3& operator[](int index) { return data[index]; }
- const vec3& operator[](int index) const { return data[index]; }
- mat3() = default;
-- mat3(vec3 a, vec3 b, vec3 c) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- }
-+ constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
-
-- IMPLICIT constexpr mat3(mat3_scalar s) {
-- data[0] = vec3(s.data[0]);
-- data[1] = vec3(s.data[1]);
-- data[2] = vec3(s.data[2]);
-- }
-- constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2,
-- mat3_scalar s3) {
-- data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]);
-- data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]);
-- data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]);
-- }
-+ IMPLICIT constexpr mat3(mat3_scalar s)
-+ : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {}
-+
-+ constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3)
-+ : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]),
-+ vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]),
-+ vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {}
-
- constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6,
-- Float d7, Float d8, Float d9) {
-- data[0] = vec3(d1, d2, d3);
-- data[1] = vec3(d4, d5, d6);
-- data[2] = vec3(d7, d8, d9);
-- }
-+ Float d7, Float d8, Float d9)
-+ : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {}
-
- IMPLICIT mat3(const mat4& mat);
-
-@@ -2597,19 +2578,11 @@
- vec4 data[4];
-
- mat4() = default;
-- IMPLICIT constexpr mat4(mat4_scalar s) {
-- data[0] = vec4(s.data[0]);
-- data[1] = vec4(s.data[1]);
-- data[2] = vec4(s.data[2]);
-- data[3] = vec4(s.data[3]);
-- }
-+ IMPLICIT constexpr mat4(mat4_scalar s)
-+ : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
-+ vec4(s.data[3])} {}
-
-- mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- data[3] = d;
-- }
-+ constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {}
-
- vec4& operator[](int index) { return data[index]; }
- const vec4& operator[](int index) const { return data[index]; }
-
diff --git a/D139088.diff b/D139088.diff
deleted file mode 100644
index 91e9967..0000000
--- a/D139088.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
---- a/gfx/wr/swgl/src/gl.cc
-+++ b/gfx/wr/swgl/src/gl.cc
-@@ -82,7 +82,7 @@
-
- #define FALLTHROUGH [[fallthrough]]
-
--#ifdef MOZILLA_CLIENT
-+#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
- # define IMPLICIT __attribute__((annotate("moz_implicit")))
- #else
- # define IMPLICIT
-
diff --git a/D139696.diff b/D139696.diff
deleted file mode 100644
index 432a9c6..0000000
--- a/D139696.diff
+++ /dev/null
@@ -1,13808 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1 b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-@@ -0,0 +1,504 @@
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 2.1, February 1999
-+
-+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+[This is the first released version of the Lesser GPL. It also counts
-+ as the successor of the GNU Library Public License, version 2, hence
-+ the version number 2.1.]
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+Licenses are intended to guarantee your freedom to share and change
-+free software--to make sure the software is free for all its users.
-+
-+ This license, the Lesser General Public License, applies to some
-+specially designated software packages--typically libraries--of the
-+Free Software Foundation and other authors who decide to use it. You
-+can use it too, but we suggest you first think carefully about whether
-+this license or the ordinary General Public License is the better
-+strategy to use in any particular case, based on the explanations below.
-+
-+ When we speak of free software, we are referring to freedom of use,
-+not price. Our General Public Licenses are designed to make sure that
-+you have the freedom to distribute copies of free software (and charge
-+for this service if you wish); that you receive source code or can get
-+it if you want it; that you can change the software and use pieces of
-+it in new free programs; and that you are informed that you can do
-+these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+distributors to deny you these rights or to ask you to surrender these
-+rights. These restrictions translate to certain responsibilities for
-+you if you distribute copies of the library or if you modify it.
-+
-+ For example, if you distribute copies of the library, whether gratis
-+or for a fee, you must give the recipients all the rights that we gave
-+you. You must make sure that they, too, receive or can get the source
-+code. If you link other code with the library, you must provide
-+complete object files to the recipients, so that they can relink them
-+with the library after making changes to the library and recompiling
-+it. And you must show them these terms so they know their rights.
-+
-+ We protect your rights with a two-step method: (1) we copyright the
-+library, and (2) we offer you this license, which gives you legal
-+permission to copy, distribute and/or modify the library.
-+
-+ To protect each distributor, we want to make it very clear that
-+there is no warranty for the free library. Also, if the library is
-+modified by someone else and passed on, the recipients should know
-+that what they have is not the original version, so that the original
-+author's reputation will not be affected by problems that might be
-+introduced by others.
-+
-+ Finally, software patents pose a constant threat to the existence of
-+any free program. We wish to make sure that a company cannot
-+effectively restrict the users of a free program by obtaining a
-+restrictive license from a patent holder. Therefore, we insist that
-+any patent license obtained for a version of the library must be
-+consistent with the full freedom of use specified in this license.
-+
-+ Most GNU software, including some libraries, is covered by the
-+ordinary GNU General Public License. This license, the GNU Lesser
-+General Public License, applies to certain designated libraries, and
-+is quite different from the ordinary General Public License. We use
-+this license for certain libraries in order to permit linking those
-+libraries into non-free programs.
-+
-+ When a program is linked with a library, whether statically or using
-+a shared library, the combination of the two is legally speaking a
-+combined work, a derivative of the original library. The ordinary
-+General Public License therefore permits such linking only if the
-+entire combination fits its criteria of freedom. The Lesser General
-+Public License permits more lax criteria for linking other code with
-+the library.
-+
-+ We call this license the "Lesser" General Public License because it
-+does Less to protect the user's freedom than the ordinary General
-+Public License. It also provides other free software developers Less
-+of an advantage over competing non-free programs. These disadvantages
-+are the reason we use the ordinary General Public License for many
-+libraries. However, the Lesser license provides advantages in certain
-+special circumstances.
-+
-+ For example, on rare occasions, there may be a special need to
-+encourage the widest possible use of a certain library, so that it becomes
-+a de-facto standard. To achieve this, non-free programs must be
-+allowed to use the library. A more frequent case is that a free
-+library does the same job as widely used non-free libraries. In this
-+case, there is little to gain by limiting the free library to free
-+software only, so we use the Lesser General Public License.
-+
-+ In other cases, permission to use a particular library in non-free
-+programs enables a greater number of people to use a large body of
-+free software. For example, permission to use the GNU C Library in
-+non-free programs enables many more people to use the whole GNU
-+operating system, as well as its variant, the GNU/Linux operating
-+system.
-+
-+ Although the Lesser General Public License is Less protective of the
-+users' freedom, it does ensure that the user of a program that is
-+linked with the Library has the freedom and the wherewithal to run
-+that program using a modified version of the Library.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow. Pay close attention to the difference between a
-+"work based on the library" and a "work that uses the library". The
-+former contains code derived from the library, whereas the latter must
-+be combined with the library in order to run.
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License Agreement applies to any software library or other
-+program which contains a notice placed by the copyright holder or
-+other authorized party saying it may be distributed under the terms of
-+this Lesser General Public License (also called "this License").
-+Each licensee is addressed as "you".
-+
-+ A "library" means a collection of software functions and/or data
-+prepared so as to be conveniently linked with application programs
-+(which use some of those functions and data) to form executables.
-+
-+ The "Library", below, refers to any such software library or work
-+which has been distributed under these terms. A "work based on the
-+Library" means either the Library or any derivative work under
-+copyright law: that is to say, a work containing the Library or a
-+portion of it, either verbatim or with modifications and/or translated
-+straightforwardly into another language. (Hereinafter, translation is
-+included without limitation in the term "modification".)
-+
-+ "Source code" for a work means the preferred form of the work for
-+making modifications to it. For a library, complete source code means
-+all the source code for all modules it contains, plus any associated
-+interface definition files, plus the scripts used to control compilation
-+and installation of the library.
-+
-+ Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running a program using the Library is not restricted, and output from
-+such a program is covered only if its contents constitute a work based
-+on the Library (independent of the use of the Library in a tool for
-+writing it). Whether that is true depends on what the Library does
-+and what the program that uses the Library does.
-+
-+ 1. You may copy and distribute verbatim copies of the Library's
-+complete source code as you receive it, in any medium, provided that
-+you conspicuously and appropriately publish on each copy an
-+appropriate copyright notice and disclaimer of warranty; keep intact
-+all the notices that refer to this License and to the absence of any
-+warranty; and distribute a copy of this License along with the
-+Library.
-+
-+ You may charge a fee for the physical act of transferring a copy,
-+and you may at your option offer warranty protection in exchange for a
-+fee.
-+
-+ 2. You may modify your copy or copies of the Library or any portion
-+of it, thus forming a work based on the Library, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) The modified work must itself be a software library.
-+
-+ b) You must cause the files modified to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ c) You must cause the whole of the work to be licensed at no
-+ charge to all third parties under the terms of this License.
-+
-+ d) If a facility in the modified Library refers to a function or a
-+ table of data to be supplied by an application program that uses
-+ the facility, other than as an argument passed when the facility
-+ is invoked, then you must make a good faith effort to ensure that,
-+ in the event an application does not supply such function or
-+ table, the facility still operates, and performs whatever part of
-+ its purpose remains meaningful.
-+
-+ (For example, a function in a library to compute square roots has
-+ a purpose that is entirely well-defined independent of the
-+ application. Therefore, Subsection 2d requires that any
-+ application-supplied function or table used by this function must
-+ be optional: if the application does not supply it, the square
-+ root function must still compute square roots.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Library,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Library, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote
-+it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Library.
-+
-+In addition, mere aggregation of another work not based on the Library
-+with the Library (or with a work based on the Library) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may opt to apply the terms of the ordinary GNU General Public
-+License instead of this License to a given copy of the Library. To do
-+this, you must alter all the notices that refer to this License, so
-+that they refer to the ordinary GNU General Public License, version 2,
-+instead of to this License. (If a newer version than version 2 of the
-+ordinary GNU General Public License has appeared, then you can specify
-+that version instead if you wish.) Do not make any other change in
-+these notices.
-+
-+ Once this change is made in a given copy, it is irreversible for
-+that copy, so the ordinary GNU General Public License applies to all
-+subsequent copies and derivative works made from that copy.
-+
-+ This option is useful when you wish to copy part of the code of
-+the Library into a program that is not a library.
-+
-+ 4. You may copy and distribute the Library (or a portion or
-+derivative of it, under Section 2) in object code or executable form
-+under the terms of Sections 1 and 2 above provided that you accompany
-+it with the complete corresponding machine-readable source code, which
-+must be distributed under the terms of Sections 1 and 2 above on a
-+medium customarily used for software interchange.
-+
-+ If distribution of object code is made by offering access to copy
-+from a designated place, then offering equivalent access to copy the
-+source code from the same place satisfies the requirement to
-+distribute the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 5. A program that contains no derivative of any portion of the
-+Library, but is designed to work with the Library by being compiled or
-+linked with it, is called a "work that uses the Library". Such a
-+work, in isolation, is not a derivative work of the Library, and
-+therefore falls outside the scope of this License.
-+
-+ However, linking a "work that uses the Library" with the Library
-+creates an executable that is a derivative of the Library (because it
-+contains portions of the Library), rather than a "work that uses the
-+library". The executable is therefore covered by this License.
-+Section 6 states terms for distribution of such executables.
-+
-+ When a "work that uses the Library" uses material from a header file
-+that is part of the Library, the object code for the work may be a
-+derivative work of the Library even though the source code is not.
-+Whether this is true is especially significant if the work can be
-+linked without the Library, or if the work is itself a library. The
-+threshold for this to be true is not precisely defined by law.
-+
-+ If such an object file uses only numerical parameters, data
-+structure layouts and accessors, and small macros and small inline
-+functions (ten lines or less in length), then the use of the object
-+file is unrestricted, regardless of whether it is legally a derivative
-+work. (Executables containing this object code plus portions of the
-+Library will still fall under Section 6.)
-+
-+ Otherwise, if the work is a derivative of the Library, you may
-+distribute the object code for the work under the terms of Section 6.
-+Any executables containing that work also fall under Section 6,
-+whether or not they are linked directly with the Library itself.
-+
-+ 6. As an exception to the Sections above, you may also combine or
-+link a "work that uses the Library" with the Library to produce a
-+work containing portions of the Library, and distribute that work
-+under terms of your choice, provided that the terms permit
-+modification of the work for the customer's own use and reverse
-+engineering for debugging such modifications.
-+
-+ You must give prominent notice with each copy of the work that the
-+Library is used in it and that the Library and its use are covered by
-+this License. You must supply a copy of this License. If the work
-+during execution displays copyright notices, you must include the
-+copyright notice for the Library among them, as well as a reference
-+directing the user to the copy of this License. Also, you must do one
-+of these things:
-+
-+ a) Accompany the work with the complete corresponding
-+ machine-readable source code for the Library including whatever
-+ changes were used in the work (which must be distributed under
-+ Sections 1 and 2 above); and, if the work is an executable linked
-+ with the Library, with the complete machine-readable "work that
-+ uses the Library", as object code and/or source code, so that the
-+ user can modify the Library and then relink to produce a modified
-+ executable containing the modified Library. (It is understood
-+ that the user who changes the contents of definitions files in the
-+ Library will not necessarily be able to recompile the application
-+ to use the modified definitions.)
-+
-+ b) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (1) uses at run time a
-+ copy of the library already present on the user's computer system,
-+ rather than copying library functions into the executable, and (2)
-+ will operate properly with a modified version of the library, if
-+ the user installs one, as long as the modified version is
-+ interface-compatible with the version that the work was made with.
-+
-+ c) Accompany the work with a written offer, valid for at
-+ least three years, to give the same user the materials
-+ specified in Subsection 6a, above, for a charge no more
-+ than the cost of performing this distribution.
-+
-+ d) If distribution of the work is made by offering access to copy
-+ from a designated place, offer equivalent access to copy the above
-+ specified materials from the same place.
-+
-+ e) Verify that the user has already received a copy of these
-+ materials or that you have already sent this user a copy.
-+
-+ For an executable, the required form of the "work that uses the
-+Library" must include any data and utility programs needed for
-+reproducing the executable from it. However, as a special exception,
-+the materials to be distributed need not include anything that is
-+normally distributed (in either source or binary form) with the major
-+components (compiler, kernel, and so on) of the operating system on
-+which the executable runs, unless that component itself accompanies
-+the executable.
-+
-+ It may happen that this requirement contradicts the license
-+restrictions of other proprietary libraries that do not normally
-+accompany the operating system. Such a contradiction means you cannot
-+use both them and the Library together in an executable that you
-+distribute.
-+
-+ 7. You may place library facilities that are a work based on the
-+Library side-by-side in a single library together with other library
-+facilities not covered by this License, and distribute such a combined
-+library, provided that the separate distribution of the work based on
-+the Library and of the other library facilities is otherwise
-+permitted, and provided that you do these two things:
-+
-+ a) Accompany the combined library with a copy of the same work
-+ based on the Library, uncombined with any other library
-+ facilities. This must be distributed under the terms of the
-+ Sections above.
-+
-+ b) Give prominent notice with the combined library of the fact
-+ that part of it is a work based on the Library, and explaining
-+ where to find the accompanying uncombined form of the same work.
-+
-+ 8. You may not copy, modify, sublicense, link with, or distribute
-+the Library except as expressly provided under this License. Any
-+attempt otherwise to copy, modify, sublicense, link with, or
-+distribute the Library is void, and will automatically terminate your
-+rights under this License. However, parties who have received copies,
-+or rights, from you under this License will not have their licenses
-+terminated so long as such parties remain in full compliance.
-+
-+ 9. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Library or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Library (or any work based on the
-+Library), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Library or works based on it.
-+
-+ 10. Each time you redistribute the Library (or any work based on the
-+Library), the recipient automatically receives a license from the
-+original licensor to copy, distribute, link with or modify the Library
-+subject to these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties with
-+this License.
-+
-+ 11. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Library at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Library by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Library.
-+
-+If any portion of this section is held invalid or unenforceable under any
-+particular circumstance, the balance of the section is intended to apply,
-+and the section as a whole is intended to apply in other circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 12. If the distribution and/or use of the Library is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Library under this License may add
-+an explicit geographical distribution limitation excluding those countries,
-+so that distribution is permitted only in or among countries not thus
-+excluded. In such case, this License incorporates the limitation as if
-+written in the body of this License.
-+
-+ 13. The Free Software Foundation may publish revised and/or new
-+versions of the Lesser General Public License from time to time.
-+Such new versions will be similar in spirit to the present version,
-+but may differ in detail to address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Library
-+specifies a version number of this License which applies to it and
-+"any later version", you have the option of following the terms and
-+conditions either of that version or of any later version published by
-+the Free Software Foundation. If the Library does not specify a
-+license version number, you may choose any version ever published by
-+the Free Software Foundation.
-+
-+ 14. If you wish to incorporate parts of the Library into other free
-+programs whose distribution conditions are incompatible with these,
-+write to the author to ask for permission. For software which is
-+copyrighted by the Free Software Foundation, write to the Free
-+Software Foundation; we sometimes make exceptions for this. Our
-+decision will be guided by the two goals of preserving the free status
-+of all derivatives of our free software and of promoting the sharing
-+and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Libraries
-+
-+ If you develop a new library, and you want it to be of the greatest
-+possible use to the public, we recommend making it free software that
-+everyone can redistribute and change. You can do so by permitting
-+redistribution under these terms (or, alternatively, under the terms of the
-+ordinary General Public License).
-+
-+ To apply these terms, attach the following notices to the library. It is
-+safest to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least the
-+"copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the library's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the library, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
-+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1990
-+ Ty Coon, President of Vice
-+
-+That's all there is to it!
-+
-+
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-@@ -0,0 +1,3204 @@
-+/*
-+ * copyright (c) 2001 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVCODEC_H
-+#define AVCODEC_AVCODEC_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec external API header
-+ */
-+
-+#include "libavutil/samplefmt.h"
-+#include "libavutil/attributes.h"
-+#include "libavutil/avutil.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/frame.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec.h"
-+#include "codec_desc.h"
-+#include "codec_par.h"
-+#include "codec_id.h"
-+#include "defs.h"
-+#include "packet.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup libavc libavcodec
-+ * Encoding/Decoding Library
-+ *
-+ * @{
-+ *
-+ * @defgroup lavc_decoding Decoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_encoding Encoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_codec Codecs
-+ * @{
-+ * @defgroup lavc_codec_native Native Codecs
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_wrappers External library wrappers
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
-+ * @{
-+ * @}
-+ * @}
-+ * @defgroup lavc_internal Internal
-+ * @{
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @ingroup libavc
-+ * @defgroup lavc_encdec send/receive encoding and decoding API overview
-+ * @{
-+ *
-+ * The avcodec_send_packet()/avcodec_receive_frame()/avcodec_send_frame()/
-+ * avcodec_receive_packet() functions provide an encode/decode API, which
-+ * decouples input and output.
-+ *
-+ * The API is very similar for encoding/decoding and audio/video, and works as
-+ * follows:
-+ * - Set up and open the AVCodecContext as usual.
-+ * - Send valid input:
-+ * - For decoding, call avcodec_send_packet() to give the decoder raw
-+ * compressed data in an AVPacket.
-+ * - For encoding, call avcodec_send_frame() to give the encoder an AVFrame
-+ * containing uncompressed audio or video.
-+ *
-+ * In both cases, it is recommended that AVPackets and AVFrames are
-+ * refcounted, or libavcodec might have to copy the input data. (libavformat
-+ * always returns refcounted AVPackets, and av_frame_get_buffer() allocates
-+ * refcounted AVFrames.)
-+ * - Receive output in a loop. Periodically call one of the avcodec_receive_*()
-+ * functions and process their output:
-+ * - For decoding, call avcodec_receive_frame(). On success, it will return
-+ * an AVFrame containing uncompressed audio or video data.
-+ * - For encoding, call avcodec_receive_packet(). On success, it will return
-+ * an AVPacket with a compressed frame.
-+ *
-+ * Repeat this call until it returns AVERROR(EAGAIN) or an error. The
-+ * AVERROR(EAGAIN) return value means that new input data is required to
-+ * return new output. In this case, continue with sending input. For each
-+ * input frame/packet, the codec will typically return 1 output frame/packet,
-+ * but it can also be 0 or more than 1.
-+ *
-+ * At the beginning of decoding or encoding, the codec might accept multiple
-+ * input frames/packets without returning a frame, until its internal buffers
-+ * are filled. This situation is handled transparently if you follow the steps
-+ * outlined above.
-+ *
-+ * In theory, sending input can result in EAGAIN - this should happen only if
-+ * not all output was received. You can use this to structure alternative decode
-+ * or encode loops other than the one suggested above. For example, you could
-+ * try sending new input on each iteration, and try to receive output if that
-+ * returns EAGAIN.
-+ *
-+ * End of stream situations. These require "flushing" (aka draining) the codec,
-+ * as the codec might buffer multiple frames or packets internally for
-+ * performance or out of necessity (consider B-frames).
-+ * This is handled as follows:
-+ * - Instead of valid input, send NULL to the avcodec_send_packet() (decoding)
-+ * or avcodec_send_frame() (encoding) functions. This will enter draining
-+ * mode.
-+ * - Call avcodec_receive_frame() (decoding) or avcodec_receive_packet()
-+ * (encoding) in a loop until AVERROR_EOF is returned. The functions will
-+ * not return AVERROR(EAGAIN), unless you forgot to enter draining mode.
-+ * - Before decoding can be resumed again, the codec has to be reset with
-+ * avcodec_flush_buffers().
-+ *
-+ * Using the API as outlined above is highly recommended. But it is also
-+ * possible to call functions outside of this rigid schema. For example, you can
-+ * call avcodec_send_packet() repeatedly without calling
-+ * avcodec_receive_frame(). In this case, avcodec_send_packet() will succeed
-+ * until the codec's internal buffer has been filled up (which is typically of
-+ * size 1 per output frame, after initial input), and then reject input with
-+ * AVERROR(EAGAIN). Once it starts rejecting input, you have no choice but to
-+ * read at least some output.
-+ *
-+ * Not all codecs will follow a rigid and predictable dataflow; the only
-+ * guarantee is that an AVERROR(EAGAIN) return value on a send/receive call on
-+ * one end implies that a receive/send call on the other end will succeed, or
-+ * at least will not fail with AVERROR(EAGAIN). In general, no codec will
-+ * permit unlimited buffering of input or output.
-+ *
-+ * A codec is not allowed to return AVERROR(EAGAIN) for both sending and
-+ * receiving. This would be an invalid state, which could put the codec user
-+ * into an endless loop. The API has no concept of time either: it cannot happen
-+ * that trying to do avcodec_send_packet() results in AVERROR(EAGAIN), but a
-+ * repeated call 1 second later accepts the packet (with no other receive/flush
-+ * API calls involved). The API is a strict state machine, and the passage of
-+ * time is not supposed to influence it. Some timing-dependent behavior might
-+ * still be deemed acceptable in certain cases. But it must never result in both
-+ * send/receive returning EAGAIN at the same time at any point. It must also
-+ * absolutely be avoided that the current state is "unstable" and can
-+ * "flip-flop" between the send/receive APIs allowing progress. For example,
-+ * it's not allowed that the codec randomly decides that it actually wants to
-+ * consume a packet now instead of returning a frame, after it just returned
-+ * AVERROR(EAGAIN) on an avcodec_send_packet() call.
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_core Core functions/structures.
-+ * @ingroup libavc
-+ *
-+ * Basic definitions, functions for querying libavcodec capabilities,
-+ * allocating core structures, etc.
-+ * @{
-+ */
-+
-+/**
-+ * @ingroup lavc_encoding
-+ * minimum encoding buffer size
-+ * Used to avoid some checks during header writing.
-+ */
-+#define AV_INPUT_BUFFER_MIN_SIZE 16384
-+
-+/**
-+ * @ingroup lavc_encoding
-+ */
-+typedef struct RcOverride {
-+ int start_frame;
-+ int end_frame;
-+ int qscale; // If this is 0 then quality_factor will be used instead.
-+ float quality_factor;
-+} RcOverride;
-+
-+/* encoding support
-+ These flags can be passed in AVCodecContext.flags before initialization.
-+ Note: Not everything is supported yet.
-+*/
-+
-+/**
-+ * Allow decoders to produce frames with data planes that are not aligned
-+ * to CPU requirements (e.g. due to cropping).
-+ */
-+#define AV_CODEC_FLAG_UNALIGNED (1 << 0)
-+/**
-+ * Use fixed qscale.
-+ */
-+#define AV_CODEC_FLAG_QSCALE (1 << 1)
-+/**
-+ * 4 MV per MB allowed / advanced prediction for H.263.
-+ */
-+#define AV_CODEC_FLAG_4MV (1 << 2)
-+/**
-+ * Output even those frames that might be corrupted.
-+ */
-+#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3)
-+/**
-+ * Use qpel MC.
-+ */
-+#define AV_CODEC_FLAG_QPEL (1 << 4)
-+/**
-+ * Don't output frames whose parameters differ from first
-+ * decoded frame in stream.
-+ */
-+#define AV_CODEC_FLAG_DROPCHANGED (1 << 5)
-+/**
-+ * Use internal 2pass ratecontrol in first pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS1 (1 << 9)
-+/**
-+ * Use internal 2pass ratecontrol in second pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS2 (1 << 10)
-+/**
-+ * loop filter.
-+ */
-+#define AV_CODEC_FLAG_LOOP_FILTER (1 << 11)
-+/**
-+ * Only decode/encode grayscale.
-+ */
-+#define AV_CODEC_FLAG_GRAY (1 << 13)
-+/**
-+ * error[?] variables will be set during encoding.
-+ */
-+#define AV_CODEC_FLAG_PSNR (1 << 15)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * Input bitstream might be truncated at a random location
-+ * instead of only at frame boundaries.
-+ *
-+ * @deprecated use codec parsers for packetizing input
-+ */
-+# define AV_CODEC_FLAG_TRUNCATED (1 << 16)
-+#endif
-+/**
-+ * Use interlaced DCT.
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_DCT (1 << 18)
-+/**
-+ * Force low delay.
-+ */
-+#define AV_CODEC_FLAG_LOW_DELAY (1 << 19)
-+/**
-+ * Place global headers in extradata instead of every keyframe.
-+ */
-+#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
-+/**
-+ * Use only bitexact stuff (except (I)DCT).
-+ */
-+#define AV_CODEC_FLAG_BITEXACT (1 << 23)
-+/* Fx : Flag for H.263+ extra options */
-+/**
-+ * H.263 advanced intra coding / MPEG-4 AC prediction
-+ */
-+#define AV_CODEC_FLAG_AC_PRED (1 << 24)
-+/**
-+ * interlaced motion estimation
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_ME (1 << 29)
-+#define AV_CODEC_FLAG_CLOSED_GOP (1U << 31)
-+
-+/**
-+ * Allow non spec compliant speedup tricks.
-+ */
-+#define AV_CODEC_FLAG2_FAST (1 << 0)
-+/**
-+ * Skip bitstream encoding.
-+ */
-+#define AV_CODEC_FLAG2_NO_OUTPUT (1 << 2)
-+/**
-+ * Place global headers at every keyframe instead of in extradata.
-+ */
-+#define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3)
-+
-+/**
-+ * timecode is in drop frame format. DEPRECATED!!!!
-+ */
-+#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13)
-+
-+/**
-+ * Input bitstream might be truncated at a packet boundaries
-+ * instead of only at frame boundaries.
-+ */
-+#define AV_CODEC_FLAG2_CHUNKS (1 << 15)
-+/**
-+ * Discard cropping information from SPS.
-+ */
-+#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16)
-+
-+/**
-+ * Show all frames before the first keyframe
-+ */
-+#define AV_CODEC_FLAG2_SHOW_ALL (1 << 22)
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_FLAG2_EXPORT_MVS (1 << 28)
-+/**
-+ * Do not skip samples and export skip information as frame side data
-+ */
-+#define AV_CODEC_FLAG2_SKIP_MANUAL (1 << 29)
-+/**
-+ * Do not reset ASS ReadOrder field on flush (subtitles decoding)
-+ */
-+#define AV_CODEC_FLAG2_RO_FLUSH_NOOP (1 << 30)
-+
-+/* Unsupported options :
-+ * Syntax Arithmetic coding (SAC)
-+ * Reference Picture Selection
-+ * Independent Segment Decoding */
-+/* /Fx */
-+/* codec capabilities */
-+
-+/* Exported side data.
-+ These flags can be passed in AVCodecContext.export_side_data before
-+ initialization.
-+*/
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_MVS (1 << 0)
-+/**
-+ * Export encoder Producer Reference Time through packet side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_PRFT (1 << 1)
-+/**
-+ * Decoding only.
-+ * Export the AVVideoEncParams structure through frame side data.
-+ */
-+#define AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS (1 << 2)
-+/**
-+ * Decoding only.
-+ * Do not apply film grain, export it instead.
-+ */
-+#define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)
-+
-+/**
-+ * The decoder will keep a reference to the frame and may reuse it later.
-+ */
-+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-+
-+/**
-+ * The encoder will keep a reference to the packet and may reuse it later.
-+ */
-+#define AV_GET_ENCODE_BUFFER_FLAG_REF (1 << 0)
-+
-+struct AVCodecInternal;
-+
-+/**
-+ * main external API structure.
-+ * New fields can be added to the end with minor version bumps.
-+ * Removal, reordering and changes to existing fields require a major
-+ * version bump.
-+ * You can use AVOptions (av_opt* / av_set/get*()) to access these fields from
-+ * user applications. The name string for AVOptions options matches the
-+ * associated command line parameter name and can be found in
-+ * libavcodec/options_table.h The AVOption/command line parameter names differ
-+ * in some cases from the C structure field names for historic reasons or
-+ * brevity. sizeof(AVCodecContext) must not be used outside libav*.
-+ */
-+typedef struct AVCodecContext {
-+ /**
-+ * information on struct for av_log
-+ * - set by avcodec_alloc_context3
-+ */
-+ const AVClass* av_class;
-+ int log_level_offset;
-+
-+ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-+ const struct AVCodec* codec;
-+ enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
-+
-+ /**
-+ * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-+ * This is used to work around some encoder bugs.
-+ * A demuxer should set this to what is stored in the field used to identify
-+ * the codec. If there are multiple such fields in a container then the
-+ * demuxer should choose the one which maximizes the information about the
-+ * used codec. If the codec tag field in a container is larger than 32 bits
-+ * then the demuxer should remap the longer ID to 32 bits with a table or
-+ * other structure. Alternatively a new extra_codec_tag + size could be added
-+ * but for this a clear advantage must be demonstrated first.
-+ * - encoding: Set by user, if not then the default based on codec_id will be
-+ * used.
-+ * - decoding: Set by user, will be converted to uppercase by libavcodec
-+ * during init.
-+ */
-+ unsigned int codec_tag;
-+
-+ void* priv_data;
-+
-+ /**
-+ * Private context used for internal data.
-+ *
-+ * Unlike priv_data, this is not codec-specific. It is used in general
-+ * libavcodec functions.
-+ */
-+ struct AVCodecInternal* internal;
-+
-+ /**
-+ * Private data of the user, can be used to carry app specific stuff.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ void* opaque;
-+
-+ /**
-+ * the average bitrate
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: Set by user, may be overwritten by libavcodec
-+ * if this info is available in the stream
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * number of bits the bitstream is allowed to diverge from the reference.
-+ * the reference can be CBR (for CBR pass1) or VBR (for pass2)
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: unused
-+ */
-+ int bit_rate_tolerance;
-+
-+ /**
-+ * Global quality for codecs which cannot change it per frame.
-+ * This should be proportional to MPEG-1/2/4 qscale.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int global_quality;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int compression_level;
-+#define FF_COMPRESSION_DEFAULT -1
-+
-+ /**
-+ * AV_CODEC_FLAG_*.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags;
-+
-+ /**
-+ * AV_CODEC_FLAG2_*
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags2;
-+
-+ /**
-+ * some codecs need / can use extradata like Huffman tables.
-+ * MJPEG: Huffman tables
-+ * rv10: additional flags
-+ * MPEG-4: global headers (they can be in the bitstream or here)
-+ * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
-+ * than extradata_size to avoid problems if it is read with the bitstream
-+ * reader. The bytewise contents of extradata must not depend on the
-+ * architecture or CPU endianness. Must be allocated with the av_malloc()
-+ * family of functions.
-+ * - encoding: Set/allocated/freed by libavcodec.
-+ * - decoding: Set/allocated/freed by user.
-+ */
-+ uint8_t* extradata;
-+ int extradata_size;
-+
-+ /**
-+ * This is the fundamental unit of time (in seconds) in terms
-+ * of which frame timestamps are represented. For fixed-fps content,
-+ * timebase should be 1/framerate and timestamp increments should be
-+ * identically 1.
-+ * This often, but not always is the inverse of the frame rate or field rate
-+ * for video. 1/time_base is not the average frame rate if the frame rate is
-+ * not constant.
-+ *
-+ * Like containers, elementary streams also can store timestamps, 1/time_base
-+ * is the unit in which these timestamps are specified.
-+ * As example of such codec time base see ISO/IEC 14496-2:2001(E)
-+ * vop_time_increment_resolution and fixed_vop_rate
-+ * (fixed_vop_rate == 0 implies that it is different from the framerate)
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: the use of this field for decoding is deprecated.
-+ * Use framerate instead.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * For some codecs, the time base is closer to the field rate than the frame
-+ * rate. Most notably, H.264 and MPEG-2 specify time_base as half of frame
-+ * duration if no telecine is used ...
-+ *
-+ * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it
-+ * to 2.
-+ */
-+ int ticks_per_frame;
-+
-+ /**
-+ * Codec delay.
-+ *
-+ * Encoding: Number of frames delay there will be from the encoder input to
-+ * the decoder output. (we assume the decoder matches the spec)
-+ * Decoding: Number of frames delay in addition to what a standard decoder
-+ * as specified in the spec would produce.
-+ *
-+ * Video:
-+ * Number of frames the decoded output will be delayed relative to the
-+ * encoded input.
-+ *
-+ * Audio:
-+ * For encoding, this field is unused (see initial_padding).
-+ *
-+ * For decoding, this is the number of samples the decoder needs to
-+ * output before the decoder's output is valid. When seeking, you should
-+ * start decoding this many samples prior to your desired seek point.
-+ *
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int delay;
-+
-+ /* video only */
-+ /**
-+ * picture width / height.
-+ *
-+ * @note Those fields may not match the values of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: May be set by the user before opening the decoder if known e.g.
-+ * from the container. Some decoders will require the dimensions
-+ * to be set by the caller. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int width, height;
-+
-+ /**
-+ * Bitstream width / height, may be different from width/height e.g. when
-+ * the decoded frame is cropped before being output or lowres is enabled.
-+ *
-+ * @note Those field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: unused
-+ * - decoding: May be set by the user before opening the decoder if known
-+ * e.g. from the container. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int coded_width, coded_height;
-+
-+ /**
-+ * the number of pictures in a group of pictures, or 0 for intra_only
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int gop_size;
-+
-+ /**
-+ * Pixel format, see AV_PIX_FMT_xxx.
-+ * May be set by the demuxer if known from headers.
-+ * May be overridden by the decoder if it knows better.
-+ *
-+ * @note This field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: Set by user if known, overridden by libavcodec while
-+ * parsing the data.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * If non NULL, 'draw_horiz_band' is called by the libavcodec
-+ * decoder to draw a horizontal band. It improves cache usage. Not
-+ * all codecs can do that. You must check the codec capabilities
-+ * beforehand.
-+ * When multithreading is used, it may be called from multiple threads
-+ * at the same time; threads might draw different parts of the same AVFrame,
-+ * or multiple AVFrames, and there is no guarantee that slices will be drawn
-+ * in order.
-+ * The function is also used by hardware acceleration APIs.
-+ * It is called at least once during frame decoding to pass
-+ * the data needed for hardware render.
-+ * In that mode instead of pixel data, AVFrame points to
-+ * a structure specific to the acceleration API. The application
-+ * reads the structure and can change some fields to indicate progress
-+ * or mark state.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ * @param height the height of the slice
-+ * @param y the y position of the slice
-+ * @param type 1->top field, 2->bottom field, 3->frame
-+ * @param offset offset into the AVFrame.data from which the slice should be
-+ * read
-+ */
-+ void (*draw_horiz_band)(struct AVCodecContext* s, const AVFrame* src,
-+ int offset[AV_NUM_DATA_POINTERS], int y, int type,
-+ int height);
-+
-+ /**
-+ * Callback to negotiate the pixel format. Decoding only, may be set by the
-+ * caller before avcodec_open2().
-+ *
-+ * Called by some decoders to select the pixel format that will be used for
-+ * the output frames. This is mainly used to set up hardware acceleration,
-+ * then the provided format list contains the corresponding hwaccel pixel
-+ * formats alongside the "software" one. The software pixel format may also
-+ * be retrieved from \ref sw_pix_fmt.
-+ *
-+ * This callback will be called when the coded frame properties (such as
-+ * resolution, pixel format, etc.) change and more than one output format is
-+ * supported for those new properties. If a hardware pixel format is chosen
-+ * and initialization for it fails, the callback may be called again
-+ * immediately.
-+ *
-+ * This callback may be called from different threads if the decoder is
-+ * multi-threaded, but not from more than one thread simultaneously.
-+ *
-+ * @param fmt list of formats which may be used in the current
-+ * configuration, terminated by AV_PIX_FMT_NONE.
-+ * @warning Behavior is undefined if the callback returns a value other
-+ * than one of the formats in fmt or AV_PIX_FMT_NONE.
-+ * @return the chosen format or AV_PIX_FMT_NONE
-+ */
-+ enum AVPixelFormat (*get_format)(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+ /**
-+ * maximum number of B-frames between non-B-frames
-+ * Note: The output will be delayed by max_b_frames+1 relative to the input.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_b_frames;
-+
-+ /**
-+ * qscale factor between IP and B-frames
-+ * If > 0 then the last P-frame quantizer will be used (q=
-+ * lastp_q*factor+offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_factor;
-+
-+ /**
-+ * qscale offset between IP and B-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_offset;
-+
-+ /**
-+ * Size of the frame reordering buffer in the decoder.
-+ * For MPEG-2 it is 1 IPB or 0 low delay IP.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int has_b_frames;
-+
-+ /**
-+ * qscale factor between P- and I-frames
-+ * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor +
-+ * offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_factor;
-+
-+ /**
-+ * qscale offset between P and I-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_offset;
-+
-+ /**
-+ * luminance masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float lumi_masking;
-+
-+ /**
-+ * temporary complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float temporal_cplx_masking;
-+
-+ /**
-+ * spatial complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float spatial_cplx_masking;
-+
-+ /**
-+ * p block masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float p_masking;
-+
-+ /**
-+ * darkness masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float dark_masking;
-+
-+ /**
-+ * slice count
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user (or 0).
-+ */
-+ int slice_count;
-+
-+ /**
-+ * slice offsets in the frame in bytes
-+ * - encoding: Set/allocated by libavcodec.
-+ * - decoding: Set/allocated by user (or NULL).
-+ */
-+ int* slice_offset;
-+
-+ /**
-+ * sample aspect ratio (0 if unknown)
-+ * That is the width of a pixel divided by the height of the pixel.
-+ * Numerator and denominator must be relatively prime and smaller than 256 for
-+ * some video standards.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_cmp;
-+ /**
-+ * subpixel motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_sub_cmp;
-+ /**
-+ * macroblock comparison function (not supported yet)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_cmp;
-+ /**
-+ * interlaced DCT comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int ildct_cmp;
-+#define FF_CMP_SAD 0
-+#define FF_CMP_SSE 1
-+#define FF_CMP_SATD 2
-+#define FF_CMP_DCT 3
-+#define FF_CMP_PSNR 4
-+#define FF_CMP_BIT 5
-+#define FF_CMP_RD 6
-+#define FF_CMP_ZERO 7
-+#define FF_CMP_VSAD 8
-+#define FF_CMP_VSSE 9
-+#define FF_CMP_NSSE 10
-+#define FF_CMP_W53 11
-+#define FF_CMP_W97 12
-+#define FF_CMP_DCTMAX 13
-+#define FF_CMP_DCT264 14
-+#define FF_CMP_MEDIAN_SAD 15
-+#define FF_CMP_CHROMA 256
-+
-+ /**
-+ * ME diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dia_size;
-+
-+ /**
-+ * amount of previous MV predictors (2a+1 x 2a+1 square)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int last_predictor_count;
-+
-+ /**
-+ * motion estimation prepass comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_pre_cmp;
-+
-+ /**
-+ * ME prepass diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int pre_dia_size;
-+
-+ /**
-+ * subpel ME quality
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_subpel_quality;
-+
-+ /**
-+ * maximum motion estimation search range in subpel units
-+ * If 0 then no limit.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_range;
-+
-+ /**
-+ * slice flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int slice_flags;
-+#define SLICE_FLAG_CODED_ORDER \
-+ 0x0001 ///< draw_horiz_band() is called in coded order instead of display
-+#define SLICE_FLAG_ALLOW_FIELD \
-+ 0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
-+#define SLICE_FLAG_ALLOW_PLANE \
-+ 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-+
-+ /**
-+ * macroblock decision mode
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_decision;
-+#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp
-+#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits
-+#define FF_MB_DECISION_RD 2 ///< rate distortion
-+
-+ /**
-+ * custom intra quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* intra_matrix;
-+
-+ /**
-+ * custom inter quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* inter_matrix;
-+
-+ /**
-+ * precision of the intra DC coefficient - 8
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec
-+ */
-+ int intra_dc_precision;
-+
-+ /**
-+ * Number of macroblock rows at the top which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_top;
-+
-+ /**
-+ * Number of macroblock rows at the bottom which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_bottom;
-+
-+ /**
-+ * minimum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmin;
-+
-+ /**
-+ * maximum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmax;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int bidir_refine;
-+
-+ /**
-+ * minimum GOP size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int keyint_min;
-+
-+ /**
-+ * number of reference frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by lavc.
-+ */
-+ int refs;
-+
-+ /**
-+ * Note: Value depends upon the compare function used for fullpel ME.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mv0_threshold;
-+
-+ /**
-+ * Chromaticity coordinates of the source primaries.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorPrimaries color_primaries;
-+
-+ /**
-+ * Color Transfer Characteristic.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ /**
-+ * This defines the location of chroma samples.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVChromaLocation chroma_sample_location;
-+
-+ /**
-+ * Number of slices.
-+ * Indicates number of picture subdivisions. Used for parallelized
-+ * decoding.
-+ * - encoding: Set by user
-+ * - decoding: unused
-+ */
-+ int slices;
-+
-+ /** Field order
-+ * - encoding: set by libavcodec
-+ * - decoding: Set by user.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /* audio only */
-+ int sample_rate; ///< samples per second
-+ int channels; ///< number of audio channels
-+
-+ /**
-+ * audio sample format
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVSampleFormat sample_fmt; ///< sample format
-+
-+ /* The following data should not be initialized. */
-+ /**
-+ * Number of samples per channel in an audio frame.
-+ *
-+ * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-+ * except the last must contain exactly frame_size samples per channel.
-+ * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then
-+ * the frame size is not restricted.
-+ * - decoding: may be set by some decoders to indicate constant frame size
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Frame counter, set by libavcodec.
-+ *
-+ * - decoding: total number of frames returned from the decoder so far.
-+ * - encoding: total number of frames passed to the encoder so far.
-+ *
-+ * @note the counter is not incremented if encoding/decoding resulted in
-+ * an error.
-+ */
-+ int frame_number;
-+
-+ /**
-+ * number of bytes per packet if constant and known or 0
-+ * Used by some WAV based audio codecs.
-+ */
-+ int block_align;
-+
-+ /**
-+ * Audio cutoff bandwidth (0 means "automatic")
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int cutoff;
-+
-+ /**
-+ * Audio channel layout.
-+ * - encoding: set by user.
-+ * - decoding: set by user, may be overwritten by libavcodec.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * Request decoder to use this channel layout if it can (0 for default)
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ uint64_t request_channel_layout;
-+
-+ /**
-+ * Type of service that the audio stream conveys.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVAudioServiceType audio_service_type;
-+
-+ /**
-+ * desired sample format
-+ * - encoding: Not used.
-+ * - decoding: Set by user.
-+ * Decoder will decode to this format if it can.
-+ */
-+ enum AVSampleFormat request_sample_fmt;
-+
-+ /**
-+ * This callback is called at the beginning of each frame to get data
-+ * buffer(s) for it. There may be one contiguous buffer for all the data or
-+ * there may be a buffer per each data plane or anything in between. What
-+ * this means is, you may set however many entries in buf[] you feel
-+ * necessary. Each buffer must be reference-counted using the AVBuffer API
-+ * (see description of buf[] below).
-+ *
-+ * The following fields will be set in the frame before this callback is
-+ * called:
-+ * - format
-+ * - width, height (video only)
-+ * - sample_rate, channel_layout, nb_samples (audio only)
-+ * Their values may differ from the corresponding values in
-+ * AVCodecContext. This callback must use the frame values, not the codec
-+ * context values, to calculate the required buffer size.
-+ *
-+ * This callback must fill the following fields in the frame:
-+ * - data[]
-+ * - linesize[]
-+ * - extended_data:
-+ * * if the data is planar audio with more than 8 channels, then this
-+ * callback must allocate and fill extended_data to contain all pointers
-+ * to all data planes. data[] must hold as many pointers as it can.
-+ * extended_data must be allocated with av_malloc() and will be freed in
-+ * av_frame_unref().
-+ * * otherwise extended_data must point to data
-+ * - buf[] must contain one or more pointers to AVBufferRef structures. Each
-+ * of the frame's data and extended_data pointers must be contained in these.
-+ * That is, one AVBufferRef for each allocated chunk of memory, not
-+ * necessarily one AVBufferRef per data[] entry. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
-+ * this callback and filled with the extra buffers if there are more
-+ * buffers than buf[] can hold. extended_buf will be freed in
-+ * av_frame_unref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
-+ * avcodec_default_get_buffer2() instead of providing buffers allocated by
-+ * some other means.
-+ *
-+ * Each data plane must be aligned to the maximum required by the target
-+ * CPU.
-+ *
-+ * @see avcodec_default_get_buffer2()
-+ *
-+ * Video:
-+ *
-+ * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
-+ * (read and/or written to if it is writable) later by libavcodec.
-+ *
-+ * avcodec_align_dimensions2() should be used to find the required width and
-+ * height, as they normally need to be rounded up to the next multiple of 16.
-+ *
-+ * Some decoders do not support linesizes changing between frames.
-+ *
-+ * If frame multithreading is used, this callback may be called from a
-+ * different thread, but not from more than one at once. Does not need to be
-+ * reentrant.
-+ *
-+ * @see avcodec_align_dimensions2()
-+ *
-+ * Audio:
-+ *
-+ * Decoders request a buffer of a particular size by setting
-+ * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
-+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
-+ * to a smaller value in the output frame.
-+ *
-+ * As a convenience, av_samples_get_buffer_size() and
-+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
-+ * functions to find the required data size and to fill data pointers and
-+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-+ * since all planes must be the same size.
-+ *
-+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-+ *
-+ * - encoding: unused
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*get_buffer2)(struct AVCodecContext* s, AVFrame* frame, int flags);
-+
-+ /* - encoding parameters */
-+ float qcompress; ///< amount of qscale change between easy & hard scenes
-+ ///< (0.0-1.0)
-+ float qblur; ///< amount of qscale smoothing over time (0.0-1.0)
-+
-+ /**
-+ * minimum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmin;
-+
-+ /**
-+ * maximum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmax;
-+
-+ /**
-+ * maximum quantizer difference between frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_qdiff;
-+
-+ /**
-+ * decoder bitstream buffer size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_buffer_size;
-+
-+ /**
-+ * ratecontrol override, see RcOverride
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ int rc_override_count;
-+ RcOverride* rc_override;
-+
-+ /**
-+ * maximum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: Set by user, may be overwritten by libavcodec.
-+ */
-+ int64_t rc_max_rate;
-+
-+ /**
-+ * minimum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int64_t rc_min_rate;
-+
-+ /**
-+ * Ratecontrol attempt to use, at maximum, <value> of what can be used without
-+ * an underflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_max_available_vbv_use;
-+
-+ /**
-+ * Ratecontrol attempt to use, at least, <value> times the amount needed to
-+ * prevent a vbv overflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_min_vbv_overflow_use;
-+
-+ /**
-+ * Number of bits which should be loaded into the rc buffer before decoding
-+ * starts.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_initial_buffer_occupancy;
-+
-+ /**
-+ * trellis RD quantization
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int trellis;
-+
-+ /**
-+ * pass1 encoding statistics output buffer
-+ * - encoding: Set by libavcodec.
-+ * - decoding: unused
-+ */
-+ char* stats_out;
-+
-+ /**
-+ * pass2 encoding statistics input buffer
-+ * Concatenated stuff from stats_out of pass1 should be placed here.
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ char* stats_in;
-+
-+ /**
-+ * Work around bugs in encoders which sometimes cannot be detected
-+ * automatically.
-+ * - encoding: Set by user
-+ * - decoding: Set by user
-+ */
-+ int workaround_bugs;
-+#define FF_BUG_AUTODETECT 1 ///< autodetection
-+#define FF_BUG_XVID_ILACE 4
-+#define FF_BUG_UMP4 8
-+#define FF_BUG_NO_PADDING 16
-+#define FF_BUG_AMV 32
-+#define FF_BUG_QPEL_CHROMA 64
-+#define FF_BUG_STD_QPEL 128
-+#define FF_BUG_QPEL_CHROMA2 256
-+#define FF_BUG_DIRECT_BLOCKSIZE 512
-+#define FF_BUG_EDGE 1024
-+#define FF_BUG_HPEL_CHROMA 2048
-+#define FF_BUG_DC_CLIP 4096
-+#define FF_BUG_MS \
-+ 8192 ///< Work around various bugs in Microsoft's broken decoders.
-+#define FF_BUG_TRUNCATED 16384
-+#define FF_BUG_IEDGE 32768
-+
-+ /**
-+ * strictly follow the standard (MPEG-4, ...).
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ * Setting this to STRICT or higher means the encoder and decoder will
-+ * generally do stupid things, whereas setting it to unofficial or lower
-+ * will mean the encoder might produce output that is not supported by all
-+ * spec-compliant decoders. Decoders don't differentiate between normal,
-+ * unofficial and experimental (that is, they always try to decode things
-+ * when they can) unless they are explicitly asked to behave stupidly
-+ * (=strictly conform to the specs)
-+ */
-+ int strict_std_compliance;
-+#define FF_COMPLIANCE_VERY_STRICT \
-+ 2 ///< Strictly conform to an older more strict version of the spec or
-+ ///< reference software.
-+#define FF_COMPLIANCE_STRICT \
-+ 1 ///< Strictly conform to all the things in the spec no matter what
-+ ///< consequences.
-+#define FF_COMPLIANCE_NORMAL 0
-+#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions
-+#define FF_COMPLIANCE_EXPERIMENTAL \
-+ -2 ///< Allow nonstandardized experimental things.
-+
-+ /**
-+ * error concealment flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int error_concealment;
-+#define FF_EC_GUESS_MVS 1
-+#define FF_EC_DEBLOCK 2
-+#define FF_EC_FAVOR_INTER 256
-+
-+ /**
-+ * debug
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int debug;
-+#define FF_DEBUG_PICT_INFO 1
-+#define FF_DEBUG_RC 2
-+#define FF_DEBUG_BITSTREAM 4
-+#define FF_DEBUG_MB_TYPE 8
-+#define FF_DEBUG_QP 16
-+#define FF_DEBUG_DCT_COEFF 0x00000040
-+#define FF_DEBUG_SKIP 0x00000080
-+#define FF_DEBUG_STARTCODE 0x00000100
-+#define FF_DEBUG_ER 0x00000400
-+#define FF_DEBUG_MMCO 0x00000800
-+#define FF_DEBUG_BUGS 0x00001000
-+#define FF_DEBUG_BUFFERS 0x00008000
-+#define FF_DEBUG_THREADS 0x00010000
-+#define FF_DEBUG_GREEN_MD 0x00800000
-+#define FF_DEBUG_NOMC 0x01000000
-+
-+ /**
-+ * Error recognition; may misdetect some more or less valid parts as errors.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int err_recognition;
-+
-+/**
-+ * Verify checksums embedded in the bitstream (could be of either encoded or
-+ * decoded data, depending on the codec) and print an error message on mismatch.
-+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
-+ * decoder returning an error.
-+ */
-+#define AV_EF_CRCCHECK (1 << 0)
-+#define AV_EF_BITSTREAM (1 << 1) ///< detect bitstream specification deviations
-+#define AV_EF_BUFFER (1 << 2) ///< detect improper bitstream length
-+#define AV_EF_EXPLODE (1 << 3) ///< abort decoding on minor error detection
-+
-+#define AV_EF_IGNORE_ERR (1 << 15) ///< ignore errors and continue
-+#define AV_EF_CAREFUL \
-+ (1 << 16) ///< consider things that violate the spec, are fast to calculate
-+ ///< and have not been seen in the wild as errors
-+#define AV_EF_COMPLIANT \
-+ (1 << 17) ///< consider all spec non compliances as errors
-+#define AV_EF_AGGRESSIVE \
-+ (1 << 18) ///< consider things that a sane encoder should not do as an error
-+
-+ /**
-+ * opaque 64-bit number (generally a PTS) that will be reordered and
-+ * output in AVFrame.reordered_opaque
-+ * - encoding: Set by libavcodec to the reordered_opaque of the input
-+ * frame corresponding to the last returned packet. Only
-+ * supported by encoders with the
-+ * AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
-+ * - decoding: Set by user.
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Hardware accelerator in use
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec
-+ */
-+ const struct AVHWAccel* hwaccel;
-+
-+ /**
-+ * Hardware accelerator context.
-+ * For some hardware accelerators, a global context needs to be
-+ * provided by the user. In that case, this holds display-dependent
-+ * data FFmpeg cannot instantiate itself. Please refer to the
-+ * FFmpeg HW accelerator documentation to know how to fill this.
-+ * - encoding: unused
-+ * - decoding: Set by user
-+ */
-+ void* hwaccel_context;
-+
-+ /**
-+ * error
-+ * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
-+ * - decoding: unused
-+ */
-+ uint64_t error[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * DCT algorithm, see FF_DCT_* below
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dct_algo;
-+#define FF_DCT_AUTO 0
-+#define FF_DCT_FASTINT 1
-+#define FF_DCT_INT 2
-+#define FF_DCT_MMX 3
-+#define FF_DCT_ALTIVEC 5
-+#define FF_DCT_FAAN 6
-+
-+ /**
-+ * IDCT algorithm, see FF_IDCT_* below.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int idct_algo;
-+#define FF_IDCT_AUTO 0
-+#define FF_IDCT_INT 1
-+#define FF_IDCT_SIMPLE 2
-+#define FF_IDCT_SIMPLEMMX 3
-+#define FF_IDCT_ARM 7
-+#define FF_IDCT_ALTIVEC 8
-+#define FF_IDCT_SIMPLEARM 10
-+#define FF_IDCT_XVID 14
-+#define FF_IDCT_SIMPLEARMV5TE 16
-+#define FF_IDCT_SIMPLEARMV6 17
-+#define FF_IDCT_FAAN 20
-+#define FF_IDCT_SIMPLENEON 22
-+#define FF_IDCT_NONE \
-+ 24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
-+#define FF_IDCT_SIMPLEAUTO 128
-+
-+ /**
-+ * bits per sample/pixel from the demuxer (needed for huffyuv).
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user.
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * Bits per sample/pixel of internal libavcodec pixel/sample format.
-+ * - encoding: set by user.
-+ * - decoding: set by libavcodec.
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int lowres;
-+
-+ /**
-+ * thread count
-+ * is used to decide how many independent tasks should be passed to execute()
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int thread_count;
-+
-+ /**
-+ * Which multithreading methods to use.
-+ * Use of FF_THREAD_FRAME will increase decoding delay by one frame per
-+ * thread, so clients which cannot provide future frames should not use it.
-+ *
-+ * - encoding: Set by user, otherwise the default is used.
-+ * - decoding: Set by user, otherwise the default is used.
-+ */
-+ int thread_type;
-+#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
-+#define FF_THREAD_SLICE \
-+ 2 ///< Decode more than one part of a single frame at once
-+
-+ /**
-+ * Which multithreading methods are in use by the codec.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int active_thread_type;
-+
-+#if FF_API_THREAD_SAFE_CALLBACKS
-+ /**
-+ * Set by the client if its custom get_buffer() callback can be called
-+ * synchronously from another thread, which allows faster multithreaded
-+ * decoding. draw_horiz_band() will be called from other threads regardless of
-+ * this setting. Ignored if the default get_buffer() is used.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ *
-+ * @deprecated the custom get_buffer2() callback should always be
-+ * thread-safe. Thread-unsafe get_buffer2() implementations will be
-+ * invalid starting with LIBAVCODEC_VERSION_MAJOR=60; in other words,
-+ * libavcodec will behave as if this field was always set to 1.
-+ * Callers that want to be forward compatible with future libavcodec
-+ * versions should wrap access to this field in
-+ * #if LIBAVCODEC_VERSION_MAJOR < 60
-+ */
-+ attribute_deprecated int thread_safe_callbacks;
-+#endif
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * @param count the number of things to execute
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg), void* arg2,
-+ int* ret, int count, int size);
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * Also see avcodec_thread_init and e.g. the --enable-pthread configure
-+ * option.
-+ * @param c context passed also to func
-+ * @param count the number of things to execute
-+ * @param arg2 argument passed unchanged to func
-+ * @param ret return values of executed functions, must have space for "count"
-+ * values. May be NULL.
-+ * @param func function that will be called count times, with jobnr from 0 to
-+ * count-1. threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS
-+ * and so that no two instances of func executing at the same time will have
-+ * the same threadnr.
-+ * @return always 0 currently, but code should handle a future improvement
-+ * where when any call to func returns < 0 no further calls to func may be
-+ * done and < 0 is returned.
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute2)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg, int jobnr,
-+ int threadnr),
-+ void* arg2, int* ret, int count);
-+
-+ /**
-+ * noise vs. sse weight for the nsse comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int nsse_weight;
-+
-+ /**
-+ * profile
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int profile;
-+#define FF_PROFILE_UNKNOWN -99
-+#define FF_PROFILE_RESERVED -100
-+
-+#define FF_PROFILE_AAC_MAIN 0
-+#define FF_PROFILE_AAC_LOW 1
-+#define FF_PROFILE_AAC_SSR 2
-+#define FF_PROFILE_AAC_LTP 3
-+#define FF_PROFILE_AAC_HE 4
-+#define FF_PROFILE_AAC_HE_V2 28
-+#define FF_PROFILE_AAC_LD 22
-+#define FF_PROFILE_AAC_ELD 38
-+#define FF_PROFILE_MPEG2_AAC_LOW 128
-+#define FF_PROFILE_MPEG2_AAC_HE 131
-+
-+#define FF_PROFILE_DNXHD 0
-+#define FF_PROFILE_DNXHR_LB 1
-+#define FF_PROFILE_DNXHR_SQ 2
-+#define FF_PROFILE_DNXHR_HQ 3
-+#define FF_PROFILE_DNXHR_HQX 4
-+#define FF_PROFILE_DNXHR_444 5
-+
-+#define FF_PROFILE_DTS 20
-+#define FF_PROFILE_DTS_ES 30
-+#define FF_PROFILE_DTS_96_24 40
-+#define FF_PROFILE_DTS_HD_HRA 50
-+#define FF_PROFILE_DTS_HD_MA 60
-+#define FF_PROFILE_DTS_EXPRESS 70
-+
-+#define FF_PROFILE_MPEG2_422 0
-+#define FF_PROFILE_MPEG2_HIGH 1
-+#define FF_PROFILE_MPEG2_SS 2
-+#define FF_PROFILE_MPEG2_SNR_SCALABLE 3
-+#define FF_PROFILE_MPEG2_MAIN 4
-+#define FF_PROFILE_MPEG2_SIMPLE 5
-+
-+#define FF_PROFILE_H264_CONSTRAINED (1 << 9) // 8+1; constraint_set1_flag
-+#define FF_PROFILE_H264_INTRA (1 << 11) // 8+3; constraint_set3_flag
-+
-+#define FF_PROFILE_H264_BASELINE 66
-+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66 | FF_PROFILE_H264_CONSTRAINED)
-+#define FF_PROFILE_H264_MAIN 77
-+#define FF_PROFILE_H264_EXTENDED 88
-+#define FF_PROFILE_H264_HIGH 100
-+#define FF_PROFILE_H264_HIGH_10 110
-+#define FF_PROFILE_H264_HIGH_10_INTRA (110 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
-+#define FF_PROFILE_H264_HIGH_422 122
-+#define FF_PROFILE_H264_HIGH_422_INTRA (122 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_STEREO_HIGH 128
-+#define FF_PROFILE_H264_HIGH_444 144
-+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
-+#define FF_PROFILE_H264_HIGH_444_INTRA (244 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_CAVLC_444 44
-+
-+#define FF_PROFILE_VC1_SIMPLE 0
-+#define FF_PROFILE_VC1_MAIN 1
-+#define FF_PROFILE_VC1_COMPLEX 2
-+#define FF_PROFILE_VC1_ADVANCED 3
-+
-+#define FF_PROFILE_MPEG4_SIMPLE 0
-+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1
-+#define FF_PROFILE_MPEG4_CORE 2
-+#define FF_PROFILE_MPEG4_MAIN 3
-+#define FF_PROFILE_MPEG4_N_BIT 4
-+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5
-+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6
-+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7
-+#define FF_PROFILE_MPEG4_HYBRID 8
-+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9
-+#define FF_PROFILE_MPEG4_CORE_SCALABLE 10
-+#define FF_PROFILE_MPEG4_ADVANCED_CODING 11
-+#define FF_PROFILE_MPEG4_ADVANCED_CORE 12
-+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
-+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
-+
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 1
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 2
-+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 32768
-+#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
-+#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
-+
-+#define FF_PROFILE_VP9_0 0
-+#define FF_PROFILE_VP9_1 1
-+#define FF_PROFILE_VP9_2 2
-+#define FF_PROFILE_VP9_3 3
-+
-+#define FF_PROFILE_HEVC_MAIN 1
-+#define FF_PROFILE_HEVC_MAIN_10 2
-+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
-+#define FF_PROFILE_HEVC_REXT 4
-+
-+#define FF_PROFILE_VVC_MAIN_10 1
-+#define FF_PROFILE_VVC_MAIN_10_444 33
-+
-+#define FF_PROFILE_AV1_MAIN 0
-+#define FF_PROFILE_AV1_HIGH 1
-+#define FF_PROFILE_AV1_PROFESSIONAL 2
-+
-+#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT 0xc0
-+#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
-+#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT 0xc2
-+#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS 0xc3
-+#define FF_PROFILE_MJPEG_JPEG_LS 0xf7
-+
-+#define FF_PROFILE_SBC_MSBC 1
-+
-+#define FF_PROFILE_PRORES_PROXY 0
-+#define FF_PROFILE_PRORES_LT 1
-+#define FF_PROFILE_PRORES_STANDARD 2
-+#define FF_PROFILE_PRORES_HQ 3
-+#define FF_PROFILE_PRORES_4444 4
-+#define FF_PROFILE_PRORES_XQ 5
-+
-+#define FF_PROFILE_ARIB_PROFILE_A 0
-+#define FF_PROFILE_ARIB_PROFILE_C 1
-+
-+#define FF_PROFILE_KLVA_SYNC 0
-+#define FF_PROFILE_KLVA_ASYNC 1
-+
-+ /**
-+ * level
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int level;
-+#define FF_LEVEL_UNKNOWN -99
-+
-+ /**
-+ * Skip loop filtering for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_loop_filter;
-+
-+ /**
-+ * Skip IDCT/dequantization for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_idct;
-+
-+ /**
-+ * Skip decoding for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_frame;
-+
-+ /**
-+ * Header containing style information for text subtitles.
-+ * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-+ * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-+ * the Format line following. It shouldn't include any Dialogue line.
-+ * - encoding: Set/allocated/freed by user (before avcodec_open2())
-+ * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-+ */
-+ uint8_t* subtitle_header;
-+ int subtitle_header_size;
-+
-+ /**
-+ * Audio only. The number of "priming" samples (padding) inserted by the
-+ * encoder at the beginning of the audio. I.e. this number of leading
-+ * decoded samples must be discarded by the caller to get the original audio
-+ * without leading padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: Set by libavcodec. The timestamps on the output packets are
-+ * adjusted by the encoder so that they always refer to the
-+ * first sample of the data actually contained in the packet,
-+ * including any added padding. E.g. if the timebase is
-+ * 1/samplerate and the timestamp of the first input sample is
-+ * 0, the timestamp of the first output packet will be
-+ * -initial_padding.
-+ */
-+ int initial_padding;
-+
-+ /**
-+ * - decoding: For codecs that store a framerate value in the compressed
-+ * bitstream, the decoder may export it here. { 0, 1} when
-+ * unknown.
-+ * - encoding: May be used to signal the framerate of CFR content to an
-+ * encoder.
-+ */
-+ AVRational framerate;
-+
-+ /**
-+ * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx.
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec before calling get_format()
-+ */
-+ enum AVPixelFormat sw_pix_fmt;
-+
-+ /**
-+ * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
-+ * - encoding unused.
-+ * - decoding set by user.
-+ */
-+ AVRational pkt_timebase;
-+
-+ /**
-+ * AVCodecDescriptor
-+ * - encoding: unused.
-+ * - decoding: set by libavcodec.
-+ */
-+ const AVCodecDescriptor* codec_descriptor;
-+
-+ /**
-+ * Current statistics for PTS correction.
-+ * - decoding: maintained and used by libavcodec, not intended to be used by
-+ * user apps
-+ * - encoding: unused
-+ */
-+ int64_t
-+ pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
-+ int64_t
-+ pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
-+ int64_t pts_correction_last_pts; /// PTS of the last frame
-+ int64_t pts_correction_last_dts; /// DTS of the last frame
-+
-+ /**
-+ * Character encoding of the input subtitles file.
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ char* sub_charenc;
-+
-+ /**
-+ * Subtitles character encoding mode. Formats or codecs might be adjusting
-+ * this setting (if they are doing the conversion themselves for instance).
-+ * - decoding: set by libavcodec
-+ * - encoding: unused
-+ */
-+ int sub_charenc_mode;
-+#define FF_SUB_CHARENC_MODE_DO_NOTHING \
-+ -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8,
-+ ///< or the codec is bitmap for instance)
-+#define FF_SUB_CHARENC_MODE_AUTOMATIC \
-+ 0 ///< libavcodec will select the mode itself
-+#define FF_SUB_CHARENC_MODE_PRE_DECODER \
-+ 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the
-+ ///< decoder, requires iconv
-+#define FF_SUB_CHARENC_MODE_IGNORE \
-+ 2 ///< neither convert the subtitles, nor check them for valid UTF-8
-+
-+ /**
-+ * Skip processing alpha if supported by codec.
-+ * Note that if the format uses pre-multiplied alpha (common with VP6,
-+ * and recommended due to better video quality/compression)
-+ * the image will look as if alpha-blended onto a black background.
-+ * However for formats that do not use pre-multiplied alpha
-+ * there might be serious artefacts (though e.g. libswscale currently
-+ * assumes pre-multiplied alpha anyway).
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int skip_alpha;
-+
-+ /**
-+ * Number of samples to skip after a discontinuity
-+ * - decoding: unused
-+ * - encoding: set by libavcodec
-+ */
-+ int seek_preroll;
-+
-+#if FF_API_DEBUG_MV
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int debug_mv;
-+# define FF_DEBUG_VIS_MV_P_FOR \
-+ 0x00000001 // visualize forward predicted MVs of P frames
-+# define FF_DEBUG_VIS_MV_B_FOR \
-+ 0x00000002 // visualize forward predicted MVs of B frames
-+# define FF_DEBUG_VIS_MV_B_BACK \
-+ 0x00000004 // visualize backward predicted MVs of B frames
-+#endif
-+
-+ /**
-+ * custom intra quantization matrix
-+ * - encoding: Set by user, can be NULL.
-+ * - decoding: unused.
-+ */
-+ uint16_t* chroma_intra_matrix;
-+
-+ /**
-+ * dump format separator.
-+ * can be ", " or "\n " or anything else
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ uint8_t* dump_separator;
-+
-+ /**
-+ * ',' separated list of allowed decoders.
-+ * If NULL then all are allowed
-+ * - encoding: unused
-+ * - decoding: set by user
-+ */
-+ char* codec_whitelist;
-+
-+ /**
-+ * Properties of the stream that gets decoded
-+ * - encoding: unused
-+ * - decoding: set by libavcodec
-+ */
-+ unsigned properties;
-+#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001
-+#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
-+#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004
-+
-+ /**
-+ * Additional data associated with the entire coded stream.
-+ *
-+ * - decoding: unused
-+ * - encoding: may be set by libavcodec after avcodec_open2().
-+ */
-+ AVPacketSideData* coded_side_data;
-+ int nb_coded_side_data;
-+
-+ /**
-+ * A reference to the AVHWFramesContext describing the input (for encoding)
-+ * or output (decoding) frames. The reference is set by the caller and
-+ * afterwards owned (and freed) by libavcodec - it should never be read by
-+ * the caller after being set.
-+ *
-+ * - decoding: This field should be set by the caller from the get_format()
-+ * callback. The previous reference (if any) will always be
-+ * unreffed by libavcodec before the get_format() call.
-+ *
-+ * If the default get_buffer2() is used with a hwaccel pixel
-+ * format, then this AVHWFramesContext will be used for
-+ * allocating the frame buffers.
-+ *
-+ * - encoding: For hardware encoders configured to use a hwaccel pixel
-+ * format, this field should be set by the caller to a reference
-+ * to the AVHWFramesContext describing input frames.
-+ * AVHWFramesContext.format must be equal to
-+ * AVCodecContext.pix_fmt.
-+ *
-+ * This field should be set before avcodec_open2() is called.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+#if FF_API_SUB_TEXT_FORMAT
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int sub_text_format;
-+# define FF_SUB_TEXT_FMT_ASS 0
-+#endif
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: unused
-+ */
-+ int trailing_padding;
-+
-+ /**
-+ * The number of pixels per image to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_pixels;
-+
-+ /**
-+ * A reference to the AVHWDeviceContext describing the device which will
-+ * be used by a hardware encoder/decoder. The reference is set by the
-+ * caller and afterwards owned (and freed) by libavcodec.
-+ *
-+ * This should be used if either the codec device does not require
-+ * hardware frames or any that are used are to be allocated internally by
-+ * libavcodec. If the user wishes to supply any of the frames used as
-+ * encoder input or decoder output then hw_frames_ctx should be used
-+ * instead. When hw_frames_ctx is set in get_format() for a decoder, this
-+ * field will be ignored while decoding the associated stream segment, but
-+ * may again be used on a following one after another get_format() call.
-+ *
-+ * For both encoders and decoders this field should be set before
-+ * avcodec_open2() is called and must not be written to thereafter.
-+ *
-+ * Note that some decoders may require this field to be set initially in
-+ * order to support hw_frames_ctx at all - in that case, all frames
-+ * contexts used must be created on the same device.
-+ */
-+ AVBufferRef* hw_device_ctx;
-+
-+ /**
-+ * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated
-+ * decoding (if active).
-+ * - encoding: unused
-+ * - decoding: Set by user (either before avcodec_open2(), or in the
-+ * AVCodecContext.get_format callback)
-+ */
-+ int hwaccel_flags;
-+
-+ /**
-+ * Video decoding only. Certain video codecs support cropping, meaning that
-+ * only a sub-rectangle of the decoded frame is intended for display. This
-+ * option controls how cropping is handled by libavcodec.
-+ *
-+ * When set to 1 (the default), libavcodec will apply cropping internally.
-+ * I.e. it will modify the output frame width/height fields and offset the
-+ * data pointers (only by as much as possible while preserving alignment, or
-+ * by the full amount if the AV_CODEC_FLAG_UNALIGNED flag is set) so that
-+ * the frames output by the decoder refer only to the cropped area. The
-+ * crop_* fields of the output frames will be zero.
-+ *
-+ * When set to 0, the width/height fields of the output frames will be set
-+ * to the coded dimensions and the crop_* fields will describe the cropping
-+ * rectangle. Applying the cropping is left to the caller.
-+ *
-+ * @warning When hardware acceleration with opaque output frames is used,
-+ * libavcodec is unable to apply cropping from the top/left border.
-+ *
-+ * @note when this option is set to zero, the width/height fields of the
-+ * AVCodecContext and output AVFrames have different meanings. The codec
-+ * context fields store display dimensions (with the coded dimensions in
-+ * coded_width/height), while the frame fields store the coded dimensions
-+ * (with the display dimensions being determined by the crop_* fields).
-+ */
-+ int apply_cropping;
-+
-+ /*
-+ * Video decoding only. Sets the number of extra hardware frames which
-+ * the decoder will allocate for use by the caller. This must be set
-+ * before avcodec_open2() is called.
-+ *
-+ * Some hardware decoders require all frames that they will use for
-+ * output to be defined in advance before decoding starts. For such
-+ * decoders, the hardware frame pool must therefore be of a fixed size.
-+ * The extra frames set here are on top of any number that the decoder
-+ * needs internally in order to operate normally (for example, frames
-+ * used as reference pictures).
-+ */
-+ int extra_hw_frames;
-+
-+ /**
-+ * The percentage of damaged samples to discard a frame.
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int discard_damaged_percentage;
-+
-+ /**
-+ * The number of samples per frame to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_samples;
-+
-+ /**
-+ * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of
-+ * metadata exported in frame, packet, or coded stream side data by
-+ * decoders and encoders.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int export_side_data;
-+
-+ /**
-+ * This callback is called at the beginning of each packet to get a data
-+ * buffer for it.
-+ *
-+ * The following field will be set in the packet before this callback is
-+ * called:
-+ * - size
-+ * This callback must use the above value to calculate the required buffer
-+ * size, which must padded by at least AV_INPUT_BUFFER_PADDING_SIZE bytes.
-+ *
-+ * In some specific cases, the encoder may not use the entire buffer allocated
-+ * by this callback. This will be reflected in the size value in the packet
-+ * once returned by avcodec_receive_packet().
-+ *
-+ * This callback must fill the following fields in the packet:
-+ * - data: alignment requirements for AVPacket apply, if any. Some
-+ * architectures and encoders may benefit from having aligned data.
-+ * - buf: must contain a pointer to an AVBufferRef structure. The packet's
-+ * data pointer must be contained in it. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_encode_buffer() must call
-+ * avcodec_default_get_encode_buffer() instead of providing a buffer allocated
-+ * by some other means.
-+ *
-+ * The flags field may contain a combination of AV_GET_ENCODE_BUFFER_FLAG_
-+ * flags. They may be used for example to hint what use the buffer may get
-+ * after being created. Implementations of this callback may ignore flags they
-+ * don't understand. If AV_GET_ENCODE_BUFFER_FLAG_REF is set in flags then the
-+ * packet may be reused (read and/or written to if it is writable) later by
-+ * libavcodec.
-+ *
-+ * This callback must be thread-safe, as when frame threading is used, it may
-+ * be called from multiple threads simultaneously.
-+ *
-+ * @see avcodec_default_get_encode_buffer()
-+ *
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: unused
-+ */
-+ int (*get_encode_buffer)(struct AVCodecContext* s, AVPacket* pkt, int flags);
-+} AVCodecContext;
-+
-+struct MpegEncContext;
-+
-+/**
-+ * @defgroup lavc_hwaccel AVHWAccel
-+ *
-+ * @note Nothing in this structure should be accessed by the user. At some
-+ * point in future it will not be externally visible at all.
-+ *
-+ * @{
-+ */
-+typedef struct AVHWAccel {
-+ /**
-+ * Name of the hardware accelerated codec.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ */
-+ const char* name;
-+
-+ /**
-+ * Type of codec implemented by the hardware accelerator.
-+ *
-+ * See AVMEDIA_TYPE_xxx
-+ */
-+ enum AVMediaType type;
-+
-+ /**
-+ * Codec implemented by the hardware accelerator.
-+ *
-+ * See AV_CODEC_ID_xxx
-+ */
-+ enum AVCodecID id;
-+
-+ /**
-+ * Supported pixel format.
-+ *
-+ * Only hardware accelerated formats are supported here.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * Hardware accelerated codec capabilities.
-+ * see AV_HWACCEL_CODEC_CAP_*
-+ */
-+ int capabilities;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ /**
-+ * Allocate a custom buffer
-+ */
-+ int (*alloc_frame)(AVCodecContext* avctx, AVFrame* frame);
-+
-+ /**
-+ * Called at the beginning of each frame or field picture.
-+ *
-+ * Meaningful frame information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ *
-+ * Note that buf can be NULL along with buf_size set to 0.
-+ * Otherwise, this means the whole frame is available at this point.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the frame data buffer base
-+ * @param buf_size the size of the frame in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*start_frame)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for parameter data (SPS/PPS/VPS etc).
-+ *
-+ * Useful for hardware decoders which keep persistent state about the
-+ * video parameters, and need to receive any changes to update that state.
-+ *
-+ * @param avctx the codec context
-+ * @param type the nal unit type
-+ * @param buf the nal unit data buffer
-+ * @param buf_size the size of the nal unit in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_params)(AVCodecContext* avctx, int type, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for each slice.
-+ *
-+ * Meaningful slice information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ * The only exception is XvMC, that works on MB level.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the slice data buffer base
-+ * @param buf_size the size of the slice in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_slice)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Called at the end of each frame or field picture.
-+ *
-+ * The whole picture is parsed at this point and can now be sent
-+ * to the hardware accelerator. This function is mandatory.
-+ *
-+ * @param avctx the codec context
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*end_frame)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of per-frame hardware accelerator private data.
-+ *
-+ * Private data is allocated with av_mallocz() before
-+ * AVCodecContext.get_buffer() and deallocated after
-+ * AVCodecContext.release_buffer().
-+ */
-+ int frame_priv_data_size;
-+
-+ /**
-+ * Called for every Macroblock in a slice.
-+ *
-+ * XvMC uses it to replace the ff_mpv_reconstruct_mb().
-+ * Instead of decoding to raw picture, MB parameters are
-+ * stored in an array provided by the video driver.
-+ *
-+ * @param s the mpeg context
-+ */
-+ void (*decode_mb)(struct MpegEncContext* s);
-+
-+ /**
-+ * Initialize the hwaccel private data.
-+ *
-+ * This will be called from ff_get_format(), after hwaccel and
-+ * hwaccel_context are set and the hwaccel private data in AVCodecInternal
-+ * is allocated.
-+ */
-+ int (*init)(AVCodecContext* avctx);
-+
-+ /**
-+ * Uninitialize the hwaccel private data.
-+ *
-+ * This will be called from get_format() or avcodec_close(), after hwaccel
-+ * and hwaccel_context are already uninitialized.
-+ */
-+ int (*uninit)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of the private data to allocate in
-+ * AVCodecInternal.hwaccel_priv_data.
-+ */
-+ int priv_data_size;
-+
-+ /**
-+ * Internal hwaccel capabilities.
-+ */
-+ int caps_internal;
-+
-+ /**
-+ * Fill the given hw_frames context with current codec parameters. Called
-+ * from get_format. Refer to avcodec_get_hw_frames_parameters() for
-+ * details.
-+ *
-+ * This CAN be called before AVHWAccel.init is called, and you must assume
-+ * that avctx->hwaccel_priv_data is invalid.
-+ */
-+ int (*frame_params)(AVCodecContext* avctx, AVBufferRef* hw_frames_ctx);
-+} AVHWAccel;
-+
-+/**
-+ * HWAccel is experimental and is thus avoided in favor of non experimental
-+ * codecs
-+ */
-+#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
-+
-+/**
-+ * Hardware acceleration should be used for decoding even if the codec level
-+ * used is unknown or higher than the maximum supported level reported by the
-+ * hardware driver.
-+ *
-+ * It's generally a good idea to pass this flag unless you have a specific
-+ * reason not to, as hardware tends to under-report supported levels.
-+ */
-+#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
-+
-+/**
-+ * Hardware acceleration can output YUV pixel formats with a different chroma
-+ * sampling than 4:2:0 and/or other than 8 bits per component.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
-+
-+/**
-+ * Hardware acceleration should still be attempted for decoding when the
-+ * codec profile does not match the reported capabilities of the hardware.
-+ *
-+ * For example, this can be used to try to decode baseline profile H.264
-+ * streams in hardware - it will often succeed, because many streams marked
-+ * as baseline profile actually conform to constrained baseline profile.
-+ *
-+ * @warning If the stream is actually not supported then the behaviour is
-+ * undefined, and may include returning entirely incorrect output
-+ * while indicating success.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
-+
-+/**
-+ * @}
-+ */
-+
-+enum AVSubtitleType {
-+ SUBTITLE_NONE,
-+
-+ SUBTITLE_BITMAP, ///< A bitmap, pict will be set
-+
-+ /**
-+ * Plain text, the text field must be set by the decoder and is
-+ * authoritative. ass and pict fields may contain approximations.
-+ */
-+ SUBTITLE_TEXT,
-+
-+ /**
-+ * Formatted text, the ass field must be set by the decoder and is
-+ * authoritative. pict and text fields may contain approximations.
-+ */
-+ SUBTITLE_ASS,
-+};
-+
-+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-+
-+typedef struct AVSubtitleRect {
-+ int x; ///< top left corner of pict, undefined when pict is not set
-+ int y; ///< top left corner of pict, undefined when pict is not set
-+ int w; ///< width of pict, undefined when pict is not set
-+ int h; ///< height of pict, undefined when pict is not set
-+ int nb_colors; ///< number of colors in pict, undefined when pict is not set
-+
-+ /**
-+ * data+linesize for the bitmap of this subtitle.
-+ * Can be set for text/ass as well once they are rendered.
-+ */
-+ uint8_t* data[4];
-+ int linesize[4];
-+
-+ enum AVSubtitleType type;
-+
-+ char* text; ///< 0 terminated plain UTF-8 text
-+
-+ /**
-+ * 0 terminated ASS/SSA compatible event line.
-+ * The presentation of this is unaffected by the other values in this
-+ * struct.
-+ */
-+ char* ass;
-+
-+ int flags;
-+} AVSubtitleRect;
-+
-+typedef struct AVSubtitle {
-+ uint16_t format; /* 0 = graphics */
-+ uint32_t start_display_time; /* relative to packet pts, in ms */
-+ uint32_t end_display_time; /* relative to packet pts, in ms */
-+ unsigned num_rects;
-+ AVSubtitleRect** rects;
-+ int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
-+} AVSubtitle;
-+
-+/**
-+ * Return the LIBAVCODEC_VERSION_INT constant.
-+ */
-+unsigned avcodec_version(void);
-+
-+/**
-+ * Return the libavcodec build-time configuration.
-+ */
-+const char* avcodec_configuration(void);
-+
-+/**
-+ * Return the libavcodec license.
-+ */
-+const char* avcodec_license(void);
-+
-+/**
-+ * Allocate an AVCodecContext and set its fields to default values. The
-+ * resulting struct should be freed with avcodec_free_context().
-+ *
-+ * @param codec if non-NULL, allocate private data and initialize defaults
-+ * for the given codec. It is illegal to then call avcodec_open2()
-+ * with a different codec.
-+ * If NULL, then the codec-specific defaults won't be initialized,
-+ * which may result in suboptimal default settings (this is
-+ * important mainly for encoders, e.g. libx264).
-+ *
-+ * @return An AVCodecContext filled with default values or NULL on failure.
-+ */
-+AVCodecContext* avcodec_alloc_context3(const AVCodec* codec);
-+
-+/**
-+ * Free the codec context and everything associated with it and write NULL to
-+ * the provided pointer.
-+ */
-+void avcodec_free_context(AVCodecContext** avctx);
-+
-+/**
-+ * Get the AVClass for AVCodecContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_class(void);
-+
-+#if FF_API_GET_FRAME_CLASS
-+/**
-+ * @deprecated This function should not be used.
-+ */
-+attribute_deprecated const AVClass* avcodec_get_frame_class(void);
-+#endif
-+
-+/**
-+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_subtitle_rect_class(void);
-+
-+/**
-+ * Fill the parameters struct based on the values from the supplied codec
-+ * context. Any allocated fields in par are freed and replaced with duplicates
-+ * of the corresponding fields in codec.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure
-+ */
-+int avcodec_parameters_from_context(AVCodecParameters* par,
-+ const AVCodecContext* codec);
-+
-+/**
-+ * Fill the codec context based on the values from the supplied codec
-+ * parameters. Any allocated fields in codec that have a corresponding field in
-+ * par are freed and replaced with duplicates of the corresponding field in par.
-+ * Fields in codec that do not have a counterpart in par are not touched.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_to_context(AVCodecContext* codec,
-+ const AVCodecParameters* par);
-+
-+/**
-+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
-+ * function the context has to be allocated with avcodec_alloc_context3().
-+ *
-+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
-+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
-+ * retrieving a codec.
-+ *
-+ * @warning This function is not thread safe!
-+ *
-+ * @note Always call this function before using decoding routines (such as
-+ * @ref avcodec_receive_frame()).
-+ *
-+ * @code
-+ * av_dict_set(&opts, "b", "2.5M", 0);
-+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
-+ * if (!codec)
-+ * exit(1);
-+ *
-+ * context = avcodec_alloc_context3(codec);
-+ *
-+ * if (avcodec_open2(context, codec, opts) < 0)
-+ * exit(1);
-+ * @endcode
-+ *
-+ * @param avctx The context to initialize.
-+ * @param codec The codec to open this context for. If a non-NULL codec has been
-+ * previously passed to avcodec_alloc_context3() or
-+ * for this context, then this parameter MUST be either NULL or
-+ * equal to the previously passed codec.
-+ * @param options A dictionary filled with AVCodecContext and codec-private
-+ * options. On return this object will be filled with options that were not
-+ * found.
-+ *
-+ * @return zero on success, a negative value on error
-+ * @see avcodec_alloc_context3(), avcodec_find_decoder(),
-+ * avcodec_find_encoder(), av_dict_set(), av_opt_find().
-+ */
-+int avcodec_open2(AVCodecContext* avctx, const AVCodec* codec,
-+ AVDictionary** options);
-+
-+/**
-+ * Close a given AVCodecContext and free all the data associated with it
-+ * (but not the AVCodecContext itself).
-+ *
-+ * Calling this function on an AVCodecContext that hasn't been opened will free
-+ * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
-+ * codec. Subsequent calls will do nothing.
-+ *
-+ * @note Do not use this function. Use avcodec_free_context() to destroy a
-+ * codec context (either open or closed). Opening and closing a codec context
-+ * multiple times is not supported anymore -- use multiple codec contexts
-+ * instead.
-+ */
-+int avcodec_close(AVCodecContext* avctx);
-+
-+/**
-+ * Free all allocated data in the given subtitle struct.
-+ *
-+ * @param sub AVSubtitle to free.
-+ */
-+void avsubtitle_free(AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_decoding
-+ * @{
-+ */
-+
-+/**
-+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
-+ * it can be called by custom get_buffer2() implementations for decoders without
-+ * AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_buffer2(AVCodecContext* s, AVFrame* frame, int flags);
-+
-+/**
-+ * The default callback for AVCodecContext.get_encode_buffer(). It is made
-+ * public so it can be called by custom get_encode_buffer() implementations for
-+ * encoders without AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_encode_buffer(AVCodecContext* s, AVPacket* pkt,
-+ int flags);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you do not use any horizontal
-+ * padding.
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions(AVCodecContext* s, int* width, int* height);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you also ensure that all
-+ * line sizes are a multiple of the respective linesize_align[i].
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions2(AVCodecContext* s, int* width, int* height,
-+ int linesize_align[AV_NUM_DATA_POINTERS]);
-+
-+/**
-+ * Converts AVChromaLocation to swscale x/y chroma position.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+int avcodec_enum_to_chroma_pos(int* xpos, int* ypos, enum AVChromaLocation pos);
-+
-+/**
-+ * Converts swscale x/y chroma position to AVChromaLocation.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-+
-+/**
-+ * Decode a subtitle message.
-+ * Return a negative value on error, otherwise return the number of bytes used.
-+ * If no subtitle could be decompressed, got_sub_ptr is zero.
-+ * Otherwise, the subtitle is stored in *sub.
-+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
-+ * simplicity, because the performance difference is expected to be negligible
-+ * and reusing a get_buffer written for video codecs would probably perform
-+ * badly due to a potentially very different allocation pattern.
-+ *
-+ * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between
-+ * input and output. This means that for some packets they will not immediately
-+ * produce decoded output and need to be flushed at the end of decoding to get
-+ * all the decoded data. Flushing is done by calling this function with packets
-+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
-+ * returning subtitles. It is safe to flush even those decoders that are not
-+ * marked with AV_CODEC_CAP_DELAY, then no subtitles will be returned.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx the codec context
-+ * @param[out] sub The preallocated AVSubtitle in which the decoded subtitle
-+ * will be stored, must be freed with avsubtitle_free if *got_sub_ptr is set.
-+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed,
-+ * otherwise, it is nonzero.
-+ * @param[in] avpkt The input AVPacket containing the input buffer.
-+ */
-+int avcodec_decode_subtitle2(AVCodecContext* avctx, AVSubtitle* sub,
-+ int* got_sub_ptr, AVPacket* avpkt);
-+
-+/**
-+ * Supply raw packet data as input to a decoder.
-+ *
-+ * Internally, this call will copy relevant AVCodecContext fields, which can
-+ * influence decoding per-packet, and apply them when the packet is actually
-+ * decoded. (For example AVCodecContext.skip_frame, which might direct the
-+ * decoder to drop the frame contained by the packet sent with this function.)
-+ *
-+ * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE
-+ * larger than the actual read bytes because some optimized bitstream
-+ * readers read 32 or 64 bits at once and could read over the end.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx codec context
-+ * @param[in] avpkt The input AVPacket. Usually, this will be a single video
-+ * frame, or several complete audio frames.
-+ * Ownership of the packet remains with the caller, and the
-+ * decoder will not write to the packet. The decoder may create
-+ * a reference to the packet data (or copy it if the packet is
-+ * not reference-counted).
-+ * Unlike with older APIs, the packet is always fully consumed,
-+ * and if it contains multiple frames (e.g. some audio codecs),
-+ * will require you to call avcodec_receive_frame() multiple
-+ * times afterwards before you can send a new packet.
-+ * It can be NULL (or an AVPacket with data set to NULL and
-+ * size set to 0); in this case, it is considered a flush
-+ * packet, which signals the end of the stream. Sending the
-+ * first flush packet will return success. Subsequent ones are
-+ * unnecessary and will return AVERROR_EOF. If the decoder
-+ * still has frames buffered, it will return them after sending
-+ * a flush packet.
-+ *
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_frame() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the decoder has been flushed, and no new packets can
-+ * be sent to it (also returned if more than 1 flush
-+ * packet is sent)
-+ * AVERROR(EINVAL): codec not opened, it is an encoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate decoding errors
-+ */
-+int avcodec_send_packet(AVCodecContext* avctx, const AVPacket* avpkt);
-+
-+/**
-+ * Return decoded output data from a decoder.
-+ *
-+ * @param avctx codec context
-+ * @param frame This will be set to a reference-counted video or audio
-+ * frame (depending on the decoder type) allocated by the
-+ * decoder. Note that the function will always call
-+ * av_frame_unref(frame) before doing anything else.
-+ *
-+ * @return
-+ * 0: success, a frame was returned
-+ * AVERROR(EAGAIN): output is not available in this state - user must try
-+ * to send new input
-+ * AVERROR_EOF: the decoder has been fully flushed, and there will be
-+ * no more output frames
-+ * AVERROR(EINVAL): codec not opened, or it is an encoder
-+ * AVERROR_INPUT_CHANGED: current decoded frame has changed parameters
-+ * with respect to first decoded frame. Applicable
-+ * when flag AV_CODEC_FLAG_DROPCHANGED is set.
-+ * other negative values: legitimate decoding errors
-+ */
-+int avcodec_receive_frame(AVCodecContext* avctx, AVFrame* frame);
-+
-+/**
-+ * Supply a raw video or audio frame to the encoder. Use
-+ * avcodec_receive_packet() to retrieve buffered output packets.
-+ *
-+ * @param avctx codec context
-+ * @param[in] frame AVFrame containing the raw audio or video frame to be
-+ * encoded. Ownership of the frame remains with the caller, and the encoder will
-+ * not write to the frame. The encoder may create a reference to the frame data
-+ * (or copy it if the frame is not reference-counted). It can be NULL, in which
-+ * case it is considered a flush packet. This signals the end of the stream. If
-+ * the encoder still has packets buffered, it will return them after this call.
-+ * Once flushing mode has been entered, additional flush packets are ignored,
-+ * and sending frames will return AVERROR_EOF.
-+ *
-+ * For audio:
-+ * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
-+ * can have any number of samples.
-+ * If it is not set, frame->nb_samples must be equal to
-+ * avctx->frame_size for all frames except the last.
-+ * The final frame may be smaller than avctx->frame_size.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_packet() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the encoder has been flushed, and no new frames can
-+ * be sent to it
-+ * AVERROR(EINVAL): codec not opened, it is a decoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_send_frame(AVCodecContext* avctx, const AVFrame* frame);
-+
-+/**
-+ * Read encoded data from the encoder.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt This will be set to a reference-counted packet allocated by the
-+ * encoder. Note that the function will always call
-+ * av_packet_unref(avpkt) before doing anything else.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): output is not available in the current state - user
-+ * must try to send input
-+ * AVERROR_EOF: the encoder has been fully flushed, and there will be
-+ * no more output packets
-+ * AVERROR(EINVAL): codec not opened, or it is a decoder
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_receive_packet(AVCodecContext* avctx, AVPacket* avpkt);
-+
-+/**
-+ * Create and return a AVHWFramesContext with values adequate for hardware
-+ * decoding. This is meant to get called from the get_format callback, and is
-+ * a helper for preparing a AVHWFramesContext for AVCodecContext.hw_frames_ctx.
-+ * This API is for decoding with certain hardware acceleration modes/APIs only.
-+ *
-+ * The returned AVHWFramesContext is not initialized. The caller must do this
-+ * with av_hwframe_ctx_init().
-+ *
-+ * Calling this function is not a requirement, but makes it simpler to avoid
-+ * codec or hardware API specific details when manually allocating frames.
-+ *
-+ * Alternatively to this, an API user can set AVCodecContext.hw_device_ctx,
-+ * which sets up AVCodecContext.hw_frames_ctx fully automatically, and makes
-+ * it unnecessary to call this function or having to care about
-+ * AVHWFramesContext initialization at all.
-+ *
-+ * There are a number of requirements for calling this function:
-+ *
-+ * - It must be called from get_format with the same avctx parameter that was
-+ * passed to get_format. Calling it outside of get_format is not allowed, and
-+ * can trigger undefined behavior.
-+ * - The function is not always supported (see description of return values).
-+ * Even if this function returns successfully, hwaccel initialization could
-+ * fail later. (The degree to which implementations check whether the stream
-+ * is actually supported varies. Some do this check only after the user's
-+ * get_format callback returns.)
-+ * - The hw_pix_fmt must be one of the choices suggested by get_format. If the
-+ * user decides to use a AVHWFramesContext prepared with this API function,
-+ * the user must return the same hw_pix_fmt from get_format.
-+ * - The device_ref passed to this function must support the given hw_pix_fmt.
-+ * - After calling this API function, it is the user's responsibility to
-+ * initialize the AVHWFramesContext (returned by the out_frames_ref
-+ * parameter), and to set AVCodecContext.hw_frames_ctx to it. If done, this must
-+ * be done before returning from get_format (this is implied by the normal
-+ * AVCodecContext.hw_frames_ctx API rules).
-+ * - The AVHWFramesContext parameters may change every time time get_format is
-+ * called. Also, AVCodecContext.hw_frames_ctx is reset before get_format. So
-+ * you are inherently required to go through this process again on every
-+ * get_format call.
-+ * - It is perfectly possible to call this function without actually using
-+ * the resulting AVHWFramesContext. One use-case might be trying to reuse a
-+ * previously initialized AVHWFramesContext, and calling this API function
-+ * only to test whether the required frame parameters have changed.
-+ * - Fields that use dynamically allocated values of any kind must not be set
-+ * by the user unless setting them is explicitly allowed by the documentation.
-+ * If the user sets AVHWFramesContext.free and AVHWFramesContext.user_opaque,
-+ * the new free callback must call the potentially set previous free callback.
-+ * This API call may set any dynamically allocated fields, including the free
-+ * callback.
-+ *
-+ * The function will set at least the following fields on AVHWFramesContext
-+ * (potentially more, depending on hwaccel API):
-+ *
-+ * - All fields set by av_hwframe_ctx_alloc().
-+ * - Set the format field to hw_pix_fmt.
-+ * - Set the sw_format field to the most suited and most versatile format. (An
-+ * implication is that this will prefer generic formats over opaque formats
-+ * with arbitrary restrictions, if possible.)
-+ * - Set the width/height fields to the coded frame size, rounded up to the
-+ * API-specific minimum alignment.
-+ * - Only _if_ the hwaccel requires a pre-allocated pool: set the
-+ * initial_pool_size field to the number of maximum reference surfaces possible
-+ * with the codec, plus 1 surface for the user to work (meaning the user can
-+ * safely reference at most 1 decoded surface at a time), plus additional
-+ * buffering introduced by frame threading. If the hwaccel does not require
-+ * pre-allocation, the field is left to 0, and the decoder will allocate new
-+ * surfaces on demand during decoding.
-+ * - Possibly AVHWFramesContext.hwctx fields, depending on the underlying
-+ * hardware API.
-+ *
-+ * Essentially, out_frames_ref returns the same as av_hwframe_ctx_alloc(), but
-+ * with basic frame parameters set.
-+ *
-+ * The function is stateless, and does not change the AVCodecContext or the
-+ * device_ref AVHWDeviceContext.
-+ *
-+ * @param avctx The context which is currently calling get_format, and which
-+ * implicitly contains all state needed for filling the returned
-+ * AVHWFramesContext properly.
-+ * @param device_ref A reference to the AVHWDeviceContext describing the device
-+ * which will be used by the hardware decoder.
-+ * @param hw_pix_fmt The hwaccel format you are going to return from get_format.
-+ * @param out_frames_ref On success, set to a reference to an _uninitialized_
-+ * AVHWFramesContext, created from the given device_ref.
-+ * Fields will be set to values required for decoding.
-+ * Not changed if an error is returned.
-+ * @return zero on success, a negative value on error. The following error codes
-+ * have special semantics:
-+ * AVERROR(ENOENT): the decoder does not support this functionality. Setup
-+ * is always manual, or it is a decoder which does not
-+ * support setting AVCodecContext.hw_frames_ctx at all,
-+ * or it is a software format.
-+ * AVERROR(EINVAL): it is known that hardware decoding is not supported for
-+ * this configuration, or the device_ref is not supported
-+ * for the hwaccel referenced by hw_pix_fmt.
-+ */
-+int avcodec_get_hw_frames_parameters(AVCodecContext* avctx,
-+ AVBufferRef* device_ref,
-+ enum AVPixelFormat hw_pix_fmt,
-+ AVBufferRef** out_frames_ref);
-+
-+/**
-+ * @defgroup lavc_parsing Frame parsing
-+ * @{
-+ */
-+
-+enum AVPictureStructure {
-+ AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
-+ AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
-+ AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
-+ AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
-+};
-+
-+typedef struct AVCodecParserContext {
-+ void* priv_data;
-+ const struct AVCodecParser* parser;
-+ int64_t frame_offset; /* offset of the current frame */
-+ int64_t cur_offset; /* current offset
-+ (incremented by each av_parser_parse()) */
-+ int64_t next_frame_offset; /* offset of the next frame */
-+ /* video info */
-+ int pict_type; /* XXX: Put it back in AVCodecContext. */
-+ /**
-+ * This field is used for proper frame duration computation in lavf.
-+ * It signals, how much longer the frame duration of the current frame
-+ * is compared to normal frame duration.
-+ *
-+ * frame_duration = (1 + repeat_pict) * time_base
-+ *
-+ * It is used by codecs like H.264 to display telecined material.
-+ */
-+ int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-+ int64_t pts; /* pts of the current frame */
-+ int64_t dts; /* dts of the current frame */
-+
-+ /* private data */
-+ int64_t last_pts;
-+ int64_t last_dts;
-+ int fetch_timestamp;
-+
-+#define AV_PARSER_PTS_NB 4
-+ int cur_frame_start_index;
-+ int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-+
-+ int flags;
-+#define PARSER_FLAG_COMPLETE_FRAMES 0x0001
-+#define PARSER_FLAG_ONCE 0x0002
-+/// Set if the parser has a valid file offset
-+#define PARSER_FLAG_FETCHED_OFFSET 0x0004
-+#define PARSER_FLAG_USE_CODEC_TS 0x1000
-+
-+ int64_t offset; ///< byte offset from starting packet start
-+ int64_t cur_frame_end[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Set by parser to 1 for key frames and 0 for non-key frames.
-+ * It is initialized to -1, so if the parser doesn't set this flag,
-+ * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-+ * will be used.
-+ */
-+ int key_frame;
-+
-+ // Timestamp generation support:
-+ /**
-+ * Synchronization point for start of timestamp generation.
-+ *
-+ * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-+ * (default).
-+ *
-+ * For example, this corresponds to presence of H.264 buffering period
-+ * SEI message.
-+ */
-+ int dts_sync_point;
-+
-+ /**
-+ * Offset of the current timestamp against last timestamp sync point in
-+ * units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain a valid timestamp offset.
-+ *
-+ * Note that the timestamp of sync point has usually a nonzero
-+ * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-+ * the next frame after timestamp sync point will be usually 1.
-+ *
-+ * For example, this corresponds to H.264 cpb_removal_delay.
-+ */
-+ int dts_ref_dts_delta;
-+
-+ /**
-+ * Presentation delay of current frame in units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain valid non-negative timestamp delta (presentation time of a frame
-+ * must not lie in the past).
-+ *
-+ * This delay represents the difference between decoding and presentation
-+ * time of the frame.
-+ *
-+ * For example, this corresponds to H.264 dpb_output_delay.
-+ */
-+ int pts_dts_delta;
-+
-+ /**
-+ * Position of the packet in file.
-+ *
-+ * Analogous to cur_frame_pts/dts
-+ */
-+ int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Byte position of currently parsed frame in stream.
-+ */
-+ int64_t pos;
-+
-+ /**
-+ * Previous frame byte position.
-+ */
-+ int64_t last_pos;
-+
-+ /**
-+ * Duration of the current frame.
-+ * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-+ * For all other types, this is in units of AVCodecContext.time_base.
-+ */
-+ int duration;
-+
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Indicate whether a picture is coded as a frame, top field or bottom field.
-+ *
-+ * For example, H.264 field_pic_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
-+ * equal to 1 and bottom_field_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_TOP_FIELD.
-+ */
-+ enum AVPictureStructure picture_structure;
-+
-+ /**
-+ * Picture number incremented in presentation or output order.
-+ * This field may be reinitialized at the first picture of a new sequence.
-+ *
-+ * For example, this corresponds to H.264 PicOrderCnt.
-+ */
-+ int output_picture_number;
-+
-+ /**
-+ * Dimensions of the decoded video intended for presentation.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Dimensions of the coded video.
-+ */
-+ int coded_width;
-+ int coded_height;
-+
-+ /**
-+ * The format of the coded data, corresponds to enum AVPixelFormat for video
-+ * and for enum AVSampleFormat for audio.
-+ *
-+ * Note that a decoder can have considerable freedom in how exactly it
-+ * decodes the data, so the format reported here might be different from the
-+ * one returned by a decoder.
-+ */
-+ int format;
-+} AVCodecParserContext;
-+
-+typedef struct AVCodecParser {
-+ int codec_ids[7]; /* several codec IDs are permitted */
-+ int priv_data_size;
-+ int (*parser_init)(AVCodecParserContext* s);
-+ /* This callback never returns an error, a negative value means that
-+ * the frame start was in a previous packet. */
-+ int (*parser_parse)(AVCodecParserContext* s, AVCodecContext* avctx,
-+ const uint8_t** poutbuf, int* poutbuf_size,
-+ const uint8_t* buf, int buf_size);
-+ void (*parser_close)(AVCodecParserContext* s);
-+ int (*split)(AVCodecContext* avctx, const uint8_t* buf, int buf_size);
-+} AVCodecParser;
-+
-+/**
-+ * Iterate over all registered codec parsers.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec parser or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodecParser* av_parser_iterate(void** opaque);
-+
-+AVCodecParserContext* av_parser_init(int codec_id);
-+
-+/**
-+ * Parse a packet.
-+ *
-+ * @param s parser context.
-+ * @param avctx codec context.
-+ * @param poutbuf set to pointer to parsed buffer or NULL if not yet
-+ finished.
-+ * @param poutbuf_size set to size of parsed buffer or zero if not yet
-+ finished.
-+ * @param buf input buffer.
-+ * @param buf_size buffer size in bytes without the padding. I.e. the full
-+ buffer size is assumed to be buf_size + AV_INPUT_BUFFER_PADDING_SIZE. To signal
-+ EOF, this should be 0 (so that the last frame can be output).
-+ * @param pts input presentation timestamp.
-+ * @param dts input decoding timestamp.
-+ * @param pos input byte position in stream.
-+ * @return the number of bytes of the input bitstream used.
-+ *
-+ * Example:
-+ * @code
-+ * while(in_len){
-+ * len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
-+ * in_data, in_len,
-+ * pts, dts, pos);
-+ * in_data += len;
-+ * in_len -= len;
-+ *
-+ * if(size)
-+ * decode_frame(data, size);
-+ * }
-+ * @endcode
-+ */
-+int av_parser_parse2(AVCodecParserContext* s, AVCodecContext* avctx,
-+ uint8_t** poutbuf, int* poutbuf_size, const uint8_t* buf,
-+ int buf_size, int64_t pts, int64_t dts, int64_t pos);
-+
-+void av_parser_close(AVCodecParserContext* s);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_encoding
-+ * @{
-+ */
-+
-+int avcodec_encode_subtitle(AVCodecContext* avctx, uint8_t* buf, int buf_size,
-+ const AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_misc Utility functions
-+ * @ingroup libavc
-+ *
-+ * Miscellaneous utility functions related to both encoding and decoding
-+ * (or neither).
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup lavc_misc_pixfmt Pixel formats
-+ *
-+ * Functions for working with pixel formats.
-+ * @{
-+ */
-+
-+/**
-+ * Return a value representing the fourCC code associated to the
-+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
-+ * found.
-+ */
-+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-+
-+/**
-+ * Find the best pixel format to convert to given a certain source pixel
-+ * format. When converting from one pixel format to another, information loss
-+ * may occur. For example, when converting from RGB24 to GRAY, the color
-+ * information will be lost. Similarly, other losses occur when converting from
-+ * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches
-+ * which of the given pixel formats should be used to suffer the least amount of
-+ * loss. The pixel formats from which it chooses one, are determined by the
-+ * pix_fmt_list parameter.
-+ *
-+ *
-+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to
-+ * choose from
-+ * @param[in] src_pix_fmt source pixel format
-+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
-+ * @param[out] loss_ptr Combination of flags informing you what kind of losses
-+ * will occur.
-+ * @return The best pixel format to convert to or -1 if none was found.
-+ */
-+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(
-+ const enum AVPixelFormat* pix_fmt_list, enum AVPixelFormat src_pix_fmt,
-+ int has_alpha, int* loss_ptr);
-+
-+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+/**
-+ * @}
-+ */
-+
-+void avcodec_string(char* buf, int buf_size, AVCodecContext* enc, int encode);
-+
-+int avcodec_default_execute(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2),
-+ void* arg, int* ret, int count, int size);
-+int avcodec_default_execute2(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2, int,
-+ int),
-+ void* arg, int* ret, int count);
-+// FIXME func typedef
-+
-+/**
-+ * Fill AVFrame audio data and linesize pointers.
-+ *
-+ * The buffer buf must be a preallocated buffer with a size big enough
-+ * to contain the specified samples amount. The filled AVFrame data
-+ * pointers will point to this buffer.
-+ *
-+ * AVFrame extended_data channel pointers are allocated if necessary for
-+ * planar audio.
-+ *
-+ * @param frame the AVFrame
-+ * frame->nb_samples must be set prior to calling the
-+ * function. This function fills in frame->data,
-+ * frame->extended_data, frame->linesize[0].
-+ * @param nb_channels channel count
-+ * @param sample_fmt sample format
-+ * @param buf buffer to use for frame data
-+ * @param buf_size size of buffer
-+ * @param align plane size sample alignment (0 = default)
-+ * @return >=0 on success, negative error code on failure
-+ * @todo return the size in bytes required to store the samples in
-+ * case of success, at the next libavutil bump
-+ */
-+int avcodec_fill_audio_frame(AVFrame* frame, int nb_channels,
-+ enum AVSampleFormat sample_fmt, const uint8_t* buf,
-+ int buf_size, int align);
-+
-+/**
-+ * Reset the internal codec state / flush internal buffers. Should be called
-+ * e.g. when seeking or when switching to a different stream.
-+ *
-+ * @note for decoders, this function just releases any references the decoder
-+ * might keep internally, but the caller's references remain valid.
-+ *
-+ * @note for encoders, this function will only do something if the encoder
-+ * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
-+ * will drain any remaining packets, and can then be re-used for a different
-+ * stream (as opposed to sending a null frame which will leave the encoder
-+ * in a permanent EOF state after draining). This can be desirable if the
-+ * cost of tearing down and replacing the encoder instance is high.
-+ */
-+void avcodec_flush_buffers(AVCodecContext* avctx);
-+
-+/**
-+ * Return audio frame duration.
-+ *
-+ * @param avctx codec context
-+ * @param frame_bytes size of the frame, or 0 if unknown
-+ * @return frame duration, in samples, if known. 0 if not able to
-+ * determine.
-+ */
-+int av_get_audio_frame_duration(AVCodecContext* avctx, int frame_bytes);
-+
-+/* memory */
-+
-+/**
-+ * Same behaviour av_fast_malloc but the buffer has additional
-+ * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
-+ *
-+ * In addition the whole buffer will initially and after resizes
-+ * be 0-initialized so that no uninitialized data will ever appear.
-+ */
-+void av_fast_padded_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Same behaviour av_fast_padded_malloc except that buffer will always
-+ * be 0-initialized after call.
-+ */
-+void av_fast_padded_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
-+ * with no corresponding avcodec_close()), 0 otherwise.
-+ */
-+int avcodec_is_open(AVCodecContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVCODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-@@ -0,0 +1,119 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVFFT_H
-+#define AVCODEC_AVFFT_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_fft
-+ * FFT functions
-+ */
-+
-+/**
-+ * @defgroup lavc_fft FFT functions
-+ * @ingroup lavc_misc
-+ *
-+ * @{
-+ */
-+
-+typedef float FFTSample;
-+
-+typedef struct FFTComplex {
-+ FFTSample re, im;
-+} FFTComplex;
-+
-+typedef struct FFTContext FFTContext;
-+
-+/**
-+ * Set up a complex FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param inverse if 0 perform the forward transform, if 1 perform the
-+ * inverse
-+ */
-+FFTContext* av_fft_init(int nbits, int inverse);
-+
-+/**
-+ * Do the permutation needed BEFORE calling ff_fft_calc().
-+ */
-+void av_fft_permute(FFTContext* s, FFTComplex* z);
-+
-+/**
-+ * Do a complex FFT with the parameters defined in av_fft_init(). The
-+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
-+ */
-+void av_fft_calc(FFTContext* s, FFTComplex* z);
-+
-+void av_fft_end(FFTContext* s);
-+
-+FFTContext* av_mdct_init(int nbits, int inverse, double scale);
-+void av_imdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_imdct_half(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_end(FFTContext* s);
-+
-+/* Real Discrete Fourier Transform */
-+
-+enum RDFTransformType {
-+ DFT_R2C,
-+ IDFT_C2R,
-+ IDFT_R2C,
-+ DFT_C2R,
-+};
-+
-+typedef struct RDFTContext RDFTContext;
-+
-+/**
-+ * Set up a real FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param trans the type of transform
-+ */
-+RDFTContext* av_rdft_init(int nbits, enum RDFTransformType trans);
-+void av_rdft_calc(RDFTContext* s, FFTSample* data);
-+void av_rdft_end(RDFTContext* s);
-+
-+/* Discrete Cosine Transform */
-+
-+typedef struct DCTContext DCTContext;
-+
-+enum DCTTransformType {
-+ DCT_II = 0,
-+ DCT_III,
-+ DCT_I,
-+ DST_I,
-+};
-+
-+/**
-+ * Set up DCT.
-+ *
-+ * @param nbits size of the input array:
-+ * (1 << nbits) for DCT-II, DCT-III and DST-I
-+ * (1 << nbits) + 1 for DCT-I
-+ * @param type the type of transform
-+ *
-+ * @note the first element of the input of DST-I is ignored
-+ */
-+DCTContext* av_dct_init(int nbits, enum DCTTransformType type);
-+void av_dct_calc(DCTContext* s, FFTSample* data);
-+void av_dct_end(DCTContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVFFT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-@@ -0,0 +1,320 @@
-+/*
-+ * Bitstream filters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_BSF_H
-+#define AVCODEC_BSF_H
-+
-+#include "libavutil/dict.h"
-+#include "libavutil/log.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec_id.h"
-+#include "codec_par.h"
-+#include "packet.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * The bitstream filter state.
-+ *
-+ * This struct must be allocated with av_bsf_alloc() and freed with
-+ * av_bsf_free().
-+ *
-+ * The fields in the struct will only be changed (by the caller or by the
-+ * filter) as described in their documentation, and are to be considered
-+ * immutable otherwise.
-+ */
-+typedef struct AVBSFContext {
-+ /**
-+ * A class for logging and AVOptions
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * The bitstream filter this context is an instance of.
-+ */
-+ const struct AVBitStreamFilter* filter;
-+
-+ /**
-+ * Opaque filter-specific private data. If filter->priv_class is non-NULL,
-+ * this is an AVOptions-enabled struct.
-+ */
-+ void* priv_data;
-+
-+ /**
-+ * Parameters of the input stream. This field is allocated in
-+ * av_bsf_alloc(), it needs to be filled by the caller before
-+ * av_bsf_init().
-+ */
-+ AVCodecParameters* par_in;
-+
-+ /**
-+ * Parameters of the output stream. This field is allocated in
-+ * av_bsf_alloc(), it is set by the filter in av_bsf_init().
-+ */
-+ AVCodecParameters* par_out;
-+
-+ /**
-+ * The timebase used for the timestamps of the input packets. Set by the
-+ * caller before av_bsf_init().
-+ */
-+ AVRational time_base_in;
-+
-+ /**
-+ * The timebase used for the timestamps of the output packets. Set by the
-+ * filter in av_bsf_init().
-+ */
-+ AVRational time_base_out;
-+} AVBSFContext;
-+
-+typedef struct AVBitStreamFilter {
-+ const char* name;
-+
-+ /**
-+ * A list of codec ids supported by the filter, terminated by
-+ * AV_CODEC_ID_NONE.
-+ * May be NULL, in that case the bitstream filter works with any codec id.
-+ */
-+ const enum AVCodecID* codec_ids;
-+
-+ /**
-+ * A class for the private data, used to declare bitstream filter private
-+ * AVOptions. This field is NULL for bitstream filters that do not declare
-+ * any options.
-+ *
-+ * If this field is non-NULL, the first member of the filter private data
-+ * must be a pointer to AVClass, which will be set by libavcodec generic
-+ * code to this class.
-+ */
-+ const AVClass* priv_class;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ int priv_data_size;
-+ int (*init)(AVBSFContext* ctx);
-+ int (*filter)(AVBSFContext* ctx, AVPacket* pkt);
-+ void (*close)(AVBSFContext* ctx);
-+ void (*flush)(AVBSFContext* ctx);
-+} AVBitStreamFilter;
-+
-+/**
-+ * @return a bitstream filter with the specified name or NULL if no such
-+ * bitstream filter exists.
-+ */
-+const AVBitStreamFilter* av_bsf_get_by_name(const char* name);
-+
-+/**
-+ * Iterate over all registered bitstream filters.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered bitstream filter or NULL when the iteration is
-+ * finished
-+ */
-+const AVBitStreamFilter* av_bsf_iterate(void** opaque);
-+
-+/**
-+ * Allocate a context for a given bitstream filter. The caller must fill in the
-+ * context parameters as described in the documentation and then call
-+ * av_bsf_init() before sending any data to the filter.
-+ *
-+ * @param filter the filter for which to allocate an instance.
-+ * @param ctx a pointer into which the pointer to the newly-allocated context
-+ * will be written. It must be freed with av_bsf_free() after the
-+ * filtering is done.
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_bsf_alloc(const AVBitStreamFilter* filter, AVBSFContext** ctx);
-+
-+/**
-+ * Prepare the filter for use, after all the parameters and options have been
-+ * set.
-+ */
-+int av_bsf_init(AVBSFContext* ctx);
-+
-+/**
-+ * Submit a packet for filtering.
-+ *
-+ * After sending each packet, the filter must be completely drained by calling
-+ * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or
-+ * AVERROR_EOF.
-+ *
-+ * @param pkt the packet to filter. The bitstream filter will take ownership of
-+ * the packet and reset the contents of pkt. pkt is not touched if an error
-+ * occurs. If pkt is empty (i.e. NULL, or pkt->data is NULL and
-+ * pkt->side_data_elems zero), it signals the end of the stream (i.e. no more
-+ * non-empty packets will be sent; sending more empty packets does nothing) and
-+ * will cause the filter to output any packets it may have buffered internally.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if packets need to be retrieved from
-+ * the filter (using av_bsf_receive_packet()) before new input can be consumed.
-+ * Another negative AVERROR value if an error occurs.
-+ */
-+int av_bsf_send_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Retrieve a filtered packet.
-+ *
-+ * @param[out] pkt this struct will be filled with the contents of the filtered
-+ * packet. It is owned by the caller and must be freed using
-+ * av_packet_unref() when it is no longer needed.
-+ * This parameter should be "clean" (i.e. freshly allocated
-+ * with av_packet_alloc() or unreffed with av_packet_unref())
-+ * when this function is called. If this function returns
-+ * successfully, the contents of pkt will be completely
-+ * overwritten by the returned data. On failure, pkt is not
-+ * touched.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if more packets need to be sent to the
-+ * filter (using av_bsf_send_packet()) to get more output. AVERROR_EOF if there
-+ * will be no further output from the filter. Another negative AVERROR value if
-+ * an error occurs.
-+ *
-+ * @note one input packet may result in several output packets, so after sending
-+ * a packet with av_bsf_send_packet(), this function needs to be called
-+ * repeatedly until it stops returning 0. It is also possible for a filter to
-+ * output fewer packets than were sent to it, so this function may return
-+ * AVERROR(EAGAIN) immediately after a successful av_bsf_send_packet() call.
-+ */
-+int av_bsf_receive_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Reset the internal bitstream filter state. Should be called e.g. when
-+ * seeking.
-+ */
-+void av_bsf_flush(AVBSFContext* ctx);
-+
-+/**
-+ * Free a bitstream filter context and everything associated with it; write NULL
-+ * into the supplied pointer.
-+ */
-+void av_bsf_free(AVBSFContext** ctx);
-+
-+/**
-+ * Get the AVClass for AVBSFContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* av_bsf_get_class(void);
-+
-+/**
-+ * Structure for chain/list of bitstream filters.
-+ * Empty list can be allocated by av_bsf_list_alloc().
-+ */
-+typedef struct AVBSFList AVBSFList;
-+
-+/**
-+ * Allocate empty list of bitstream filters.
-+ * The list must be later freed by av_bsf_list_free()
-+ * or finalized by av_bsf_list_finalize().
-+ *
-+ * @return Pointer to @ref AVBSFList on success, NULL in case of failure
-+ */
-+AVBSFList* av_bsf_list_alloc(void);
-+
-+/**
-+ * Free list of bitstream filters.
-+ *
-+ * @param lst Pointer to pointer returned by av_bsf_list_alloc()
-+ */
-+void av_bsf_list_free(AVBSFList** lst);
-+
-+/**
-+ * Append bitstream filter to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf Filter context to be appended
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append(AVBSFList* lst, AVBSFContext* bsf);
-+
-+/**
-+ * Construct new bitstream filter context given it's name and options
-+ * and append it to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf_name Name of the bitstream filter
-+ * @param options Options for the bitstream filter, can be set to NULL
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append2(AVBSFList* lst, const char* bsf_name,
-+ AVDictionary** options);
-+/**
-+ * Finalize list of bitstream filters.
-+ *
-+ * This function will transform @ref AVBSFList to single @ref AVBSFContext,
-+ * so the whole chain of bitstream filters can be treated as single filter
-+ * freshly allocated by av_bsf_alloc().
-+ * If the call is successful, @ref AVBSFList structure is freed and lst
-+ * will be set to NULL. In case of failure, caller is responsible for
-+ * freeing the structure by av_bsf_list_free()
-+ *
-+ * @param lst Filter list structure to be transformed
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_finalize(AVBSFList** lst, AVBSFContext** bsf);
-+
-+/**
-+ * Parse string describing list of bitstream filters and create single
-+ * @ref AVBSFContext describing the whole chain of bitstream filters.
-+ * Resulting @ref AVBSFContext can be treated as any other @ref AVBSFContext
-+ * freshly allocated by av_bsf_alloc().
-+ *
-+ * @param str String describing chain of bitstream filters in format
-+ * `bsf1[=opt1=val1:opt2=val2][,bsf2]`
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_parse_str(const char* str, AVBSFContext** bsf);
-+
-+/**
-+ * Get null/pass-through bitstream filter.
-+ *
-+ * @param[out] bsf Pointer to be set to new instance of pass-through bitstream
-+ * filter
-+ *
-+ * @return
-+ */
-+int av_bsf_get_null_filter(AVBSFContext** bsf);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_BSF_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-@@ -0,0 +1,513 @@
-+/*
-+ * AVCodec public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_H
-+#define AVCODEC_CODEC_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/hwcontext.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/samplefmt.h"
-+
-+#include "libavcodec/codec_id.h"
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Decoder can use draw_horiz_band callback.
-+ */
-+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
-+/**
-+ * Codec uses get_buffer() or get_encode_buffer() for allocating buffers and
-+ * supports custom allocators.
-+ * If not set, it might not use get_buffer() or get_encode_buffer() at all, or
-+ * use operations that assume the buffer was allocated by
-+ * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
-+ */
-+#define AV_CODEC_CAP_DR1 (1 << 1)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * @deprecated Use parsers to always send proper frames.
-+ */
-+# define AV_CODEC_CAP_TRUNCATED (1 << 3)
-+#endif
-+/**
-+ * Encoder or decoder requires flushing with NULL input at the end in order to
-+ * give the complete and correct output.
-+ *
-+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
-+ * with NULL data. The user can still send NULL data to the public encode
-+ * or decode function, but libavcodec will not pass it along to the codec
-+ * unless this flag is set.
-+ *
-+ * Decoders:
-+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
-+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
-+ * returns frames.
-+ *
-+ * Encoders:
-+ * The encoder needs to be fed with NULL data at the end of encoding until the
-+ * encoder no longer returns data.
-+ *
-+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
-+ * flag also means that the encoder must set the pts and duration for
-+ * each output packet. If this flag is not set, the pts and duration will
-+ * be determined by libavcodec from the input frame.
-+ */
-+#define AV_CODEC_CAP_DELAY (1 << 5)
-+/**
-+ * Codec can be fed a final frame with a smaller size.
-+ * This can be used to prevent truncation of the last audio samples.
-+ */
-+#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6)
-+
-+/**
-+ * Codec can output multiple frames per AVPacket
-+ * Normally demuxers return one frame at a time, demuxers which do not do
-+ * are connected to a parser to split what they return into proper frames.
-+ * This flag is reserved to the very rare category of codecs which have a
-+ * bitstream that cannot be split into frames without timeconsuming
-+ * operations like full decoding. Demuxers carrying such bitstreams thus
-+ * may return multiple frames in a packet. This has many disadvantages like
-+ * prohibiting stream copy in many cases thus it should only be considered
-+ * as a last resort.
-+ */
-+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
-+/**
-+ * Codec is experimental and is thus avoided in favor of non experimental
-+ * encoders
-+ */
-+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
-+/**
-+ * Codec should fill in channel configuration and samplerate instead of
-+ * container
-+ */
-+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
-+/**
-+ * Codec supports frame-level multithreading.
-+ */
-+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
-+/**
-+ * Codec supports slice-based (or partition-based) multithreading.
-+ */
-+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
-+/**
-+ * Codec supports changed parameters at any point.
-+ */
-+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
-+/**
-+ * Codec supports multithreading through a method other than slice- or
-+ * frame-level multithreading. Typically this marks wrappers around
-+ * multithreading-capable external libraries.
-+ */
-+#define AV_CODEC_CAP_OTHER_THREADS (1 << 15)
-+#if FF_API_AUTO_THREADS
-+# define AV_CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_OTHER_THREADS
-+#endif
-+/**
-+ * Audio encoder supports receiving a different number of samples in each call.
-+ */
-+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-+/**
-+ * Decoder is not a preferred choice for probing.
-+ * This indicates that the decoder is not a good choice for probing.
-+ * It could for example be an expensive to spin up hardware decoder,
-+ * or it could simply not provide a lot of useful information about
-+ * the stream.
-+ * A decoder marked with this flag should only be used as last resort
-+ * choice for probing.
-+ */
-+#define AV_CODEC_CAP_AVOID_PROBING (1 << 17)
-+
-+#if FF_API_UNUSED_CODEC_CAPS
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_INTRA_ONLY 0x40000000
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_LOSSLESS 0x80000000
-+#endif
-+
-+/**
-+ * Codec is backed by a hardware implementation. Typically used to
-+ * identify a non-hwaccel hardware decoder. For information about hwaccels, use
-+ * avcodec_get_hw_config() instead.
-+ */
-+#define AV_CODEC_CAP_HARDWARE (1 << 18)
-+
-+/**
-+ * Codec is potentially backed by a hardware implementation, but not
-+ * necessarily. This is used instead of AV_CODEC_CAP_HARDWARE, if the
-+ * implementation provides some sort of internal fallback.
-+ */
-+#define AV_CODEC_CAP_HYBRID (1 << 19)
-+
-+/**
-+ * This codec takes the reordered_opaque field from input AVFrames
-+ * and returns it in the corresponding field in AVCodecContext after
-+ * encoding.
-+ */
-+#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
-+
-+/**
-+ * This encoder can be flushed using avcodec_flush_buffers(). If this flag is
-+ * not set, the encoder must be closed and reopened to ensure that no frames
-+ * remain pending.
-+ */
-+#define AV_CODEC_CAP_ENCODER_FLUSH (1 << 21)
-+
-+/**
-+ * AVProfile.
-+ */
-+typedef struct AVProfile {
-+ int profile;
-+ const char* name; ///< short name for the profile
-+} AVProfile;
-+
-+typedef struct AVCodecDefault AVCodecDefault;
-+
-+struct AVCodecContext;
-+struct AVSubtitle;
-+struct AVPacket;
-+
-+/**
-+ * AVCodec.
-+ */
-+typedef struct AVCodec {
-+ /**
-+ * Name of the codec implementation.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ * This is the primary way to find a codec from the user perspective.
-+ */
-+ const char* name;
-+ /**
-+ * Descriptive name for the codec, meant to be more human readable than name.
-+ * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-+ */
-+ const char* long_name;
-+ enum AVMediaType type;
-+ enum AVCodecID id;
-+ /**
-+ * Codec capabilities.
-+ * see AV_CODEC_CAP_*
-+ */
-+ int capabilities;
-+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
-+ const AVRational*
-+ supported_framerates; ///< array of supported framerates, or NULL if any,
-+ ///< array is terminated by {0,0}
-+ const enum AVPixelFormat*
-+ pix_fmts; ///< array of supported pixel formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const int*
-+ supported_samplerates; ///< array of supported audio samplerates, or NULL
-+ ///< if unknown, array is terminated by 0
-+ const enum AVSampleFormat*
-+ sample_fmts; ///< array of supported sample formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const uint64_t*
-+ channel_layouts; ///< array of support channel layouts, or NULL if
-+ ///< unknown. array is terminated by 0
-+ const AVClass* priv_class; ///< AVClass for the private context
-+ const AVProfile*
-+ profiles; ///< array of recognized profiles, or NULL if unknown, array is
-+ ///< terminated by {FF_PROFILE_UNKNOWN}
-+
-+ /**
-+ * Group name of the codec implementation.
-+ * This is a short symbolic name of the wrapper backing this codec. A
-+ * wrapper uses some kind of external implementation for the codec, such
-+ * as an external library, or a codec implementation provided by the OS or
-+ * the hardware.
-+ * If this field is NULL, this is a builtin, libavcodec native codec.
-+ * If non-NULL, this will be the suffix in AVCodec.name in most cases
-+ * (usually AVCodec.name will be of the form "<codec_name>_<wrapper_name>").
-+ */
-+ const char* wrapper_name;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+ /**
-+ * Internal codec capabilities.
-+ * See FF_CODEC_CAP_* in internal.h
-+ */
-+ int caps_internal;
-+
-+ int priv_data_size;
-+ /**
-+ * @name Frame-level threading support functions
-+ * @{
-+ */
-+ /**
-+ * Copy necessary context variables from a previous thread context to the
-+ * current one. If not defined, the next thread will start automatically;
-+ * otherwise, the codec must call ff_thread_finish_setup().
-+ *
-+ * dst and src will (rarely) point to the same context, in which case memcpy
-+ * should be skipped.
-+ */
-+ int (*update_thread_context)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+
-+ /**
-+ * Copy variables back to the user-facing context
-+ */
-+ int (*update_thread_context_for_user)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+ /** @} */
-+
-+ /**
-+ * Private codec-specific defaults.
-+ */
-+ const AVCodecDefault* defaults;
-+
-+ /**
-+ * Initialize codec static data, called from av_codec_iterate().
-+ *
-+ * This is not intended for time consuming operations as it is
-+ * run for every codec regardless of that codec being used.
-+ */
-+ void (*init_static_data)(struct AVCodec* codec);
-+
-+ int (*init)(struct AVCodecContext*);
-+ int (*encode_sub)(struct AVCodecContext*, uint8_t* buf, int buf_size,
-+ const struct AVSubtitle* sub);
-+ /**
-+ * Encode data to an AVPacket.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt output AVPacket
-+ * @param[in] frame AVFrame containing the raw data to be encoded
-+ * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-+ * non-empty packet was returned in avpkt.
-+ * @return 0 on success, negative error code on failure
-+ */
-+ int (*encode2)(struct AVCodecContext* avctx, struct AVPacket* avpkt,
-+ const struct AVFrame* frame, int* got_packet_ptr);
-+ /**
-+ * Decode picture or subtitle data.
-+ *
-+ * @param avctx codec context
-+ * @param outdata codec type dependent output struct
-+ * @param[out] got_frame_ptr decoder sets to 0 or 1 to indicate that a
-+ * non-empty frame or subtitle was returned in
-+ * outdata.
-+ * @param[in] avpkt AVPacket containing the data to be decoded
-+ * @return amount of bytes read from the packet on success, negative error
-+ * code on failure
-+ */
-+ int (*decode)(struct AVCodecContext* avctx, void* outdata, int* got_frame_ptr,
-+ struct AVPacket* avpkt);
-+ int (*close)(struct AVCodecContext*);
-+ /**
-+ * Encode API with decoupled frame/packet dataflow. This function is called
-+ * to get one output packet. It should call ff_encode_get_frame() to obtain
-+ * input data.
-+ */
-+ int (*receive_packet)(struct AVCodecContext* avctx, struct AVPacket* avpkt);
-+
-+ /**
-+ * Decode API with decoupled packet/frame dataflow. This function is called
-+ * to get one output frame. It should call ff_decode_get_packet() to obtain
-+ * input data.
-+ */
-+ int (*receive_frame)(struct AVCodecContext* avctx, struct AVFrame* frame);
-+ /**
-+ * Flush buffers.
-+ * Will be called when seeking
-+ */
-+ void (*flush)(struct AVCodecContext*);
-+
-+ /**
-+ * Decoding only, a comma-separated list of bitstream filters to apply to
-+ * packets before decoding.
-+ */
-+ const char* bsfs;
-+
-+ /**
-+ * Array of pointers to hardware configurations supported by the codec,
-+ * or NULL if no hardware supported. The array is terminated by a NULL
-+ * pointer.
-+ *
-+ * The user can only access this field via avcodec_get_hw_config().
-+ */
-+ const struct AVCodecHWConfigInternal* const* hw_configs;
-+
-+ /**
-+ * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.
-+ */
-+ const uint32_t* codec_tags;
-+} AVCodec;
-+
-+/**
-+ * Iterate over all registered codecs.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodec* av_codec_iterate(void** opaque);
-+
-+/**
-+ * Find a registered decoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered decoder with the specified name.
-+ *
-+ * @param name name of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder_by_name(const char* name);
-+
-+/**
-+ * Find a registered encoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered encoder with the specified name.
-+ *
-+ * @param name name of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder_by_name(const char* name);
-+/**
-+ * @return a non-zero number if codec is an encoder, zero otherwise
-+ */
-+int av_codec_is_encoder(const AVCodec* codec);
-+
-+/**
-+ * @return a non-zero number if codec is a decoder, zero otherwise
-+ */
-+int av_codec_is_decoder(const AVCodec* codec);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec the codec that is searched for the given profile
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ */
-+const char* av_get_profile_name(const AVCodec* codec, int profile);
-+
-+enum {
-+ /**
-+ * The codec supports this format via the hw_device_ctx interface.
-+ *
-+ * When selecting this format, AVCodecContext.hw_device_ctx should
-+ * have been set to a device of the specified type before calling
-+ * avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
-+ /**
-+ * The codec supports this format via the hw_frames_ctx interface.
-+ *
-+ * When selecting this format for a decoder,
-+ * AVCodecContext.hw_frames_ctx should be set to a suitable frames
-+ * context inside the get_format() callback. The frames context
-+ * must have been created on a device of the specified type.
-+ *
-+ * When selecting this format for an encoder,
-+ * AVCodecContext.hw_frames_ctx should be set to the context which
-+ * will be used for the input frames before calling avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
-+ /**
-+ * The codec supports this format by some internal method.
-+ *
-+ * This format can be selected without any additional configuration -
-+ * no device or frames context is required.
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_INTERNAL = 0x04,
-+ /**
-+ * The codec supports this format by some ad-hoc method.
-+ *
-+ * Additional settings and/or function calls are required. See the
-+ * codec-specific documentation for details. (Methods requiring
-+ * this sort of configuration are deprecated and others should be
-+ * used in preference.)
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_AD_HOC = 0x08,
-+};
-+
-+typedef struct AVCodecHWConfig {
-+ /**
-+ * For decoders, a hardware pixel format which that decoder may be
-+ * able to decode to if suitable hardware is available.
-+ *
-+ * For encoders, a pixel format which the encoder may be able to
-+ * accept. If set to AV_PIX_FMT_NONE, this applies to all pixel
-+ * formats supported by the codec.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+ /**
-+ * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
-+ * setup methods which can be used with this configuration.
-+ */
-+ int methods;
-+ /**
-+ * The device type associated with the configuration.
-+ *
-+ * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
-+ * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
-+ */
-+ enum AVHWDeviceType device_type;
-+} AVCodecHWConfig;
-+
-+/**
-+ * Retrieve supported hardware configurations for a codec.
-+ *
-+ * Values of index from zero to some maximum return the indexed configuration
-+ * descriptor; all other values return NULL. If the codec does not support
-+ * any hardware configurations then it will always return NULL.
-+ */
-+const AVCodecHWConfig* avcodec_get_hw_config(const AVCodec* codec, int index);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_CODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-@@ -0,0 +1,128 @@
-+/*
-+ * Codec descriptors public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_DESC_H
-+#define AVCODEC_CODEC_DESC_H
-+
-+#include "libavutil/avutil.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * This struct describes the properties of a single codec described by an
-+ * AVCodecID.
-+ * @see avcodec_descriptor_get()
-+ */
-+typedef struct AVCodecDescriptor {
-+ enum AVCodecID id;
-+ enum AVMediaType type;
-+ /**
-+ * Name of the codec described by this descriptor. It is non-empty and
-+ * unique for each codec descriptor. It should contain alphanumeric
-+ * characters and '_' only.
-+ */
-+ const char* name;
-+ /**
-+ * A more descriptive name for this codec. May be NULL.
-+ */
-+ const char* long_name;
-+ /**
-+ * Codec properties, a combination of AV_CODEC_PROP_* flags.
-+ */
-+ int props;
-+ /**
-+ * MIME type(s) associated with the codec.
-+ * May be NULL; if not, a NULL-terminated array of MIME types.
-+ * The first item is always non-NULL and is the preferred MIME type.
-+ */
-+ const char* const* mime_types;
-+ /**
-+ * If non-NULL, an array of profiles recognized for this codec.
-+ * Terminated with FF_PROFILE_UNKNOWN.
-+ */
-+ const struct AVProfile* profiles;
-+} AVCodecDescriptor;
-+
-+/**
-+ * Codec uses only intra compression.
-+ * Video and audio codecs only.
-+ */
-+#define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
-+/**
-+ * Codec supports lossy compression. Audio and video codecs only.
-+ * @note a codec may support both lossy and lossless
-+ * compression modes
-+ */
-+#define AV_CODEC_PROP_LOSSY (1 << 1)
-+/**
-+ * Codec supports lossless compression. Audio and video codecs only.
-+ */
-+#define AV_CODEC_PROP_LOSSLESS (1 << 2)
-+/**
-+ * Codec supports frame reordering. That is, the coded order (the order in which
-+ * the encoded packets are output by the encoders / stored / input to the
-+ * decoders) may be different from the presentation order of the corresponding
-+ * frames.
-+ *
-+ * For codecs that do not have this property set, PTS and DTS should always be
-+ * equal.
-+ */
-+#define AV_CODEC_PROP_REORDER (1 << 3)
-+/**
-+ * Subtitle codec is bitmap based
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
-+ */
-+#define AV_CODEC_PROP_BITMAP_SUB (1 << 16)
-+/**
-+ * Subtitle codec is text based.
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
-+ */
-+#define AV_CODEC_PROP_TEXT_SUB (1 << 17)
-+
-+/**
-+ * @return descriptor for given codec ID or NULL if no descriptor exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get(enum AVCodecID id);
-+
-+/**
-+ * Iterate over all codec descriptors known to libavcodec.
-+ *
-+ * @param prev previous descriptor. NULL to get the first descriptor.
-+ *
-+ * @return next descriptor or NULL after the last descriptor
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_next(const AVCodecDescriptor* prev);
-+
-+/**
-+ * @return codec descriptor with the given name or NULL if no such descriptor
-+ * exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get_by_name(const char* name);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_DESC_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-@@ -0,0 +1,637 @@
-+/*
-+ * Codec IDs
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_ID_H
-+#define AVCODEC_CODEC_ID_H
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/samplefmt.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Identify the syntax and semantics of the bitstream.
-+ * The principle is roughly:
-+ * Two decoders with the same ID can decode the same streams.
-+ * Two encoders with the same ID can encode compatible streams.
-+ * There may be slight deviations from the principle due to implementation
-+ * details.
-+ *
-+ * If you add a codec ID to this list, add it so that
-+ * 1. no value of an existing codec ID changes (that would break ABI),
-+ * 2. it is as close as possible to similar codecs
-+ *
-+ * After adding new codec IDs, do not forget to add an entry to the codec
-+ * descriptor list and bump libavcodec minor version.
-+ */
-+enum AVCodecID {
-+ AV_CODEC_ID_NONE,
-+
-+ /* video codecs */
-+ AV_CODEC_ID_MPEG1VIDEO,
-+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-+ AV_CODEC_ID_H261,
-+ AV_CODEC_ID_H263,
-+ AV_CODEC_ID_RV10,
-+ AV_CODEC_ID_RV20,
-+ AV_CODEC_ID_MJPEG,
-+ AV_CODEC_ID_MJPEGB,
-+ AV_CODEC_ID_LJPEG,
-+ AV_CODEC_ID_SP5X,
-+ AV_CODEC_ID_JPEGLS,
-+ AV_CODEC_ID_MPEG4,
-+ AV_CODEC_ID_RAWVIDEO,
-+ AV_CODEC_ID_MSMPEG4V1,
-+ AV_CODEC_ID_MSMPEG4V2,
-+ AV_CODEC_ID_MSMPEG4V3,
-+ AV_CODEC_ID_WMV1,
-+ AV_CODEC_ID_WMV2,
-+ AV_CODEC_ID_H263P,
-+ AV_CODEC_ID_H263I,
-+ AV_CODEC_ID_FLV1,
-+ AV_CODEC_ID_SVQ1,
-+ AV_CODEC_ID_SVQ3,
-+ AV_CODEC_ID_DVVIDEO,
-+ AV_CODEC_ID_HUFFYUV,
-+ AV_CODEC_ID_CYUV,
-+ AV_CODEC_ID_H264,
-+ AV_CODEC_ID_INDEO3,
-+ AV_CODEC_ID_VP3,
-+ AV_CODEC_ID_THEORA,
-+ AV_CODEC_ID_ASV1,
-+ AV_CODEC_ID_ASV2,
-+ AV_CODEC_ID_FFV1,
-+ AV_CODEC_ID_4XM,
-+ AV_CODEC_ID_VCR1,
-+ AV_CODEC_ID_CLJR,
-+ AV_CODEC_ID_MDEC,
-+ AV_CODEC_ID_ROQ,
-+ AV_CODEC_ID_INTERPLAY_VIDEO,
-+ AV_CODEC_ID_XAN_WC3,
-+ AV_CODEC_ID_XAN_WC4,
-+ AV_CODEC_ID_RPZA,
-+ AV_CODEC_ID_CINEPAK,
-+ AV_CODEC_ID_WS_VQA,
-+ AV_CODEC_ID_MSRLE,
-+ AV_CODEC_ID_MSVIDEO1,
-+ AV_CODEC_ID_IDCIN,
-+ AV_CODEC_ID_8BPS,
-+ AV_CODEC_ID_SMC,
-+ AV_CODEC_ID_FLIC,
-+ AV_CODEC_ID_TRUEMOTION1,
-+ AV_CODEC_ID_VMDVIDEO,
-+ AV_CODEC_ID_MSZH,
-+ AV_CODEC_ID_ZLIB,
-+ AV_CODEC_ID_QTRLE,
-+ AV_CODEC_ID_TSCC,
-+ AV_CODEC_ID_ULTI,
-+ AV_CODEC_ID_QDRAW,
-+ AV_CODEC_ID_VIXL,
-+ AV_CODEC_ID_QPEG,
-+ AV_CODEC_ID_PNG,
-+ AV_CODEC_ID_PPM,
-+ AV_CODEC_ID_PBM,
-+ AV_CODEC_ID_PGM,
-+ AV_CODEC_ID_PGMYUV,
-+ AV_CODEC_ID_PAM,
-+ AV_CODEC_ID_FFVHUFF,
-+ AV_CODEC_ID_RV30,
-+ AV_CODEC_ID_RV40,
-+ AV_CODEC_ID_VC1,
-+ AV_CODEC_ID_WMV3,
-+ AV_CODEC_ID_LOCO,
-+ AV_CODEC_ID_WNV1,
-+ AV_CODEC_ID_AASC,
-+ AV_CODEC_ID_INDEO2,
-+ AV_CODEC_ID_FRAPS,
-+ AV_CODEC_ID_TRUEMOTION2,
-+ AV_CODEC_ID_BMP,
-+ AV_CODEC_ID_CSCD,
-+ AV_CODEC_ID_MMVIDEO,
-+ AV_CODEC_ID_ZMBV,
-+ AV_CODEC_ID_AVS,
-+ AV_CODEC_ID_SMACKVIDEO,
-+ AV_CODEC_ID_NUV,
-+ AV_CODEC_ID_KMVC,
-+ AV_CODEC_ID_FLASHSV,
-+ AV_CODEC_ID_CAVS,
-+ AV_CODEC_ID_JPEG2000,
-+ AV_CODEC_ID_VMNC,
-+ AV_CODEC_ID_VP5,
-+ AV_CODEC_ID_VP6,
-+ AV_CODEC_ID_VP6F,
-+ AV_CODEC_ID_TARGA,
-+ AV_CODEC_ID_DSICINVIDEO,
-+ AV_CODEC_ID_TIERTEXSEQVIDEO,
-+ AV_CODEC_ID_TIFF,
-+ AV_CODEC_ID_GIF,
-+ AV_CODEC_ID_DXA,
-+ AV_CODEC_ID_DNXHD,
-+ AV_CODEC_ID_THP,
-+ AV_CODEC_ID_SGI,
-+ AV_CODEC_ID_C93,
-+ AV_CODEC_ID_BETHSOFTVID,
-+ AV_CODEC_ID_PTX,
-+ AV_CODEC_ID_TXD,
-+ AV_CODEC_ID_VP6A,
-+ AV_CODEC_ID_AMV,
-+ AV_CODEC_ID_VB,
-+ AV_CODEC_ID_PCX,
-+ AV_CODEC_ID_SUNRAST,
-+ AV_CODEC_ID_INDEO4,
-+ AV_CODEC_ID_INDEO5,
-+ AV_CODEC_ID_MIMIC,
-+ AV_CODEC_ID_RL2,
-+ AV_CODEC_ID_ESCAPE124,
-+ AV_CODEC_ID_DIRAC,
-+ AV_CODEC_ID_BFI,
-+ AV_CODEC_ID_CMV,
-+ AV_CODEC_ID_MOTIONPIXELS,
-+ AV_CODEC_ID_TGV,
-+ AV_CODEC_ID_TGQ,
-+ AV_CODEC_ID_TQI,
-+ AV_CODEC_ID_AURA,
-+ AV_CODEC_ID_AURA2,
-+ AV_CODEC_ID_V210X,
-+ AV_CODEC_ID_TMV,
-+ AV_CODEC_ID_V210,
-+ AV_CODEC_ID_DPX,
-+ AV_CODEC_ID_MAD,
-+ AV_CODEC_ID_FRWU,
-+ AV_CODEC_ID_FLASHSV2,
-+ AV_CODEC_ID_CDGRAPHICS,
-+ AV_CODEC_ID_R210,
-+ AV_CODEC_ID_ANM,
-+ AV_CODEC_ID_BINKVIDEO,
-+ AV_CODEC_ID_IFF_ILBM,
-+#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
-+ AV_CODEC_ID_KGV1,
-+ AV_CODEC_ID_YOP,
-+ AV_CODEC_ID_VP8,
-+ AV_CODEC_ID_PICTOR,
-+ AV_CODEC_ID_ANSI,
-+ AV_CODEC_ID_A64_MULTI,
-+ AV_CODEC_ID_A64_MULTI5,
-+ AV_CODEC_ID_R10K,
-+ AV_CODEC_ID_MXPEG,
-+ AV_CODEC_ID_LAGARITH,
-+ AV_CODEC_ID_PRORES,
-+ AV_CODEC_ID_JV,
-+ AV_CODEC_ID_DFA,
-+ AV_CODEC_ID_WMV3IMAGE,
-+ AV_CODEC_ID_VC1IMAGE,
-+ AV_CODEC_ID_UTVIDEO,
-+ AV_CODEC_ID_BMV_VIDEO,
-+ AV_CODEC_ID_VBLE,
-+ AV_CODEC_ID_DXTORY,
-+ AV_CODEC_ID_V410,
-+ AV_CODEC_ID_XWD,
-+ AV_CODEC_ID_CDXL,
-+ AV_CODEC_ID_XBM,
-+ AV_CODEC_ID_ZEROCODEC,
-+ AV_CODEC_ID_MSS1,
-+ AV_CODEC_ID_MSA1,
-+ AV_CODEC_ID_TSCC2,
-+ AV_CODEC_ID_MTS2,
-+ AV_CODEC_ID_CLLC,
-+ AV_CODEC_ID_MSS2,
-+ AV_CODEC_ID_VP9,
-+ AV_CODEC_ID_AIC,
-+ AV_CODEC_ID_ESCAPE130,
-+ AV_CODEC_ID_G2M,
-+ AV_CODEC_ID_WEBP,
-+ AV_CODEC_ID_HNM4_VIDEO,
-+ AV_CODEC_ID_HEVC,
-+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
-+ AV_CODEC_ID_FIC,
-+ AV_CODEC_ID_ALIAS_PIX,
-+ AV_CODEC_ID_BRENDER_PIX,
-+ AV_CODEC_ID_PAF_VIDEO,
-+ AV_CODEC_ID_EXR,
-+ AV_CODEC_ID_VP7,
-+ AV_CODEC_ID_SANM,
-+ AV_CODEC_ID_SGIRLE,
-+ AV_CODEC_ID_MVC1,
-+ AV_CODEC_ID_MVC2,
-+ AV_CODEC_ID_HQX,
-+ AV_CODEC_ID_TDSC,
-+ AV_CODEC_ID_HQ_HQA,
-+ AV_CODEC_ID_HAP,
-+ AV_CODEC_ID_DDS,
-+ AV_CODEC_ID_DXV,
-+ AV_CODEC_ID_SCREENPRESSO,
-+ AV_CODEC_ID_RSCC,
-+ AV_CODEC_ID_AVS2,
-+ AV_CODEC_ID_PGX,
-+ AV_CODEC_ID_AVS3,
-+ AV_CODEC_ID_MSP2,
-+ AV_CODEC_ID_VVC,
-+#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC
-+ AV_CODEC_ID_Y41P,
-+ AV_CODEC_ID_AVRP,
-+ AV_CODEC_ID_012V,
-+ AV_CODEC_ID_AVUI,
-+ AV_CODEC_ID_AYUV,
-+ AV_CODEC_ID_TARGA_Y216,
-+ AV_CODEC_ID_V308,
-+ AV_CODEC_ID_V408,
-+ AV_CODEC_ID_YUV4,
-+ AV_CODEC_ID_AVRN,
-+ AV_CODEC_ID_CPIA,
-+ AV_CODEC_ID_XFACE,
-+ AV_CODEC_ID_SNOW,
-+ AV_CODEC_ID_SMVJPEG,
-+ AV_CODEC_ID_APNG,
-+ AV_CODEC_ID_DAALA,
-+ AV_CODEC_ID_CFHD,
-+ AV_CODEC_ID_TRUEMOTION2RT,
-+ AV_CODEC_ID_M101,
-+ AV_CODEC_ID_MAGICYUV,
-+ AV_CODEC_ID_SHEERVIDEO,
-+ AV_CODEC_ID_YLC,
-+ AV_CODEC_ID_PSD,
-+ AV_CODEC_ID_PIXLET,
-+ AV_CODEC_ID_SPEEDHQ,
-+ AV_CODEC_ID_FMVC,
-+ AV_CODEC_ID_SCPR,
-+ AV_CODEC_ID_CLEARVIDEO,
-+ AV_CODEC_ID_XPM,
-+ AV_CODEC_ID_AV1,
-+ AV_CODEC_ID_BITPACKED,
-+ AV_CODEC_ID_MSCC,
-+ AV_CODEC_ID_SRGC,
-+ AV_CODEC_ID_SVG,
-+ AV_CODEC_ID_GDV,
-+ AV_CODEC_ID_FITS,
-+ AV_CODEC_ID_IMM4,
-+ AV_CODEC_ID_PROSUMER,
-+ AV_CODEC_ID_MWSC,
-+ AV_CODEC_ID_WCMV,
-+ AV_CODEC_ID_RASC,
-+ AV_CODEC_ID_HYMT,
-+ AV_CODEC_ID_ARBC,
-+ AV_CODEC_ID_AGM,
-+ AV_CODEC_ID_LSCR,
-+ AV_CODEC_ID_VP4,
-+ AV_CODEC_ID_IMM5,
-+ AV_CODEC_ID_MVDV,
-+ AV_CODEC_ID_MVHA,
-+ AV_CODEC_ID_CDTOONS,
-+ AV_CODEC_ID_MV30,
-+ AV_CODEC_ID_NOTCHLC,
-+ AV_CODEC_ID_PFM,
-+ AV_CODEC_ID_MOBICLIP,
-+ AV_CODEC_ID_PHOTOCD,
-+ AV_CODEC_ID_IPU,
-+ AV_CODEC_ID_ARGO,
-+ AV_CODEC_ID_CRI,
-+ AV_CODEC_ID_SIMBIOSIS_IMX,
-+ AV_CODEC_ID_SGA_VIDEO,
-+ AV_CODEC_ID_GEM,
-+
-+ /* various PCM "codecs" */
-+ AV_CODEC_ID_FIRST_AUDIO =
-+ 0x10000, ///< A dummy id pointing at the start of audio codecs
-+ AV_CODEC_ID_PCM_S16LE = 0x10000,
-+ AV_CODEC_ID_PCM_S16BE,
-+ AV_CODEC_ID_PCM_U16LE,
-+ AV_CODEC_ID_PCM_U16BE,
-+ AV_CODEC_ID_PCM_S8,
-+ AV_CODEC_ID_PCM_U8,
-+ AV_CODEC_ID_PCM_MULAW,
-+ AV_CODEC_ID_PCM_ALAW,
-+ AV_CODEC_ID_PCM_S32LE,
-+ AV_CODEC_ID_PCM_S32BE,
-+ AV_CODEC_ID_PCM_U32LE,
-+ AV_CODEC_ID_PCM_U32BE,
-+ AV_CODEC_ID_PCM_S24LE,
-+ AV_CODEC_ID_PCM_S24BE,
-+ AV_CODEC_ID_PCM_U24LE,
-+ AV_CODEC_ID_PCM_U24BE,
-+ AV_CODEC_ID_PCM_S24DAUD,
-+ AV_CODEC_ID_PCM_ZORK,
-+ AV_CODEC_ID_PCM_S16LE_PLANAR,
-+ AV_CODEC_ID_PCM_DVD,
-+ AV_CODEC_ID_PCM_F32BE,
-+ AV_CODEC_ID_PCM_F32LE,
-+ AV_CODEC_ID_PCM_F64BE,
-+ AV_CODEC_ID_PCM_F64LE,
-+ AV_CODEC_ID_PCM_BLURAY,
-+ AV_CODEC_ID_PCM_LXF,
-+ AV_CODEC_ID_S302M,
-+ AV_CODEC_ID_PCM_S8_PLANAR,
-+ AV_CODEC_ID_PCM_S24LE_PLANAR,
-+ AV_CODEC_ID_PCM_S32LE_PLANAR,
-+ AV_CODEC_ID_PCM_S16BE_PLANAR,
-+ AV_CODEC_ID_PCM_S64LE,
-+ AV_CODEC_ID_PCM_S64BE,
-+ AV_CODEC_ID_PCM_F16LE,
-+ AV_CODEC_ID_PCM_F24LE,
-+ AV_CODEC_ID_PCM_VIDC,
-+ AV_CODEC_ID_PCM_SGA,
-+
-+ /* various ADPCM codecs */
-+ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-+ AV_CODEC_ID_ADPCM_IMA_WAV,
-+ AV_CODEC_ID_ADPCM_IMA_DK3,
-+ AV_CODEC_ID_ADPCM_IMA_DK4,
-+ AV_CODEC_ID_ADPCM_IMA_WS,
-+ AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-+ AV_CODEC_ID_ADPCM_MS,
-+ AV_CODEC_ID_ADPCM_4XM,
-+ AV_CODEC_ID_ADPCM_XA,
-+ AV_CODEC_ID_ADPCM_ADX,
-+ AV_CODEC_ID_ADPCM_EA,
-+ AV_CODEC_ID_ADPCM_G726,
-+ AV_CODEC_ID_ADPCM_CT,
-+ AV_CODEC_ID_ADPCM_SWF,
-+ AV_CODEC_ID_ADPCM_YAMAHA,
-+ AV_CODEC_ID_ADPCM_SBPRO_4,
-+ AV_CODEC_ID_ADPCM_SBPRO_3,
-+ AV_CODEC_ID_ADPCM_SBPRO_2,
-+ AV_CODEC_ID_ADPCM_THP,
-+ AV_CODEC_ID_ADPCM_IMA_AMV,
-+ AV_CODEC_ID_ADPCM_EA_R1,
-+ AV_CODEC_ID_ADPCM_EA_R3,
-+ AV_CODEC_ID_ADPCM_EA_R2,
-+ AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-+ AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-+ AV_CODEC_ID_ADPCM_EA_XAS,
-+ AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-+ AV_CODEC_ID_ADPCM_IMA_ISS,
-+ AV_CODEC_ID_ADPCM_G722,
-+ AV_CODEC_ID_ADPCM_IMA_APC,
-+ AV_CODEC_ID_ADPCM_VIMA,
-+ AV_CODEC_ID_ADPCM_AFC,
-+ AV_CODEC_ID_ADPCM_IMA_OKI,
-+ AV_CODEC_ID_ADPCM_DTK,
-+ AV_CODEC_ID_ADPCM_IMA_RAD,
-+ AV_CODEC_ID_ADPCM_G726LE,
-+ AV_CODEC_ID_ADPCM_THP_LE,
-+ AV_CODEC_ID_ADPCM_PSX,
-+ AV_CODEC_ID_ADPCM_AICA,
-+ AV_CODEC_ID_ADPCM_IMA_DAT4,
-+ AV_CODEC_ID_ADPCM_MTAF,
-+ AV_CODEC_ID_ADPCM_AGM,
-+ AV_CODEC_ID_ADPCM_ARGO,
-+ AV_CODEC_ID_ADPCM_IMA_SSI,
-+ AV_CODEC_ID_ADPCM_ZORK,
-+ AV_CODEC_ID_ADPCM_IMA_APM,
-+ AV_CODEC_ID_ADPCM_IMA_ALP,
-+ AV_CODEC_ID_ADPCM_IMA_MTF,
-+ AV_CODEC_ID_ADPCM_IMA_CUNNING,
-+ AV_CODEC_ID_ADPCM_IMA_MOFLEX,
-+ AV_CODEC_ID_ADPCM_IMA_ACORN,
-+
-+ /* AMR */
-+ AV_CODEC_ID_AMR_NB = 0x12000,
-+ AV_CODEC_ID_AMR_WB,
-+
-+ /* RealAudio codecs*/
-+ AV_CODEC_ID_RA_144 = 0x13000,
-+ AV_CODEC_ID_RA_288,
-+
-+ /* various DPCM codecs */
-+ AV_CODEC_ID_ROQ_DPCM = 0x14000,
-+ AV_CODEC_ID_INTERPLAY_DPCM,
-+ AV_CODEC_ID_XAN_DPCM,
-+ AV_CODEC_ID_SOL_DPCM,
-+ AV_CODEC_ID_SDX2_DPCM,
-+ AV_CODEC_ID_GREMLIN_DPCM,
-+ AV_CODEC_ID_DERF_DPCM,
-+
-+ /* audio codecs */
-+ AV_CODEC_ID_MP2 = 0x15000,
-+ AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-+ AV_CODEC_ID_AAC,
-+ AV_CODEC_ID_AC3,
-+ AV_CODEC_ID_DTS,
-+ AV_CODEC_ID_VORBIS,
-+ AV_CODEC_ID_DVAUDIO,
-+ AV_CODEC_ID_WMAV1,
-+ AV_CODEC_ID_WMAV2,
-+ AV_CODEC_ID_MACE3,
-+ AV_CODEC_ID_MACE6,
-+ AV_CODEC_ID_VMDAUDIO,
-+ AV_CODEC_ID_FLAC,
-+ AV_CODEC_ID_MP3ADU,
-+ AV_CODEC_ID_MP3ON4,
-+ AV_CODEC_ID_SHORTEN,
-+ AV_CODEC_ID_ALAC,
-+ AV_CODEC_ID_WESTWOOD_SND1,
-+ AV_CODEC_ID_GSM, ///< as in Berlin toast format
-+ AV_CODEC_ID_QDM2,
-+ AV_CODEC_ID_COOK,
-+ AV_CODEC_ID_TRUESPEECH,
-+ AV_CODEC_ID_TTA,
-+ AV_CODEC_ID_SMACKAUDIO,
-+ AV_CODEC_ID_QCELP,
-+ AV_CODEC_ID_WAVPACK,
-+ AV_CODEC_ID_DSICINAUDIO,
-+ AV_CODEC_ID_IMC,
-+ AV_CODEC_ID_MUSEPACK7,
-+ AV_CODEC_ID_MLP,
-+ AV_CODEC_ID_GSM_MS, /* as found in WAV */
-+ AV_CODEC_ID_ATRAC3,
-+ AV_CODEC_ID_APE,
-+ AV_CODEC_ID_NELLYMOSER,
-+ AV_CODEC_ID_MUSEPACK8,
-+ AV_CODEC_ID_SPEEX,
-+ AV_CODEC_ID_WMAVOICE,
-+ AV_CODEC_ID_WMAPRO,
-+ AV_CODEC_ID_WMALOSSLESS,
-+ AV_CODEC_ID_ATRAC3P,
-+ AV_CODEC_ID_EAC3,
-+ AV_CODEC_ID_SIPR,
-+ AV_CODEC_ID_MP1,
-+ AV_CODEC_ID_TWINVQ,
-+ AV_CODEC_ID_TRUEHD,
-+ AV_CODEC_ID_MP4ALS,
-+ AV_CODEC_ID_ATRAC1,
-+ AV_CODEC_ID_BINKAUDIO_RDFT,
-+ AV_CODEC_ID_BINKAUDIO_DCT,
-+ AV_CODEC_ID_AAC_LATM,
-+ AV_CODEC_ID_QDMC,
-+ AV_CODEC_ID_CELT,
-+ AV_CODEC_ID_G723_1,
-+ AV_CODEC_ID_G729,
-+ AV_CODEC_ID_8SVX_EXP,
-+ AV_CODEC_ID_8SVX_FIB,
-+ AV_CODEC_ID_BMV_AUDIO,
-+ AV_CODEC_ID_RALF,
-+ AV_CODEC_ID_IAC,
-+ AV_CODEC_ID_ILBC,
-+ AV_CODEC_ID_OPUS,
-+ AV_CODEC_ID_COMFORT_NOISE,
-+ AV_CODEC_ID_TAK,
-+ AV_CODEC_ID_METASOUND,
-+ AV_CODEC_ID_PAF_AUDIO,
-+ AV_CODEC_ID_ON2AVC,
-+ AV_CODEC_ID_DSS_SP,
-+ AV_CODEC_ID_CODEC2,
-+ AV_CODEC_ID_FFWAVESYNTH,
-+ AV_CODEC_ID_SONIC,
-+ AV_CODEC_ID_SONIC_LS,
-+ AV_CODEC_ID_EVRC,
-+ AV_CODEC_ID_SMV,
-+ AV_CODEC_ID_DSD_LSBF,
-+ AV_CODEC_ID_DSD_MSBF,
-+ AV_CODEC_ID_DSD_LSBF_PLANAR,
-+ AV_CODEC_ID_DSD_MSBF_PLANAR,
-+ AV_CODEC_ID_4GV,
-+ AV_CODEC_ID_INTERPLAY_ACM,
-+ AV_CODEC_ID_XMA1,
-+ AV_CODEC_ID_XMA2,
-+ AV_CODEC_ID_DST,
-+ AV_CODEC_ID_ATRAC3AL,
-+ AV_CODEC_ID_ATRAC3PAL,
-+ AV_CODEC_ID_DOLBY_E,
-+ AV_CODEC_ID_APTX,
-+ AV_CODEC_ID_APTX_HD,
-+ AV_CODEC_ID_SBC,
-+ AV_CODEC_ID_ATRAC9,
-+ AV_CODEC_ID_HCOM,
-+ AV_CODEC_ID_ACELP_KELVIN,
-+ AV_CODEC_ID_MPEGH_3D_AUDIO,
-+ AV_CODEC_ID_SIREN,
-+ AV_CODEC_ID_HCA,
-+ AV_CODEC_ID_FASTAUDIO,
-+ AV_CODEC_ID_MSNSIREN,
-+
-+ /* subtitle codecs */
-+ AV_CODEC_ID_FIRST_SUBTITLE =
-+ 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
-+ AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-+ AV_CODEC_ID_DVB_SUBTITLE,
-+ AV_CODEC_ID_TEXT, ///< raw UTF-8 text
-+ AV_CODEC_ID_XSUB,
-+ AV_CODEC_ID_SSA,
-+ AV_CODEC_ID_MOV_TEXT,
-+ AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-+ AV_CODEC_ID_DVB_TELETEXT,
-+ AV_CODEC_ID_SRT,
-+ AV_CODEC_ID_MICRODVD,
-+ AV_CODEC_ID_EIA_608,
-+ AV_CODEC_ID_JACOSUB,
-+ AV_CODEC_ID_SAMI,
-+ AV_CODEC_ID_REALTEXT,
-+ AV_CODEC_ID_STL,
-+ AV_CODEC_ID_SUBVIEWER1,
-+ AV_CODEC_ID_SUBVIEWER,
-+ AV_CODEC_ID_SUBRIP,
-+ AV_CODEC_ID_WEBVTT,
-+ AV_CODEC_ID_MPL2,
-+ AV_CODEC_ID_VPLAYER,
-+ AV_CODEC_ID_PJS,
-+ AV_CODEC_ID_ASS,
-+ AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
-+ AV_CODEC_ID_TTML,
-+ AV_CODEC_ID_ARIB_CAPTION,
-+
-+ /* other specific kind of codecs (generally used for attachments) */
-+ AV_CODEC_ID_FIRST_UNKNOWN =
-+ 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
-+ AV_CODEC_ID_TTF = 0x18000,
-+
-+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program
-+ ///< stream.
-+ AV_CODEC_ID_EPG,
-+ AV_CODEC_ID_BINTEXT,
-+ AV_CODEC_ID_XBIN,
-+ AV_CODEC_ID_IDF,
-+ AV_CODEC_ID_OTF,
-+ AV_CODEC_ID_SMPTE_KLV,
-+ AV_CODEC_ID_DVD_NAV,
-+ AV_CODEC_ID_TIMED_ID3,
-+ AV_CODEC_ID_BIN_DATA,
-+
-+ AV_CODEC_ID_PROBE =
-+ 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf
-+ ///< should attempt to identify it
-+
-+ AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_MPEG4SYSTEMS =
-+ 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing
-+ ///< only metadata information.
-+ AV_CODEC_ID_WRAPPED_AVFRAME =
-+ 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
-+};
-+
-+/**
-+ * Get the type of the given codec.
-+ */
-+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-+
-+/**
-+ * Get the name of a codec.
-+ * @return a static string identifying the codec; never NULL
-+ */
-+const char* avcodec_get_name(enum AVCodecID id);
-+
-+/**
-+ * Return codec bits per sample.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return codec bits per sample.
-+ * Only return non-zero if the bits per sample is exactly correct, not an
-+ * approximation.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec_id the ID of the codec to which the requested profile belongs
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ *
-+ * @note unlike av_get_profile_name(), which searches a list of profiles
-+ * supported by a specific decoder or encoder implementation, this
-+ * function searches the list of profiles from the AVCodecDescriptor
-+ */
-+const char* avcodec_profile_name(enum AVCodecID codec_id, int profile);
-+
-+/**
-+ * Return the PCM codec associated with a sample format.
-+ * @param be endianness, 0 for little, 1 for big,
-+ * -1 (or anything else) for native
-+ * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
-+ */
-+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_ID_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-@@ -0,0 +1,236 @@
-+/*
-+ * Codec parameters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_PAR_H
-+#define AVCODEC_CODEC_PAR_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/pixfmt.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ */
-+
-+enum AVFieldOrder {
-+ AV_FIELD_UNKNOWN,
-+ AV_FIELD_PROGRESSIVE,
-+ AV_FIELD_TT, //< Top coded_first, top displayed first
-+ AV_FIELD_BB, //< Bottom coded first, bottom displayed first
-+ AV_FIELD_TB, //< Top coded first, bottom displayed first
-+ AV_FIELD_BT, //< Bottom coded first, top displayed first
-+};
-+
-+/**
-+ * This struct describes the properties of an encoded stream.
-+ *
-+ * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must
-+ * be allocated with avcodec_parameters_alloc() and freed with
-+ * avcodec_parameters_free().
-+ */
-+typedef struct AVCodecParameters {
-+ /**
-+ * General type of the encoded data.
-+ */
-+ enum AVMediaType codec_type;
-+ /**
-+ * Specific type of the encoded data (the codec used).
-+ */
-+ enum AVCodecID codec_id;
-+ /**
-+ * Additional information about the codec (corresponds to the AVI FOURCC).
-+ */
-+ uint32_t codec_tag;
-+
-+ /**
-+ * Extra binary data needed for initializing the decoder, codec-dependent.
-+ *
-+ * Must be allocated with av_malloc() and will be freed by
-+ * avcodec_parameters_free(). The allocated size of extradata must be at
-+ * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding
-+ * bytes zeroed.
-+ */
-+ uint8_t* extradata;
-+ /**
-+ * Size of the extradata content in bytes.
-+ */
-+ int extradata_size;
-+
-+ /**
-+ * - video: the pixel format, the value corresponds to enum AVPixelFormat.
-+ * - audio: the sample format, the value corresponds to enum AVSampleFormat.
-+ */
-+ int format;
-+
-+ /**
-+ * The average bitrate of the encoded data (in bits per second).
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * The number of bits per sample in the codedwords.
-+ *
-+ * This is basically the bitrate per sample. It is mandatory for a bunch of
-+ * formats to actually decode them. It's the number of bits for one sample in
-+ * the actual coded bitstream.
-+ *
-+ * This could be for example 4 for ADPCM
-+ * For PCM formats this matches bits_per_raw_sample
-+ * Can be 0
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * This is the number of valid bits in each output sample. If the
-+ * sample format has more bits, the least significant bits are additional
-+ * padding bits, which are always 0. Use right shifts to reduce the sample
-+ * to its actual size. For example, audio formats with 24 bit samples will
-+ * have bits_per_raw_sample set to 24, and format set to AV_SAMPLE_FMT_S32.
-+ * To get the original sample use "(int32_t)sample >> 8"."
-+ *
-+ * For ADPCM this might be 12 or 16 or similar
-+ * Can be 0
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * Codec-specific bitstream restrictions that the stream conforms to.
-+ */
-+ int profile;
-+ int level;
-+
-+ /**
-+ * Video only. The dimensions of the video frame in pixels.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Video only. The aspect ratio (width / height) which a single pixel
-+ * should have when displayed.
-+ *
-+ * When the aspect ratio is unknown / undefined, the numerator should be
-+ * set to 0 (the denominator may have any value).
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Video only. The order of the fields in interlaced video.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Video only. Additional colorspace characteristics.
-+ */
-+ enum AVColorRange color_range;
-+ enum AVColorPrimaries color_primaries;
-+ enum AVColorTransferCharacteristic color_trc;
-+ enum AVColorSpace color_space;
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * Video only. Number of delayed frames.
-+ */
-+ int video_delay;
-+
-+ /**
-+ * Audio only. The channel layout bitmask. May be 0 if the channel layout is
-+ * unknown or unspecified, otherwise the number of bits set must be equal to
-+ * the channels field.
-+ */
-+ uint64_t channel_layout;
-+ /**
-+ * Audio only. The number of audio channels.
-+ */
-+ int channels;
-+ /**
-+ * Audio only. The number of audio samples per second.
-+ */
-+ int sample_rate;
-+ /**
-+ * Audio only. The number of bytes per coded audio frame, required by some
-+ * formats.
-+ *
-+ * Corresponds to nBlockAlign in WAVEFORMATEX.
-+ */
-+ int block_align;
-+ /**
-+ * Audio only. Audio frame size, if known. Required by some formats to be
-+ * static.
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) inserted by the encoder at
-+ * the beginning of the audio. I.e. this number of leading decoded samples
-+ * must be discarded by the caller to get the original audio without leading
-+ * padding.
-+ */
-+ int initial_padding;
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ */
-+ int trailing_padding;
-+ /**
-+ * Audio only. Number of samples to skip after a discontinuity.
-+ */
-+ int seek_preroll;
-+} AVCodecParameters;
-+
-+/**
-+ * Allocate a new AVCodecParameters and set its fields to default values
-+ * (unknown/invalid/0). The returned struct must be freed with
-+ * avcodec_parameters_free().
-+ */
-+AVCodecParameters* avcodec_parameters_alloc(void);
-+
-+/**
-+ * Free an AVCodecParameters instance and everything associated with it and
-+ * write NULL to the supplied pointer.
-+ */
-+void avcodec_parameters_free(AVCodecParameters** par);
-+
-+/**
-+ * Copy the contents of src to dst. Any allocated fields in dst are freed and
-+ * replaced with newly allocated duplicates of the corresponding fields in src.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_copy(AVCodecParameters* dst,
-+ const AVCodecParameters* src);
-+
-+/**
-+ * This function is the same as av_get_audio_frame_duration(), except it works
-+ * with AVCodecParameters instead of an AVCodecContext.
-+ */
-+int av_get_audio_frame_duration2(AVCodecParameters* par, int frame_bytes);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_PAR_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-@@ -0,0 +1,171 @@
-+/*
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_DEFS_H
-+#define AVCODEC_DEFS_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Misc types and constants that do not belong anywhere else.
-+ */
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+
-+/**
-+ * @ingroup lavc_decoding
-+ * Required number of additionally allocated bytes at the end of the input
-+ * bitstream for decoding. This is mainly needed because some optimized
-+ * bitstream readers read 32 or 64 bit at once and could read over the end.<br>
-+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
-+ * MPEG bitstreams could cause overread and segfault.
-+ */
-+#define AV_INPUT_BUFFER_PADDING_SIZE 64
-+
-+/**
-+ * @ingroup lavc_decoding
-+ */
-+enum AVDiscard {
-+ /* We leave some space between them for extensions (drop some
-+ * keyframes for intra-only or drop just some bidir frames). */
-+ AVDISCARD_NONE = -16, ///< discard nothing
-+ AVDISCARD_DEFAULT =
-+ 0, ///< discard useless packets like 0 size packets in avi
-+ AVDISCARD_NONREF = 8, ///< discard all non reference
-+ AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
-+ AVDISCARD_NONINTRA = 24, ///< discard all non intra frames
-+ AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-+ AVDISCARD_ALL = 48, ///< discard all
-+};
-+
-+enum AVAudioServiceType {
-+ AV_AUDIO_SERVICE_TYPE_MAIN = 0,
-+ AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
-+ AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-+ AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3,
-+ AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4,
-+ AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5,
-+ AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6,
-+ AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7,
-+ AV_AUDIO_SERVICE_TYPE_KARAOKE = 8,
-+ AV_AUDIO_SERVICE_TYPE_NB, ///< Not part of ABI
-+};
-+
-+/**
-+ * Pan Scan area.
-+ * This specifies the area which should be displayed.
-+ * Note there may be multiple such areas for one frame.
-+ */
-+typedef struct AVPanScan {
-+ /**
-+ * id
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int id;
-+
-+ /**
-+ * width and height in 1/16 pel
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * position of the top left corner in 1/16 pel for up to 3 fields/frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int16_t position[3][2];
-+} AVPanScan;
-+
-+/**
-+ * This structure describes the bitrate properties of an encoded bitstream. It
-+ * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD
-+ * parameters for H.264/HEVC.
-+ */
-+typedef struct AVCPBProperties {
-+ /**
-+ * Maximum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t max_bitrate;
-+ /**
-+ * Minimum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t min_bitrate;
-+ /**
-+ * Average bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t avg_bitrate;
-+
-+ /**
-+ * The size of the buffer to which the ratecontrol is applied, in bits.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t buffer_size;
-+
-+ /**
-+ * The delay between the time the packet this structure is associated with
-+ * is received and the time when it should be decoded, in periods of a 27MHz
-+ * clock.
-+ *
-+ * UINT64_MAX when unknown or unspecified.
-+ */
-+ uint64_t vbv_delay;
-+} AVCPBProperties;
-+
-+/**
-+ * Allocate a CPB properties structure and initialize its fields to default
-+ * values.
-+ *
-+ * @param size if non-NULL, the size of the allocated struct will be written
-+ * here. This is useful for embedding it in side data.
-+ *
-+ * @return the newly allocated struct or NULL on failure
-+ */
-+AVCPBProperties* av_cpb_properties_alloc(size_t* size);
-+
-+/**
-+ * This structure supplies correlation between a packet timestamp and a wall
-+ * clock production time. The definition follows the Producer Reference Time
-+ * ('prft') as defined in ISO/IEC 14496-12
-+ */
-+typedef struct AVProducerReferenceTime {
-+ /**
-+ * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()).
-+ */
-+ int64_t wallclock;
-+ int flags;
-+} AVProducerReferenceTime;
-+
-+/**
-+ * Encode extradata length to a buffer. Used by xiph codecs.
-+ *
-+ * @param s buffer to write to; must be at least (v/255+1) bytes long
-+ * @param v size of extradata in bytes
-+ * @return number of bytes written to the buffer.
-+ */
-+unsigned int av_xiphlacing(unsigned char* s, unsigned int v);
-+
-+#endif // AVCODEC_DEFS_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-@@ -0,0 +1,724 @@
-+/*
-+ * AVPacket public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_PACKET_H
-+#define AVCODEC_PACKET_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "libavutil/attributes.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/rational.h"
-+
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @defgroup lavc_packet AVPacket
-+ *
-+ * Types and functions for working with AVPacket.
-+ * @{
-+ */
-+enum AVPacketSideDataType {
-+ /**
-+ * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
-+ * bytes worth of palette. This side data signals that a new palette is
-+ * present.
-+ */
-+ AV_PKT_DATA_PALETTE,
-+
-+ /**
-+ * The AV_PKT_DATA_NEW_EXTRADATA is used to notify the codec or the format
-+ * that the extradata buffer was changed and the receiving side should
-+ * act upon it appropriately. The new extradata is embedded in the side
-+ * data buffer and should be immediately used for processing the current
-+ * frame or packet.
-+ */
-+ AV_PKT_DATA_NEW_EXTRADATA,
-+
-+ /**
-+ * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-+ * @code
-+ * u32le param_flags
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-+ * s32le channel_count
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-+ * u64le channel_layout
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-+ * s32le sample_rate
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-+ * s32le width
-+ * s32le height
-+ * @endcode
-+ */
-+ AV_PKT_DATA_PARAM_CHANGE,
-+
-+ /**
-+ * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-+ * structures with info about macroblocks relevant to splitting the
-+ * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-+ * That is, it does not necessarily contain info about all macroblocks,
-+ * as long as the distance between macroblocks in the info is smaller
-+ * than the target payload size.
-+ * Each MB info structure is 12 bytes, and is laid out as follows:
-+ * @code
-+ * u32le bit offset from the start of the packet
-+ * u8 current quantizer at the start of the macroblock
-+ * u8 GOB number
-+ * u16le macroblock address within the GOB
-+ * u8 horizontal MV predictor
-+ * u8 vertical MV predictor
-+ * u8 horizontal MV predictor for block number 3
-+ * u8 vertical MV predictor for block number 3
-+ * @endcode
-+ */
-+ AV_PKT_DATA_H263_MB_INFO,
-+
-+ /**
-+ * This side data should be associated with an audio stream and contains
-+ * ReplayGain information in form of the AVReplayGain struct.
-+ */
-+ AV_PKT_DATA_REPLAYGAIN,
-+
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the decoded video frames for
-+ * correct presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_PKT_DATA_DISPLAYMATRIX,
-+
-+ /**
-+ * This side data should be associated with a video stream and contains
-+ * Stereoscopic 3D information in form of the AVStereo3D struct.
-+ */
-+ AV_PKT_DATA_STEREO3D,
-+
-+ /**
-+ * This side data should be associated with an audio stream and corresponds
-+ * to enum AVAudioServiceType.
-+ */
-+ AV_PKT_DATA_AUDIO_SERVICE_TYPE,
-+
-+ /**
-+ * This side data contains quality related information from the encoder.
-+ * @code
-+ * u32le quality factor of the compressed frame. Allowed range is between 1
-+ * (good) and FF_LAMBDA_MAX (bad). u8 picture type u8 error count u16
-+ * reserved u64le[error count] sum of squared differences between encoder in
-+ * and output
-+ * @endcode
-+ */
-+ AV_PKT_DATA_QUALITY_STATS,
-+
-+ /**
-+ * This side data contains an integer value representing the stream index
-+ * of a "fallback" track. A fallback track indicates an alternate
-+ * track to use when the current track can not be decoded for some reason.
-+ * e.g. no decoder available for codec.
-+ */
-+ AV_PKT_DATA_FALLBACK_TRACK,
-+
-+ /**
-+ * This side data corresponds to the AVCPBProperties struct.
-+ */
-+ AV_PKT_DATA_CPB_PROPERTIES,
-+
-+ /**
-+ * Recommmends skipping the specified number of samples
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SKIP_SAMPLES,
-+
-+ /**
-+ * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
-+ * the packet may contain "dual mono" audio specific to Japanese DTV
-+ * and if it is true, recommends only the selected channel to be used.
-+ * @code
-+ * u8 selected channels (0=mail/left, 1=sub/right, 2=both)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_JP_DUALMONO,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop.
-+ */
-+ AV_PKT_DATA_STRINGS_METADATA,
-+
-+ /**
-+ * Subtitle event position
-+ * @code
-+ * u32le x1
-+ * u32le y1
-+ * u32le x2
-+ * u32le y2
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SUBTITLE_POSITION,
-+
-+ /**
-+ * Data found in BlockAdditional element of matroska container. There is
-+ * no end marker for the data, so it is required to rely on the side data
-+ * size to recognize the end. 8 byte id (as found in BlockAddId) followed
-+ * by data.
-+ */
-+ AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
-+
-+ /**
-+ * The optional first identifier line of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_IDENTIFIER,
-+
-+ /**
-+ * The optional settings (rendering instructions) that immediately
-+ * follow the timestamp specifier of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_SETTINGS,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop. This
-+ * side data includes updated metadata which appeared in the stream.
-+ */
-+ AV_PKT_DATA_METADATA_UPDATE,
-+
-+ /**
-+ * MPEGTS stream ID as uint8_t, this is required to pass the stream ID
-+ * information from the demuxer to the corresponding muxer.
-+ */
-+ AV_PKT_DATA_MPEGTS_STREAM_ID,
-+
-+ /**
-+ * Mastering display metadata (based on SMPTE-2086:2014). This metadata
-+ * should be associated with a video stream and contains data in the form
-+ * of the AVMasteringDisplayMetadata struct.
-+ */
-+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
-+
-+ /**
-+ * This side data should be associated with a video stream and corresponds
-+ * to the AVSphericalMapping structure.
-+ */
-+ AV_PKT_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This metadata should be
-+ * associated with a video stream and contains data in the form of the
-+ * AVContentLightMetadata struct.
-+ */
-+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
-+ * a video stream. A53 CC bitstream is stored as uint8_t in
-+ * AVPacketSideData.data. The number of bytes of CC data is
-+ * AVPacketSideData.size.
-+ */
-+ AV_PKT_DATA_A53_CC,
-+
-+ /**
-+ * This side data is encryption initialization data.
-+ * The format is not part of ABI, use av_encryption_init_info_* methods to
-+ * access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INIT_INFO,
-+
-+ /**
-+ * This side data contains encryption info for how to decrypt the packet.
-+ * The format is not part of ABI, use av_encryption_info_* methods to access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INFO,
-+
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_PKT_DATA_AFD,
-+
-+ /**
-+ * Producer Reference Time data corresponding to the AVProducerReferenceTime
-+ * struct, usually exported by some encoders (on demand through the prft flag
-+ * set in the AVCodecContext export_side_data field).
-+ */
-+ AV_PKT_DATA_PRFT,
-+
-+ /**
-+ * ICC profile data consisting of an opaque octet buffer following the
-+ * format described by ISO 15076-1.
-+ */
-+ AV_PKT_DATA_ICC_PROFILE,
-+
-+ /**
-+ * DOVI configuration
-+ * ref:
-+ * dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2,
-+ * section 2.2
-+ * dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2,
-+ * section 3.3 Tags are stored in struct AVDOVIDecoderConfigurationRecord.
-+ */
-+ AV_PKT_DATA_DOVI_CONF,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_PKT_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR10+ dynamic metadata associated with a video frame. The metadata is in
-+ * the form of the AVDynamicHDRPlus struct and contains
-+ * information for color volume transform - application 4 of
-+ * SMPTE 2094-40:2016 standard.
-+ */
-+ AV_PKT_DATA_DYNAMIC_HDR10_PLUS,
-+
-+ /**
-+ * The number of side data types.
-+ * This is not part of the public API/ABI in the sense that it may
-+ * change when new side data types are added.
-+ * This must stay the last enum value.
-+ * If its value becomes huge, some code using it
-+ * needs to be updated as it assumes it to be smaller than other limits.
-+ */
-+ AV_PKT_DATA_NB
-+};
-+
-+#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS // DEPRECATED
-+
-+typedef struct AVPacketSideData {
-+ uint8_t* data;
-+ size_t size;
-+ enum AVPacketSideDataType type;
-+} AVPacketSideData;
-+
-+/**
-+ * This structure stores compressed data. It is typically exported by demuxers
-+ * and then passed as input to decoders, or received as output from encoders and
-+ * then passed to muxers.
-+ *
-+ * For video, it should typically contain one compressed frame. For audio it may
-+ * contain several compressed frames. Encoders are allowed to output empty
-+ * packets, with no compressed data, containing only side data
-+ * (e.g. to update some stream parameters at the end of encoding).
-+ *
-+ * The semantics of data ownership depends on the buf field.
-+ * If it is set, the packet data is dynamically allocated and is
-+ * valid indefinitely until a call to av_packet_unref() reduces the
-+ * reference count to 0.
-+ *
-+ * If the buf field is not set av_packet_ref() would make a copy instead
-+ * of increasing the reference count.
-+ *
-+ * The side data is always allocated with av_malloc(), copied by
-+ * av_packet_ref() and freed by av_packet_unref().
-+ *
-+ * sizeof(AVPacket) being a part of the public ABI is deprecated. once
-+ * av_init_packet() is removed, new packets will only be able to be allocated
-+ * with av_packet_alloc(), and new fields may be added to the end of the struct
-+ * with a minor bump.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ * @see av_packet_unref
-+ */
-+typedef struct AVPacket {
-+ /**
-+ * A reference to the reference-counted buffer where the packet data is
-+ * stored.
-+ * May be NULL, then the packet data is not reference-counted.
-+ */
-+ AVBufferRef* buf;
-+ /**
-+ * Presentation timestamp in AVStream->time_base units; the time at which
-+ * the decompressed packet will be presented to the user.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ * pts MUST be larger or equal to dts as presentation cannot happen before
-+ * decompression, unless one wants to view hex dumps. Some formats misuse
-+ * the terms dts and pts/cts to mean something different. Such timestamps
-+ * must be converted to true pts/dts before they are stored in AVPacket.
-+ */
-+ int64_t pts;
-+ /**
-+ * Decompression timestamp in AVStream->time_base units; the time at which
-+ * the packet is decompressed.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ */
-+ int64_t dts;
-+ uint8_t* data;
-+ int size;
-+ int stream_index;
-+ /**
-+ * A combination of AV_PKT_FLAG values
-+ */
-+ int flags;
-+ /**
-+ * Additional packet data that can be provided by the container.
-+ * Packet can contain several types of side information.
-+ */
-+ AVPacketSideData* side_data;
-+ int side_data_elems;
-+
-+ /**
-+ * Duration of this packet in AVStream->time_base units, 0 if unknown.
-+ * Equals next_pts - this_pts in presentation order.
-+ */
-+ int64_t duration;
-+
-+ int64_t pos; ///< byte position in stream, -1 if unknown
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the packet is unreferenced. av_packet_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target packet's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * Time base of the packet's timestamps.
-+ * In the future, this field may be set on packets output by encoders or
-+ * demuxers, but its value will be by default ignored on input to decoders
-+ * or muxers.
-+ */
-+ AVRational time_base;
-+} AVPacket;
-+
-+#if FF_API_INIT_PACKET
-+attribute_deprecated typedef struct AVPacketList {
-+ AVPacket pkt;
-+ struct AVPacketList* next;
-+} AVPacketList;
-+#endif
-+
-+#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
-+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-+/**
-+ * Flag is used to discard packets which are required to maintain valid
-+ * decoder state but are not required for output and should be dropped
-+ * after decoding.
-+ **/
-+#define AV_PKT_FLAG_DISCARD 0x0004
-+/**
-+ * The packet comes from a trusted source.
-+ *
-+ * Otherwise-unsafe constructs such as arbitrary pointers to data
-+ * outside the packet may be followed.
-+ */
-+#define AV_PKT_FLAG_TRUSTED 0x0008
-+/**
-+ * Flag is used to indicate packets that contain frames that can
-+ * be discarded by the decoder. I.e. Non-reference frames.
-+ */
-+#define AV_PKT_FLAG_DISPOSABLE 0x0010
-+
-+enum AVSideDataParamChangeFlags {
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-+ AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004,
-+ AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008,
-+};
-+
-+/**
-+ * Allocate an AVPacket and set its fields to default values. The resulting
-+ * struct must be freed using av_packet_free().
-+ *
-+ * @return An AVPacket filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVPacket itself, not the data buffers. Those
-+ * must be allocated through other means such as av_new_packet.
-+ *
-+ * @see av_new_packet
-+ */
-+AVPacket* av_packet_alloc(void);
-+
-+/**
-+ * Create a new packet that references the same data as src.
-+ *
-+ * This is a shortcut for av_packet_alloc()+av_packet_ref().
-+ *
-+ * @return newly created AVPacket on success, NULL on error.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ */
-+AVPacket* av_packet_clone(const AVPacket* src);
-+
-+/**
-+ * Free the packet, if the packet is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param pkt packet to be freed. The pointer will be set to NULL.
-+ * @note passing NULL is a no-op.
-+ */
-+void av_packet_free(AVPacket** pkt);
-+
-+#if FF_API_INIT_PACKET
-+/**
-+ * Initialize optional fields of a packet with default values.
-+ *
-+ * Note, this does not touch the data and size members, which have to be
-+ * initialized separately.
-+ *
-+ * @param pkt packet
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_unref
-+ *
-+ * @deprecated This function is deprecated. Once it's removed,
-+ sizeof(AVPacket) will not be a part of the ABI anymore.
-+ */
-+attribute_deprecated void av_init_packet(AVPacket* pkt);
-+#endif
-+
-+/**
-+ * Allocate the payload of a packet and initialize its fields with
-+ * default values.
-+ *
-+ * @param pkt packet
-+ * @param size wanted payload size
-+ * @return 0 if OK, AVERROR_xxx otherwise
-+ */
-+int av_new_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Reduce packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param size new size
-+ */
-+void av_shrink_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Increase packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param grow_by number of bytes by which to increase the size of the packet
-+ */
-+int av_grow_packet(AVPacket* pkt, int grow_by);
-+
-+/**
-+ * Initialize a reference-counted packet from av_malloc()ed data.
-+ *
-+ * @param pkt packet to be initialized. This function will set the data, size,
-+ * and buf fields, all others are left untouched.
-+ * @param data Data allocated by av_malloc() to be used as packet data. If this
-+ * function returns successfully, the data is owned by the underlying
-+ * AVBuffer. The caller may not access the data through other means.
-+ * @param size size of data in bytes, without the padding. I.e. the full buffer
-+ * size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_packet_from_data(AVPacket* pkt, uint8_t* data, int size);
-+
-+/**
-+ * Allocate new information of a packet.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size side information size
-+ * @return pointer to fresh allocated data or NULL otherwise
-+ */
-+uint8_t* av_packet_new_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Wrap an existing array as a packet side data.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param data the side data array. It must be allocated with the av_malloc()
-+ * family of functions. The ownership of the data is transferred to
-+ * pkt.
-+ * @param size side information size
-+ * @return a non-negative number on success, a negative AVERROR code on
-+ * failure. On failure, the packet is unchanged and the data remains
-+ * owned by the caller.
-+ */
-+int av_packet_add_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ uint8_t* data, size_t size);
-+
-+/**
-+ * Shrink the already allocated side data buffer
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size new side information size
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_shrink_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Get side information from packet.
-+ *
-+ * @param pkt packet
-+ * @param type desired side information type
-+ * @param size If supplied, *size will be set to the size of the side data
-+ * or to zero if the desired side data is not present.
-+ * @return pointer to data if present or NULL otherwise
-+ */
-+uint8_t* av_packet_get_side_data(const AVPacket* pkt,
-+ enum AVPacketSideDataType type, size_t* size);
-+
-+const char* av_packet_side_data_name(enum AVPacketSideDataType type);
-+
-+/**
-+ * Pack a dictionary for use in side_data.
-+ *
-+ * @param dict The dictionary to pack.
-+ * @param size pointer to store the size of the returned data
-+ * @return pointer to data if successful, NULL otherwise
-+ */
-+uint8_t* av_packet_pack_dictionary(AVDictionary* dict, size_t* size);
-+/**
-+ * Unpack a dictionary from side_data.
-+ *
-+ * @param data data from side_data
-+ * @param size size of the data
-+ * @param dict the metadata storage dictionary
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_unpack_dictionary(const uint8_t* data, size_t size,
-+ AVDictionary** dict);
-+
-+/**
-+ * Convenience function to free all the side data stored.
-+ * All the other fields stay untouched.
-+ *
-+ * @param pkt packet
-+ */
-+void av_packet_free_side_data(AVPacket* pkt);
-+
-+/**
-+ * Setup a new reference to the data described by a given packet
-+ *
-+ * If src is reference-counted, setup dst as a new reference to the
-+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
-+ * data from src into it.
-+ *
-+ * All the other fields are copied from src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param dst Destination packet. Will be completely overwritten.
-+ * @param src Source packet
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On error, dst
-+ * will be blank (as if returned by av_packet_alloc()).
-+ */
-+int av_packet_ref(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Wipe the packet.
-+ *
-+ * Unreference the buffer referenced by the packet and reset the
-+ * remaining packet fields to their default values.
-+ *
-+ * @param pkt The packet to be unreferenced.
-+ */
-+void av_packet_unref(AVPacket* pkt);
-+
-+/**
-+ * Move every field in src to dst and reset src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param src Source packet, will be reset
-+ * @param dst Destination packet
-+ */
-+void av_packet_move_ref(AVPacket* dst, AVPacket* src);
-+
-+/**
-+ * Copy only "properties" fields from src to dst.
-+ *
-+ * Properties for the purpose of this function are all the fields
-+ * beside those related to the packet data (buf, data, size)
-+ *
-+ * @param dst Destination packet
-+ * @param src Source packet
-+ *
-+ * @return 0 on success AVERROR on failure.
-+ */
-+int av_packet_copy_props(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Ensure the data described by a given packet is reference counted.
-+ *
-+ * @note This function does not ensure that the reference will be writable.
-+ * Use av_packet_make_writable instead for that purpose.
-+ *
-+ * @see av_packet_ref
-+ * @see av_packet_make_writable
-+ *
-+ * @param pkt packet whose data should be made reference counted.
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_refcounted(AVPacket* pkt);
-+
-+/**
-+ * Create a writable reference for the data described by a given packet,
-+ * avoiding data copy if possible.
-+ *
-+ * @param pkt Packet whose data should be made writable.
-+ *
-+ * @return 0 on success, a negative AVERROR on failure. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_writable(AVPacket* pkt);
-+
-+/**
-+ * Convert valid timing fields (timestamps / durations) in a packet from one
-+ * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
-+ * ignored.
-+ *
-+ * @param pkt packet on which the conversion will be performed
-+ * @param tb_src source timebase, in which the timing fields in pkt are
-+ * expressed
-+ * @param tb_dst destination timebase, to which the timing fields will be
-+ * converted
-+ */
-+void av_packet_rescale_ts(AVPacket* pkt, AVRational tb_src, AVRational tb_dst);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_PACKET_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-@@ -0,0 +1,156 @@
-+/*
-+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
-+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
-+ *
-+ * Copyright (C) 2008 NVIDIA
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VDPAU_H
-+#define AVCODEC_VDPAU_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_codec_hwaccel_vdpau
-+ * Public libavcodec VDPAU header.
-+ */
-+
-+/**
-+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
-+ * @ingroup lavc_codec_hwaccel
-+ *
-+ * VDPAU hardware acceleration has two modules
-+ * - VDPAU decoding
-+ * - VDPAU presentation
-+ *
-+ * The VDPAU decoding module parses all headers using FFmpeg
-+ * parsing mechanisms and uses VDPAU for the actual decoding.
-+ *
-+ * As per the current implementation, the actual decoding
-+ * and rendering (API calls) are done as part of the VDPAU
-+ * presentation (vo_vdpau.c) module.
-+ *
-+ * @{
-+ */
-+
-+#include <vdpau/vdpau.h>
-+
-+#include "libavutil/avconfig.h"
-+#include "libavutil/attributes.h"
-+
-+#include "avcodec.h"
-+
-+struct AVCodecContext;
-+struct AVFrame;
-+
-+typedef int (*AVVDPAU_Render2)(struct AVCodecContext*, struct AVFrame*,
-+ const VdpPictureInfo*, uint32_t,
-+ const VdpBitstreamBuffer*);
-+
-+/**
-+ * This structure is used to share data between the libavcodec library and
-+ * the client video application.
-+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
-+ * function and make it available as
-+ * AVCodecContext.hwaccel_context. Members can be set by the user once
-+ * during initialization or through each AVCodecContext.get_buffer()
-+ * function call. In any case, they must be valid prior to calling
-+ * decoding functions.
-+ *
-+ * The size of this structure is not a part of the public ABI and must not
-+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
-+ * AVVDPAUContext.
-+ */
-+typedef struct AVVDPAUContext {
-+ /**
-+ * VDPAU decoder handle
-+ *
-+ * Set by user.
-+ */
-+ VdpDecoder decoder;
-+
-+ /**
-+ * VDPAU decoder render callback
-+ *
-+ * Set by the user.
-+ */
-+ VdpDecoderRender* render;
-+
-+ AVVDPAU_Render2 render2;
-+} AVVDPAUContext;
-+
-+/**
-+ * @brief allocation function for AVVDPAUContext
-+ *
-+ * Allows extending the struct without breaking API/ABI
-+ */
-+AVVDPAUContext* av_alloc_vdpaucontext(void);
-+
-+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext*);
-+void av_vdpau_hwaccel_set_render2(AVVDPAUContext*, AVVDPAU_Render2);
-+
-+/**
-+ * Associate a VDPAU device with a codec context for hardware acceleration.
-+ * This function is meant to be called from the get_format() codec callback,
-+ * or earlier. It can also be called after avcodec_flush_buffers() to change
-+ * the underlying VDPAU device mid-stream (e.g. to recover from non-transparent
-+ * display preemption).
-+ *
-+ * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
-+ * successfully.
-+ *
-+ * @param avctx decoding context whose get_format() callback is invoked
-+ * @param device VDPAU device handle to use for hardware acceleration
-+ * @param get_proc_address VDPAU device driver
-+ * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags
-+ *
-+ * @return 0 on success, an AVERROR code on failure.
-+ */
-+int av_vdpau_bind_context(AVCodecContext* avctx, VdpDevice device,
-+ VdpGetProcAddress* get_proc_address, unsigned flags);
-+
-+/**
-+ * Gets the parameters to create an adequate VDPAU video surface for the codec
-+ * context using VDPAU hardware decoding acceleration.
-+ *
-+ * @note Behavior is undefined if the context was not successfully bound to a
-+ * VDPAU device using av_vdpau_bind_context().
-+ *
-+ * @param avctx the codec context being used for decoding the stream
-+ * @param type storage space for the VDPAU video surface chroma type
-+ * (or NULL to ignore)
-+ * @param width storage space for the VDPAU video surface pixel width
-+ * (or NULL to ignore)
-+ * @param height storage space for the VDPAU video surface pixel height
-+ * (or NULL to ignore)
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_vdpau_get_surface_parameters(AVCodecContext* avctx, VdpChromaType* type,
-+ uint32_t* width, uint32_t* height);
-+
-+/**
-+ * Allocate an AVVDPAUContext.
-+ *
-+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
-+ */
-+AVVDPAUContext* av_vdpau_alloc_context(void);
-+
-+/* @}*/
-+
-+#endif /* AVCODEC_VDPAU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-@@ -0,0 +1,67 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VERSION_H
-+#define AVCODEC_VERSION_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec version macros.
-+ */
-+
-+#include "libavutil/version.h"
-+
-+#define LIBAVCODEC_VERSION_MAJOR 59
-+#define LIBAVCODEC_VERSION_MINOR 18
-+#define LIBAVCODEC_VERSION_MICRO 100
-+
-+#define LIBAVCODEC_VERSION_INT \
-+ AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_VERSION \
-+ AV_VERSION(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-+
-+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-+
-+/**
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ */
-+
-+#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60)
-+
-+#endif /* AVCODEC_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-@@ -0,0 +1,173 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Macro definitions for various function/variable attributes
-+ */
-+
-+#ifndef AVUTIL_ATTRIBUTES_H
-+#define AVUTIL_ATTRIBUTES_H
-+
-+#ifdef __GNUC__
-+# define AV_GCC_VERSION_AT_LEAST(x, y) \
-+ (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-+# define AV_GCC_VERSION_AT_MOST(x, y) \
-+ (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y))
-+#else
-+# define AV_GCC_VERSION_AT_LEAST(x, y) 0
-+# define AV_GCC_VERSION_AT_MOST(x, y) 0
-+#endif
-+
-+#ifdef __has_builtin
-+# define AV_HAS_BUILTIN(x) __has_builtin(x)
-+#else
-+# define AV_HAS_BUILTIN(x) 0
-+#endif
-+
-+#ifndef av_always_inline
-+# if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_always_inline __attribute__((always_inline)) inline
-+# elif defined(_MSC_VER)
-+# define av_always_inline __forceinline
-+# else
-+# define av_always_inline inline
-+# endif
-+#endif
-+
-+#ifndef av_extern_inline
-+# if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
-+# define av_extern_inline extern inline
-+# else
-+# define av_extern_inline inline
-+# endif
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 4)
-+# define av_warn_unused_result __attribute__((warn_unused_result))
-+#else
-+# define av_warn_unused_result
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_noinline __attribute__((noinline))
-+#elif defined(_MSC_VER)
-+# define av_noinline __declspec(noinline)
-+#else
-+# define av_noinline
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_pure __attribute__((pure))
-+#else
-+# define av_pure
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 6) || defined(__clang__)
-+# define av_const __attribute__((const))
-+#else
-+# define av_const
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3) || defined(__clang__)
-+# define av_cold __attribute__((cold))
-+#else
-+# define av_cold
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 1) && !defined(__llvm__)
-+# define av_flatten __attribute__((flatten))
-+#else
-+# define av_flatten
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define attribute_deprecated __attribute__((deprecated))
-+#elif defined(_MSC_VER)
-+# define attribute_deprecated __declspec(deprecated)
-+#else
-+# define attribute_deprecated
-+#endif
-+
-+/**
-+ * Disable warnings about deprecated features
-+ * This is useful for sections of code kept for backward compatibility and
-+ * scheduled for removal.
-+ */
-+#ifndef AV_NOWARN_DEPRECATED
-+# if AV_GCC_VERSION_AT_LEAST(4, 6)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ _Pragma("GCC diagnostic push") \
-+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
-+ code _Pragma("GCC diagnostic pop")
-+# elif defined(_MSC_VER)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ __pragma(warning(push)) __pragma(warning(disable : 4996)) code; \
-+ __pragma(warning(pop))
-+# else
-+# define AV_NOWARN_DEPRECATED(code) code
-+# endif
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_unused __attribute__((unused))
-+#else
-+# define av_unused
-+#endif
-+
-+/**
-+ * Mark a variable as used and prevent the compiler from optimizing it
-+ * away. This is useful for variables accessed only from inline
-+ * assembler without the compiler being aware.
-+ */
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_used __attribute__((used))
-+#else
-+# define av_used
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 3) || defined(__clang__)
-+# define av_alias __attribute__((may_alias))
-+#else
-+# define av_alias
-+#endif
-+
-+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
-+# define av_uninit(x) x = x
-+#else
-+# define av_uninit(x) x
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_builtin_constant_p __builtin_constant_p
-+# define av_printf_format(fmtpos, attrpos) \
-+ __attribute__((__format__(__printf__, fmtpos, attrpos)))
-+#else
-+# define av_builtin_constant_p(x) 0
-+# define av_printf_format(fmtpos, attrpos)
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 5) || defined(__clang__)
-+# define av_noreturn __attribute__((noreturn))
-+#else
-+# define av_noreturn
-+#endif
-+
-+#endif /* AVUTIL_ATTRIBUTES_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-@@ -0,0 +1,6 @@
-+/* Generated by ffmpeg configure */
-+#ifndef AVUTIL_AVCONFIG_H
-+#define AVUTIL_AVCONFIG_H
-+#define AV_HAVE_BIGENDIAN 0
-+#define AV_HAVE_FAST_UNALIGNED 1
-+#endif /* AVUTIL_AVCONFIG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-@@ -0,0 +1,366 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_AVUTIL_H
-+#define AVUTIL_AVUTIL_H
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Convenience header that includes @ref lavu "libavutil"'s core.
-+ */
-+
-+/**
-+ * @mainpage
-+ *
-+ * @section ffmpeg_intro Introduction
-+ *
-+ * This document describes the usage of the different libraries
-+ * provided by FFmpeg.
-+ *
-+ * @li @ref libavc "libavcodec" encoding/decoding library
-+ * @li @ref lavfi "libavfilter" graph-based frame editing library
-+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
-+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
-+ * @li @ref lavu "libavutil" common utility library
-+ * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
-+ * @li @ref lpp "libpostproc" post processing library
-+ * @li @ref libsws "libswscale" color conversion and scaling library
-+ *
-+ * @section ffmpeg_versioning Versioning and compatibility
-+ *
-+ * Each of the FFmpeg libraries contains a version.h header, which defines a
-+ * major, minor and micro version number with the
-+ * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
-+ * number is incremented with backward incompatible changes - e.g. removing
-+ * parts of the public API, reordering public struct members, etc. The minor
-+ * version number is incremented for backward compatible API changes or major
-+ * new features - e.g. adding a new public function or a new decoder. The micro
-+ * version number is incremented for smaller changes that a calling program
-+ * might still want to check for - e.g. changing behavior in a previously
-+ * unspecified situation.
-+ *
-+ * FFmpeg guarantees backward API and ABI compatibility for each library as long
-+ * as its major version number is unchanged. This means that no public symbols
-+ * will be removed or renamed. Types and names of the public struct members and
-+ * values of public macros and enums will remain the same (unless they were
-+ * explicitly declared as not part of the public API). Documented behavior will
-+ * not change.
-+ *
-+ * In other words, any correct program that works with a given FFmpeg snapshot
-+ * should work just as well without any changes with any later snapshot with the
-+ * same major versions. This applies to both rebuilding the program against new
-+ * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
-+ * links against.
-+ *
-+ * However, new public symbols may be added and new members may be appended to
-+ * public structs whose size is not part of public ABI (most public structs in
-+ * FFmpeg). New macros and enum values may be added. Behavior in undocumented
-+ * situations may change slightly (and be documented). All those are accompanied
-+ * by an entry in doc/APIchanges and incrementing either the minor or micro
-+ * version number.
-+ */
-+
-+/**
-+ * @defgroup lavu libavutil
-+ * Common code shared across all FFmpeg libraries.
-+ *
-+ * @note
-+ * libavutil is designed to be modular. In most cases, in order to use the
-+ * functions provided by one component of libavutil you must explicitly include
-+ * the specific header containing that feature. If you are only using
-+ * media-related components, you could simply include libavutil/avutil.h, which
-+ * brings in most of the "core" components.
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_crypto Crypto and Hashing
-+ *
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavu_math Mathematics
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_string String Manipulation
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_mem Memory Management
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_data Data Structures
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_video Video related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_audio Audio related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_error Error Codes
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_log Logging Facility
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_misc Other
-+ *
-+ * @{
-+ *
-+ * @defgroup preproc_misc Preprocessor String Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup version_utils Library Version Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_ver
-+ * @{
-+ */
-+
-+/**
-+ * Return the LIBAVUTIL_VERSION_INT constant.
-+ */
-+unsigned avutil_version(void);
-+
-+/**
-+ * Return an informative version string. This usually is the actual release
-+ * version number or a git commit description. This string has no fixed format
-+ * and can change any time. It should never be parsed by code.
-+ */
-+const char* av_version_info(void);
-+
-+/**
-+ * Return the libavutil build-time configuration.
-+ */
-+const char* avutil_configuration(void);
-+
-+/**
-+ * Return the libavutil license.
-+ */
-+const char* avutil_license(void);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_media Media Type
-+ * @brief Media Type
-+ */
-+
-+enum AVMediaType {
-+ AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA
-+ AVMEDIA_TYPE_VIDEO,
-+ AVMEDIA_TYPE_AUDIO,
-+ AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous
-+ AVMEDIA_TYPE_SUBTITLE,
-+ AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse
-+ AVMEDIA_TYPE_NB
-+};
-+
-+/**
-+ * Return a string describing the media_type enum, NULL if media_type
-+ * is unknown.
-+ */
-+const char* av_get_media_type_string(enum AVMediaType media_type);
-+
-+/**
-+ * @defgroup lavu_const Constants
-+ * @{
-+ *
-+ * @defgroup lavu_enc Encoding specific
-+ *
-+ * @note those definition should move to avcodec
-+ * @{
-+ */
-+
-+#define FF_LAMBDA_SHIFT 7
-+#define FF_LAMBDA_SCALE (1 << FF_LAMBDA_SHIFT)
-+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-+#define FF_LAMBDA_MAX (256 * 128 - 1)
-+
-+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE // FIXME maybe remove
-+
-+/**
-+ * @}
-+ * @defgroup lavu_time Timestamp specific
-+ *
-+ * FFmpeg internal timebase and timestamp definitions
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * @brief Undefined timestamp value
-+ *
-+ * Usually reported by demuxer that work on containers that do not provide
-+ * either pts or dts.
-+ */
-+
-+#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000))
-+
-+/**
-+ * Internal time base represented as integer
-+ */
-+
-+#define AV_TIME_BASE 1000000
-+
-+/**
-+ * Internal time base represented as fractional value
-+ */
-+
-+#define AV_TIME_BASE_Q \
-+ (AVRational) { 1, AV_TIME_BASE }
-+
-+/**
-+ * @}
-+ * @}
-+ * @defgroup lavu_picture Image related
-+ *
-+ * AVPicture types, pixel formats and basic image planes manipulation.
-+ *
-+ * @{
-+ */
-+
-+enum AVPictureType {
-+ AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-+ AV_PICTURE_TYPE_I, ///< Intra
-+ AV_PICTURE_TYPE_P, ///< Predicted
-+ AV_PICTURE_TYPE_B, ///< Bi-dir predicted
-+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4
-+ AV_PICTURE_TYPE_SI, ///< Switching Intra
-+ AV_PICTURE_TYPE_SP, ///< Switching Predicted
-+ AV_PICTURE_TYPE_BI, ///< BI type
-+};
-+
-+/**
-+ * Return a single letter to describe the given picture type
-+ * pict_type.
-+ *
-+ * @param[in] pict_type the picture type @return a single character
-+ * representing the picture type, '?' if pict_type is unknown
-+ */
-+char av_get_picture_type_char(enum AVPictureType pict_type);
-+
-+/**
-+ * @}
-+ */
-+
-+#include "common.h"
-+#include "error.h"
-+#include "rational.h"
-+#include "version.h"
-+#include "macros.h"
-+#include "mathematics.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+/**
-+ * Return x default pointer in case p is NULL.
-+ */
-+static inline void* av_x_if_null(const void* p, const void* x) {
-+ return (void*)(intptr_t)(p ? p : x);
-+}
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param elsize size in bytes of each list element (only 1, 2, 4 or 8)
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+unsigned av_int_list_length_for_size(unsigned elsize, const void* list,
-+ uint64_t term) av_pure;
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+#define av_int_list_length(list, term) \
-+ av_int_list_length_for_size(sizeof(*(list)), list, term)
-+
-+/**
-+ * Open a file using a UTF-8 filename.
-+ * The API of this function matches POSIX fopen(), errors are returned through
-+ * errno.
-+ */
-+FILE* av_fopen_utf8(const char* path, const char* mode);
-+
-+/**
-+ * Return the fractional representation of the internal time base.
-+ */
-+AVRational av_get_time_base_q(void);
-+
-+#define AV_FOURCC_MAX_STRING_SIZE 32
-+
-+#define av_fourcc2str(fourcc) \
-+ av_fourcc_make_string((char[AV_FOURCC_MAX_STRING_SIZE]){0}, fourcc)
-+
-+/**
-+ * Fill the provided buffer with a string containing a FourCC (four-character
-+ * code) representation.
-+ *
-+ * @param buf a buffer with size in bytes of at least
-+ * AV_FOURCC_MAX_STRING_SIZE
-+ * @param fourcc the fourcc to represent
-+ * @return the buffer in input
-+ */
-+char* av_fourcc_make_string(char* buf, uint32_t fourcc);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_AVUTIL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-@@ -0,0 +1,324 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_buffer
-+ * refcounted data buffer API
-+ */
-+
-+#ifndef AVUTIL_BUFFER_H
-+#define AVUTIL_BUFFER_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+/**
-+ * @defgroup lavu_buffer AVBuffer
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBuffer is an API for reference-counted data buffers.
-+ *
-+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
-+ * represents the data buffer itself; it is opaque and not meant to be accessed
-+ * by the caller directly, but only through AVBufferRef. However, the caller may
-+ * e.g. compare two AVBuffer pointers to check whether two different references
-+ * are describing the same data buffer. AVBufferRef represents a single
-+ * reference to an AVBuffer and it is the object that may be manipulated by the
-+ * caller directly.
-+ *
-+ * There are two functions provided for creating a new AVBuffer with a single
-+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
-+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
-+ * reference, additional references may be created with av_buffer_ref().
-+ * Use av_buffer_unref() to free a reference (this will automatically free the
-+ * data once all the references are freed).
-+ *
-+ * The convention throughout this API and the rest of FFmpeg is such that the
-+ * buffer is considered writable if there exists only one reference to it (and
-+ * it has not been marked as read-only). The av_buffer_is_writable() function is
-+ * provided to check whether this is true and av_buffer_make_writable() will
-+ * automatically create a new writable buffer when necessary.
-+ * Of course nothing prevents the calling code from violating this convention,
-+ * however that is safe only when all the existing references are under its
-+ * control.
-+ *
-+ * @note Referencing and unreferencing the buffers is thread-safe and thus
-+ * may be done from multiple threads simultaneously without any need for
-+ * additional locking.
-+ *
-+ * @note Two different references to the same buffer can point to different
-+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
-+ */
-+
-+/**
-+ * A reference counted buffer type. It is opaque and is meant to be used through
-+ * references (AVBufferRef).
-+ */
-+typedef struct AVBuffer AVBuffer;
-+
-+/**
-+ * A reference to a data buffer.
-+ *
-+ * The size of this struct is not a part of the public ABI and it is not meant
-+ * to be allocated directly.
-+ */
-+typedef struct AVBufferRef {
-+ AVBuffer* buffer;
-+
-+ /**
-+ * The data buffer. It is considered writable if and only if
-+ * this is the only reference to the buffer, in which case
-+ * av_buffer_is_writable() returns 1.
-+ */
-+ uint8_t* data;
-+ /**
-+ * Size of data in bytes.
-+ */
-+ size_t size;
-+} AVBufferRef;
-+
-+/**
-+ * Allocate an AVBuffer of the given size using av_malloc().
-+ *
-+ * @return an AVBufferRef of given size or NULL when out of memory
-+ */
-+AVBufferRef* av_buffer_alloc(size_t size);
-+
-+/**
-+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
-+ * to zero.
-+ */
-+AVBufferRef* av_buffer_allocz(size_t size);
-+
-+/**
-+ * Always treat the buffer as read-only, even when it has only one
-+ * reference.
-+ */
-+#define AV_BUFFER_FLAG_READONLY (1 << 0)
-+
-+/**
-+ * Create an AVBuffer from an existing array.
-+ *
-+ * If this function is successful, data is owned by the AVBuffer. The caller may
-+ * only access data through the returned AVBufferRef and references derived from
-+ * it.
-+ * If this function fails, data is left untouched.
-+ * @param data data array
-+ * @param size size of data in bytes
-+ * @param free a callback for freeing this buffer's data
-+ * @param opaque parameter to be got for processing or passed to free
-+ * @param flags a combination of AV_BUFFER_FLAG_*
-+ *
-+ * @return an AVBufferRef referring to data on success, NULL on failure.
-+ */
-+AVBufferRef* av_buffer_create(uint8_t* data, size_t size,
-+ void (*free)(void* opaque, uint8_t* data),
-+ void* opaque, int flags);
-+
-+/**
-+ * Default free callback, which calls av_free() on the buffer data.
-+ * This function is meant to be passed to av_buffer_create(), not called
-+ * directly.
-+ */
-+void av_buffer_default_free(void* opaque, uint8_t* data);
-+
-+/**
-+ * Create a new reference to an AVBuffer.
-+ *
-+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
-+ * failure.
-+ */
-+AVBufferRef* av_buffer_ref(const AVBufferRef* buf);
-+
-+/**
-+ * Free a given reference and automatically free the buffer if there are no more
-+ * references to it.
-+ *
-+ * @param buf the reference to be freed. The pointer is set to NULL on return.
-+ */
-+void av_buffer_unref(AVBufferRef** buf);
-+
-+/**
-+ * @return 1 if the caller may write to the data referred to by buf (which is
-+ * true if and only if buf is the only reference to the underlying AVBuffer).
-+ * Return 0 otherwise.
-+ * A positive answer is valid until av_buffer_ref() is called on buf.
-+ */
-+int av_buffer_is_writable(const AVBufferRef* buf);
-+
-+/**
-+ * @return the opaque parameter set by av_buffer_create.
-+ */
-+void* av_buffer_get_opaque(const AVBufferRef* buf);
-+
-+int av_buffer_get_ref_count(const AVBufferRef* buf);
-+
-+/**
-+ * Create a writable reference from a given buffer reference, avoiding data copy
-+ * if possible.
-+ *
-+ * @param buf buffer reference to make writable. On success, buf is either left
-+ * untouched, or it is unreferenced and a new writable AVBufferRef is
-+ * written in its place. On failure, buf is left untouched.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ */
-+int av_buffer_make_writable(AVBufferRef** buf);
-+
-+/**
-+ * Reallocate a given buffer.
-+ *
-+ * @param buf a buffer reference to reallocate. On success, buf will be
-+ * unreferenced and a new reference with the required size will be
-+ * written in its place. On failure buf will be left untouched. *buf
-+ * may be NULL, then a new buffer is allocated.
-+ * @param size required new buffer size.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ *
-+ * @note the buffer is actually reallocated with av_realloc() only if it was
-+ * initially allocated through av_buffer_realloc(NULL) and there is only one
-+ * reference to it (i.e. the one passed to this function). In all other cases
-+ * a new buffer is allocated and the data is copied.
-+ */
-+int av_buffer_realloc(AVBufferRef** buf, size_t size);
-+
-+/**
-+ * Ensure dst refers to the same data as src.
-+ *
-+ * When *dst is already equivalent to src, do nothing. Otherwise unreference dst
-+ * and replace it with a new reference to src.
-+ *
-+ * @param dst Pointer to either a valid buffer reference or NULL. On success,
-+ * this will point to a buffer reference equivalent to src. On
-+ * failure, dst will be left untouched.
-+ * @param src A buffer reference to replace dst with. May be NULL, then this
-+ * function is equivalent to av_buffer_unref(dst).
-+ * @return 0 on success
-+ * AVERROR(ENOMEM) on memory allocation failure.
-+ */
-+int av_buffer_replace(AVBufferRef** dst, const AVBufferRef* src);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_bufferpool AVBufferPool
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
-+ *
-+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
-+ * meant to solve this in cases when the caller needs a set of buffers of the
-+ * same size (the most obvious use case being buffers for raw video or audio
-+ * frames).
-+ *
-+ * At the beginning, the user must call av_buffer_pool_init() to create the
-+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
-+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
-+ * reference works in all aspects the same way as the one created by
-+ * av_buffer_alloc(). However, when the last reference to this buffer is
-+ * unreferenced, it is returned to the pool instead of being freed and will be
-+ * reused for subsequent av_buffer_pool_get() calls.
-+ *
-+ * When the caller is done with the pool and no longer needs to allocate any new
-+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
-+ * Once all the buffers are released, it will automatically be freed.
-+ *
-+ * Allocating and releasing buffers with this API is thread-safe as long as
-+ * either the default alloc callback is used, or the user-supplied one is
-+ * thread-safe.
-+ */
-+
-+/**
-+ * The buffer pool. This structure is opaque and not meant to be accessed
-+ * directly. It is allocated with av_buffer_pool_init() and freed with
-+ * av_buffer_pool_uninit().
-+ */
-+typedef struct AVBufferPool AVBufferPool;
-+
-+/**
-+ * Allocate and initialize a buffer pool.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be used
-+ * (av_buffer_alloc()).
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init(size_t size,
-+ AVBufferRef* (*alloc)(size_t size));
-+
-+/**
-+ * Allocate and initialize a buffer pool with a more complex allocator.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param opaque arbitrary user data used by the allocator
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be
-+ * used (av_buffer_alloc()).
-+ * @param pool_free a function that will be called immediately before the pool
-+ * is freed. I.e. after av_buffer_pool_uninit() is called
-+ * by the caller and all the frames are returned to the pool
-+ * and freed. It is intended to uninitialize the user opaque
-+ * data. May be NULL.
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init2(size_t size, void* opaque,
-+ AVBufferRef* (*alloc)(void* opaque,
-+ size_t size),
-+ void (*pool_free)(void* opaque));
-+
-+/**
-+ * Mark the pool as being available for freeing. It will actually be freed only
-+ * once all the allocated buffers associated with the pool are released. Thus it
-+ * is safe to call this function while some of the allocated buffers are still
-+ * in use.
-+ *
-+ * @param pool pointer to the pool to be freed. It will be set to NULL.
-+ */
-+void av_buffer_pool_uninit(AVBufferPool** pool);
-+
-+/**
-+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
-+ * This function may be called simultaneously from multiple threads.
-+ *
-+ * @return a reference to the new buffer on success, NULL on error.
-+ */
-+AVBufferRef* av_buffer_pool_get(AVBufferPool* pool);
-+
-+/**
-+ * Query the original opaque parameter of an allocated buffer in the pool.
-+ *
-+ * @param ref a buffer reference to a buffer returned by av_buffer_pool_get.
-+ * @return the opaque parameter set by the buffer allocator function of the
-+ * buffer pool.
-+ *
-+ * @note the opaque parameter of ref is used by the buffer pool implementation,
-+ * therefore you have to use this function to access the original opaque
-+ * parameter of an allocated buffer.
-+ */
-+void* av_buffer_pool_buffer_get_opaque(const AVBufferRef* ref);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_BUFFER_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-@@ -0,0 +1,270 @@
-+/*
-+ * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ * Copyright (c) 2008 Peter Ross
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CHANNEL_LAYOUT_H
-+#define AVUTIL_CHANNEL_LAYOUT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @file
-+ * audio channel layout utility functions
-+ */
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup channel_masks Audio channel masks
-+ *
-+ * A channel layout is a 64-bits integer with a bit set for every channel.
-+ * The number of bits set must be equal to the number of channels.
-+ * The value 0 means that the channel layout is not known.
-+ * @note this data structure is not powerful enough to handle channels
-+ * combinations that have the same channel multiple times, such as
-+ * dual-mono.
-+ *
-+ * @{
-+ */
-+#define AV_CH_FRONT_LEFT 0x00000001
-+#define AV_CH_FRONT_RIGHT 0x00000002
-+#define AV_CH_FRONT_CENTER 0x00000004
-+#define AV_CH_LOW_FREQUENCY 0x00000008
-+#define AV_CH_BACK_LEFT 0x00000010
-+#define AV_CH_BACK_RIGHT 0x00000020
-+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
-+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
-+#define AV_CH_BACK_CENTER 0x00000100
-+#define AV_CH_SIDE_LEFT 0x00000200
-+#define AV_CH_SIDE_RIGHT 0x00000400
-+#define AV_CH_TOP_CENTER 0x00000800
-+#define AV_CH_TOP_FRONT_LEFT 0x00001000
-+#define AV_CH_TOP_FRONT_CENTER 0x00002000
-+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
-+#define AV_CH_TOP_BACK_LEFT 0x00008000
-+#define AV_CH_TOP_BACK_CENTER 0x00010000
-+#define AV_CH_TOP_BACK_RIGHT 0x00020000
-+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
-+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
-+#define AV_CH_WIDE_LEFT 0x0000000080000000ULL
-+#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL
-+#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL
-+#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL
-+#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL
-+#define AV_CH_TOP_SIDE_LEFT 0x0000001000000000ULL
-+#define AV_CH_TOP_SIDE_RIGHT 0x0000002000000000ULL
-+#define AV_CH_BOTTOM_FRONT_CENTER 0x0000004000000000ULL
-+#define AV_CH_BOTTOM_FRONT_LEFT 0x0000008000000000ULL
-+#define AV_CH_BOTTOM_FRONT_RIGHT 0x0000010000000000ULL
-+
-+/** Channel mask value used for AVCodecContext.request_channel_layout
-+ to indicate that the user requests the channel order of the decoder output
-+ to be the native codec channel order. */
-+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
-+
-+/**
-+ * @}
-+ * @defgroup channel_mask_c Audio channel layouts
-+ * @{
-+ * */
-+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_2 \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_QUAD \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT0 \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_5POINT0_BACK \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT0_FRONT \
-+ (AV_CH_LAYOUT_2_2 | AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_FRONT \
-+ (AV_CH_LAYOUT_6POINT0_FRONT | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_7POINT0 \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT0_FRONT \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1 \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT1_WIDE \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_OCTAGONAL \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_CENTER | \
-+ AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_HEXADECAGONAL \
-+ (AV_CH_LAYOUT_OCTAGONAL | AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_BACK_CENTER | \
-+ AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT | AV_CH_STEREO_RIGHT)
-+#define AV_CH_LAYOUT_22POINT2 \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER | AV_CH_BACK_CENTER | AV_CH_LOW_FREQUENCY_2 | \
-+ AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT | AV_CH_TOP_FRONT_LEFT | \
-+ AV_CH_TOP_FRONT_RIGHT | AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_CENTER | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_SIDE_LEFT | \
-+ AV_CH_TOP_SIDE_RIGHT | AV_CH_TOP_BACK_CENTER | AV_CH_BOTTOM_FRONT_CENTER | \
-+ AV_CH_BOTTOM_FRONT_LEFT | AV_CH_BOTTOM_FRONT_RIGHT)
-+
-+enum AVMatrixEncoding {
-+ AV_MATRIX_ENCODING_NONE,
-+ AV_MATRIX_ENCODING_DOLBY,
-+ AV_MATRIX_ENCODING_DPLII,
-+ AV_MATRIX_ENCODING_DPLIIX,
-+ AV_MATRIX_ENCODING_DPLIIZ,
-+ AV_MATRIX_ENCODING_DOLBYEX,
-+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
-+ AV_MATRIX_ENCODING_NB
-+};
-+
-+/**
-+ * Return a channel layout id that matches name, or 0 if no match is found.
-+ *
-+ * name can be one or several of the following notations,
-+ * separated by '+' or '|':
-+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
-+ * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
-+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
-+ * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
-+ * - a number of channels, in decimal, followed by 'c', yielding
-+ * the default channel layout for that number of channels (@see
-+ * av_get_default_channel_layout);
-+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
-+ * AV_CH_* macros).
-+ *
-+ * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
-+ */
-+uint64_t av_get_channel_layout(const char* name);
-+
-+/**
-+ * Return a channel layout and the number of channels based on the specified
-+ * name.
-+ *
-+ * This function is similar to (@see av_get_channel_layout), but can also parse
-+ * unknown channel layout specifications.
-+ *
-+ * @param[in] name channel layout specification string
-+ * @param[out] channel_layout parsed channel layout (0 if unknown)
-+ * @param[out] nb_channels number of channels
-+ *
-+ * @return 0 on success, AVERROR(EINVAL) if the parsing fails.
-+ */
-+int av_get_extended_channel_layout(const char* name, uint64_t* channel_layout,
-+ int* nb_channels);
-+
-+/**
-+ * Return a description of a channel layout.
-+ * If nb_channels is <= 0, it is guessed from the channel_layout.
-+ *
-+ * @param buf put here the string containing the channel layout
-+ * @param buf_size size in bytes of the buffer
-+ */
-+void av_get_channel_layout_string(char* buf, int buf_size, int nb_channels,
-+ uint64_t channel_layout);
-+
-+struct AVBPrint;
-+/**
-+ * Append a description of a channel layout to a bprint buffer.
-+ */
-+void av_bprint_channel_layout(struct AVBPrint* bp, int nb_channels,
-+ uint64_t channel_layout);
-+
-+/**
-+ * Return the number of channels in the channel layout.
-+ */
-+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-+
-+/**
-+ * Return default channel layout for a given number of channels.
-+ */
-+int64_t av_get_default_channel_layout(int nb_channels);
-+
-+/**
-+ * Get the index of a channel in channel_layout.
-+ *
-+ * @param channel a channel layout describing exactly one channel which must be
-+ * present in channel_layout.
-+ *
-+ * @return index of channel in channel_layout on success, a negative AVERROR
-+ * on error.
-+ */
-+int av_get_channel_layout_channel_index(uint64_t channel_layout,
-+ uint64_t channel);
-+
-+/**
-+ * Get the channel with the given index in channel_layout.
-+ */
-+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-+
-+/**
-+ * Get the name of a given channel.
-+ *
-+ * @return channel name on success, NULL on error.
-+ */
-+const char* av_get_channel_name(uint64_t channel);
-+
-+/**
-+ * Get the description of a given channel.
-+ *
-+ * @param channel a channel layout with a single channel
-+ * @return channel description on success, NULL on error
-+ */
-+const char* av_get_channel_description(uint64_t channel);
-+
-+/**
-+ * Get the value and name of a standard channel layout.
-+ *
-+ * @param[in] index index in an internal list, starting at 0
-+ * @param[out] layout channel layout mask
-+ * @param[out] name name of the layout
-+ * @return 0 if the layout exists,
-+ * <0 if index is beyond the limits
-+ */
-+int av_get_standard_channel_layout(unsigned index, uint64_t* layout,
-+ const char** name);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-@@ -0,0 +1,590 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * common internal and external API header
-+ */
-+
-+#ifndef AVUTIL_COMMON_H
-+#define AVUTIL_COMMON_H
-+
-+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && \
-+ !defined(UINT64_C)
-+# error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-+#endif
-+
-+#include <errno.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+#include <math.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "attributes.h"
-+#include "macros.h"
-+#include "version.h"
-+
-+// rounded division & shift
-+#define RSHIFT(a, b) \
-+ ((a) > 0 ? ((a) + ((1 << (b)) >> 1)) >> (b) \
-+ : ((a) + ((1 << (b)) >> 1) - 1) >> (b))
-+/* assume b>0 */
-+#define ROUNDED_DIV(a, b) \
-+ (((a) >= 0 ? (a) + ((b) >> 1) : (a) - ((b) >> 1)) / (b))
-+/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
-+#define AV_CEIL_RSHIFT(a, b) \
-+ (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) : ((a) + (1 << (b)) - 1) >> (b))
-+/* Backwards compat. */
-+#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
-+
-+#define FFUDIV(a, b) (((a) > 0 ? (a) : (a) - (b) + 1) / (b))
-+#define FFUMOD(a, b) ((a) - (b)*FFUDIV(a, b))
-+
-+/**
-+ * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as
-+ * they are not representable as absolute values of their type. This is the same
-+ * as with *abs()
-+ * @see FFNABS()
-+ */
-+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-+
-+/**
-+ * Negative Absolute value.
-+ * this works for all integers of all types.
-+ * As with many macros, this evaluates its argument twice, it thus must not have
-+ * a sideeffect, that is FFNABS(x++) has undefined behavior.
-+ */
-+#define FFNABS(a) ((a) <= 0 ? (a) : (-(a)))
-+
-+/**
-+ * Unsigned Absolute value.
-+ * This takes the absolute value of a signed int and returns it as a unsigned.
-+ * This also works with INT_MIN which would otherwise not be representable
-+ * As with many macros, this evaluates its argument twice.
-+ */
-+#define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a))
-+#define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a))
-+
-+/* misc math functions */
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "config.h"
-+# include "intmath.h"
-+#endif
-+
-+#ifndef av_ceil_log2
-+# define av_ceil_log2 av_ceil_log2_c
-+#endif
-+#ifndef av_clip
-+# define av_clip av_clip_c
-+#endif
-+#ifndef av_clip64
-+# define av_clip64 av_clip64_c
-+#endif
-+#ifndef av_clip_uint8
-+# define av_clip_uint8 av_clip_uint8_c
-+#endif
-+#ifndef av_clip_int8
-+# define av_clip_int8 av_clip_int8_c
-+#endif
-+#ifndef av_clip_uint16
-+# define av_clip_uint16 av_clip_uint16_c
-+#endif
-+#ifndef av_clip_int16
-+# define av_clip_int16 av_clip_int16_c
-+#endif
-+#ifndef av_clipl_int32
-+# define av_clipl_int32 av_clipl_int32_c
-+#endif
-+#ifndef av_clip_intp2
-+# define av_clip_intp2 av_clip_intp2_c
-+#endif
-+#ifndef av_clip_uintp2
-+# define av_clip_uintp2 av_clip_uintp2_c
-+#endif
-+#ifndef av_mod_uintp2
-+# define av_mod_uintp2 av_mod_uintp2_c
-+#endif
-+#ifndef av_sat_add32
-+# define av_sat_add32 av_sat_add32_c
-+#endif
-+#ifndef av_sat_dadd32
-+# define av_sat_dadd32 av_sat_dadd32_c
-+#endif
-+#ifndef av_sat_sub32
-+# define av_sat_sub32 av_sat_sub32_c
-+#endif
-+#ifndef av_sat_dsub32
-+# define av_sat_dsub32 av_sat_dsub32_c
-+#endif
-+#ifndef av_sat_add64
-+# define av_sat_add64 av_sat_add64_c
-+#endif
-+#ifndef av_sat_sub64
-+# define av_sat_sub64 av_sat_sub64_c
-+#endif
-+#ifndef av_clipf
-+# define av_clipf av_clipf_c
-+#endif
-+#ifndef av_clipd
-+# define av_clipd av_clipd_c
-+#endif
-+#ifndef av_popcount
-+# define av_popcount av_popcount_c
-+#endif
-+#ifndef av_popcount64
-+# define av_popcount64 av_popcount64_c
-+#endif
-+#ifndef av_parity
-+# define av_parity av_parity_c
-+#endif
-+
-+#ifndef av_log2
-+av_const int av_log2(unsigned v);
-+#endif
-+
-+#ifndef av_log2_16bit
-+av_const int av_log2_16bit(unsigned v);
-+#endif
-+
-+/**
-+ * Clip a signed integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_c(int a, int amin, int amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64bit integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin,
-+ int64_t amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-255 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint8_t av_clip_uint8_c(int a) {
-+ if (a & (~0xFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -128,127 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int8_t av_clip_int8_c(int a) {
-+ if ((a + 0x80U) & ~0xFF)
-+ return (a >> 31) ^ 0x7F;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-65535 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint16_t av_clip_uint16_c(int a) {
-+ if (a & (~0xFFFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -32768,32767 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int16_t av_clip_int16_c(int a) {
-+ if ((a + 0x8000U) & ~0xFFFF)
-+ return (a >> 31) ^ 0x7FFF;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) {
-+ if ((a + 0x80000000u) & ~UINT64_C(0xFFFFFFFF))
-+ return (int32_t)((a >> 63) ^ 0x7FFFFFFF);
-+ else
-+ return (int32_t)a;
-+}
-+
-+/**
-+ * Clip a signed integer into the -(2^p),(2^p-1) range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_intp2_c(int a, int p) {
-+ if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
-+ return (a >> 31) ^ ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer to an unsigned power of two range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) {
-+ if (a & ~((1 << p) - 1))
-+ return (~a) >> 31 & ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clear high bits from an unsigned integer starting with specific bit position
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a,
-+ unsigned p) {
-+ return a & ((1U << p) - 1);
-+}
-+
-+/**
-+ * Add two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int av_sat_add32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a + b);
-+}
-+
-+/**
-+ * Add a doubled value to another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and added to a
-+ * @return sum sat(a + sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dadd32_c(int a, int b) {
-+ return av_sat_add32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Subtract two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int av_sat_sub32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a - b);
-+}
-+
-+/**
-+ * Subtract a doubled value from another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and subtracted from a
-+ * @return difference sat(a - sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dsub32_c(int a, int b) {
-+ return av_sat_sub32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Add two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_add64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_add_overflow)
-+ int64_t tmp;
-+ return !__builtin_add_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ int64_t s = a + (uint64_t)b;
-+ if ((int64_t)(a ^ b | ~s ^ b) >= 0) return INT64_MAX ^ (b >> 63);
-+ return s;
-+#endif
-+}
-+
-+/**
-+ * Subtract two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_sub64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_sub_overflow)
-+ int64_t tmp;
-+ return !__builtin_sub_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ if (b <= 0 && a >= INT64_MAX + b) return INT64_MAX;
-+ if (b >= 0 && a <= INT64_MIN + b) return INT64_MIN;
-+ return a - b;
-+#endif
-+}
-+
-+/**
-+ * Clip a float value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const float av_clipf_c(float a, float amin,
-+ float amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/**
-+ * Clip a double value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const double av_clipd_c(double a, double amin,
-+ double amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/** Compute ceil(log2(x)).
-+ * @param x value used to compute ceil(log2(x))
-+ * @return computed ceiling of log2(x)
-+ */
-+static av_always_inline av_const int av_ceil_log2_c(int x) {
-+ return av_log2((x - 1U) << 1);
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount_c(uint32_t x) {
-+ x -= (x >> 1) & 0x55555555;
-+ x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-+ x = (x + (x >> 4)) & 0x0F0F0F0F;
-+ x += x >> 8;
-+ return (x + (x >> 16)) & 0x3F;
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount64_c(uint64_t x) {
-+ return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-+}
-+
-+static av_always_inline av_const int av_parity_c(uint32_t v) {
-+ return av_popcount(v) & 1;
-+}
-+
-+/**
-+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_BYTE Expression reading one byte from the input.
-+ * Evaluated up to 7 times (4 for the currently
-+ * assigned Unicode range). With a memory buffer
-+ * input, this could be *ptr++, or if you want to make sure
-+ * that *ptr stops at the end of a NULL terminated string then
-+ * *ptr ? *ptr++ : 0
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ *
-+ * @warning ERROR should not contain a loop control statement which
-+ * could interact with the internal while loop, and should force an
-+ * exit from the macro code (e.g. through a goto or a return) in order
-+ * to prevent undefined results.
-+ */
-+#define GET_UTF8(val, GET_BYTE, ERROR) \
-+ val = (GET_BYTE); \
-+ { \
-+ uint32_t top = (val & 128) >> 1; \
-+ if ((val & 0xc0) == 0x80 || val >= 0xFE) { \
-+ ERROR \
-+ } \
-+ while (val & top) { \
-+ unsigned int tmp = (GET_BYTE)-128; \
-+ if (tmp >> 6) { \
-+ ERROR \
-+ } \
-+ val = (val << 6) + tmp; \
-+ top <<= 5; \
-+ } \
-+ val &= (top << 1) - 1; \
-+ }
-+
-+/**
-+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
-+ * to native byte order. Evaluated one or two times.
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ */
-+#define GET_UTF16(val, GET_16BIT, ERROR) \
-+ val = (GET_16BIT); \
-+ { \
-+ unsigned int hi = val - 0xD800; \
-+ if (hi < 0x800) { \
-+ val = (GET_16BIT)-0xDC00; \
-+ if (val > 0x3FFU || hi > 0x3FFU) { \
-+ ERROR \
-+ } \
-+ val += (hi << 10) + 0x10000; \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
-+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes
-+ * long).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint8_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_BYTE.
-+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
-+ * It could be a function or a statement, and uses tmp as the input byte.
-+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
-+ * executed up to 4 times for values in the valid UTF-8 range and up to
-+ * 7 times in the general case, depending on the length of the converted
-+ * Unicode character.
-+ */
-+#define PUT_UTF8(val, tmp, PUT_BYTE) \
-+ { \
-+ int bytes, shift; \
-+ uint32_t in = val; \
-+ if (in < 0x80) { \
-+ tmp = in; \
-+ PUT_BYTE \
-+ } else { \
-+ bytes = (av_log2(in) + 4) / 5; \
-+ shift = (bytes - 1) * 6; \
-+ tmp = (256 - (256 >> bytes)) | (in >> shift); \
-+ PUT_BYTE \
-+ while (shift >= 6) { \
-+ shift -= 6; \
-+ tmp = 0x80 | ((in >> shift) & 0x3f); \
-+ PUT_BYTE \
-+ } \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
-+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint16_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_16BIT.
-+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
-+ * in desired endianness. It could be a function or a statement, and uses tmp
-+ * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;"
-+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
-+ */
-+#define PUT_UTF16(val, tmp, PUT_16BIT) \
-+ { \
-+ uint32_t in = val; \
-+ if (in < 0x10000) { \
-+ tmp = in; \
-+ PUT_16BIT \
-+ } else { \
-+ tmp = 0xD800 | ((in - 0x10000) >> 10); \
-+ PUT_16BIT \
-+ tmp = 0xDC00 | ((in - 0x10000) & 0x3FF); \
-+ PUT_16BIT \
-+ } \
-+ }
-+
-+#include "mem.h"
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "internal.h"
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+#endif /* AVUTIL_COMMON_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-@@ -0,0 +1,138 @@
-+/*
-+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CPU_H
-+#define AVUTIL_CPU_H
-+
-+#include <stddef.h>
-+
-+#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
-+
-+/* lower 16 bits - CPU features */
-+#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
-+#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
-+#define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
-+#define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
-+#define AV_CPU_FLAG_SSE2SLOW \
-+ 0x40000000 ///< SSE2 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-+#define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
-+#define AV_CPU_FLAG_SSE3SLOW \
-+ 0x20000000 ///< SSE3 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
-+#define AV_CPU_FLAG_SSSE3SLOW \
-+ 0x4000000 ///< SSSE3 supported, but usually not faster
-+#define AV_CPU_FLAG_ATOM \
-+ 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-+#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
-+#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
-+#define AV_CPU_FLAG_AESNI 0x80000 ///< Advanced Encryption Standard functions
-+#define AV_CPU_FLAG_AVX \
-+ 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_AVXSLOW \
-+ 0x8000000 ///< AVX supported, but slow when using YMM registers (e.g.
-+ ///< Bulldozer)
-+#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
-+#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
-+#define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction
-+#define AV_CPU_FLAG_AVX2 \
-+ 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions
-+#define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1
-+#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
-+#define AV_CPU_FLAG_AVX512 \
-+ 0x100000 ///< AVX-512 functions: requires OS support even if YMM/ZMM
-+ ///< registers aren't used
-+#define AV_CPU_FLAG_SLOW_GATHER 0x2000000 ///< CPU has slow gathers.
-+
-+#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
-+#define AV_CPU_FLAG_VSX 0x0002 ///< ISA 2.06
-+#define AV_CPU_FLAG_POWER8 0x0004 ///< ISA 2.07
-+
-+#define AV_CPU_FLAG_ARMV5TE (1 << 0)
-+#define AV_CPU_FLAG_ARMV6 (1 << 1)
-+#define AV_CPU_FLAG_ARMV6T2 (1 << 2)
-+#define AV_CPU_FLAG_VFP (1 << 3)
-+#define AV_CPU_FLAG_VFPV3 (1 << 4)
-+#define AV_CPU_FLAG_NEON (1 << 5)
-+#define AV_CPU_FLAG_ARMV8 (1 << 6)
-+#define AV_CPU_FLAG_VFP_VM \
-+ (1 << 7) ///< VFPv2 vector mode, deprecated in ARMv7-A and unavailable in
-+ ///< various CPUs implementations
-+#define AV_CPU_FLAG_SETEND (1 << 16)
-+
-+#define AV_CPU_FLAG_MMI (1 << 0)
-+#define AV_CPU_FLAG_MSA (1 << 1)
-+
-+// Loongarch SIMD extension.
-+#define AV_CPU_FLAG_LSX (1 << 0)
-+#define AV_CPU_FLAG_LASX (1 << 1)
-+
-+/**
-+ * Return the flags which specify extensions supported by the CPU.
-+ * The returned value is affected by av_force_cpu_flags() if that was used
-+ * before. So av_get_cpu_flags() can easily be used in an application to
-+ * detect the enabled cpu flags.
-+ */
-+int av_get_cpu_flags(void);
-+
-+/**
-+ * Disables cpu detection and forces the specified flags.
-+ * -1 is a special case that disables forcing of specific flags.
-+ */
-+void av_force_cpu_flags(int flags);
-+
-+/**
-+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on
-+ * that.
-+ *
-+ * @return negative on error.
-+ */
-+int av_parse_cpu_caps(unsigned* flags, const char* s);
-+
-+/**
-+ * @return the number of logical CPU cores present.
-+ */
-+int av_cpu_count(void);
-+
-+/**
-+ * Overrides cpu count detection and forces the specified count.
-+ * Count < 1 disables forcing of specific count.
-+ */
-+void av_cpu_force_count(int count);
-+
-+/**
-+ * Get the maximum data alignment that may be required by FFmpeg.
-+ *
-+ * Note that this is affected by the build configuration and the CPU flags mask,
-+ * so e.g. if the CPU supports AVX, but libavutil has been built with
-+ * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
-+ * av_set_cpu_flags_mask(), then this function will behave as if AVX is not
-+ * present.
-+ */
-+size_t av_cpu_max_align(void);
-+
-+#endif /* AVUTIL_CPU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-@@ -0,0 +1,215 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Public dictionary API.
-+ * @deprecated
-+ * AVDictionary is provided for compatibility with libav. It is both in
-+ * implementation as well as API inefficient. It does not scale and is
-+ * extremely slow with large dictionaries.
-+ * It is recommended that new code uses our tree container from tree.c/h
-+ * where applicable, which uses AVL trees to achieve O(log n) performance.
-+ */
-+
-+#ifndef AVUTIL_DICT_H
-+#define AVUTIL_DICT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @addtogroup lavu_dict AVDictionary
-+ * @ingroup lavu_data
-+ *
-+ * @brief Simple key:value store
-+ *
-+ * @{
-+ * Dictionaries are used for storing key:value pairs. To create
-+ * an AVDictionary, simply pass an address of a NULL pointer to
-+ * av_dict_set(). NULL can be used as an empty dictionary wherever
-+ * a pointer to an AVDictionary is required.
-+ * Use av_dict_get() to retrieve an entry or iterate over all
-+ * entries and finally av_dict_free() to free the dictionary
-+ * and all its contents.
-+ *
-+ @code
-+ AVDictionary *d = NULL; // "create" an empty dictionary
-+ AVDictionaryEntry *t = NULL;
-+
-+ av_dict_set(&d, "foo", "bar", 0); // add an entry
-+
-+ char *k = av_strdup("key"); // if your strings are already allocated,
-+ char *v = av_strdup("value"); // you can avoid copying them like this
-+ av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
-+
-+ while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
-+ <....> // iterate over all entries in d
-+ }
-+ av_dict_free(&d);
-+ @endcode
-+ */
-+
-+#define AV_DICT_MATCH_CASE \
-+ 1 /**< Only get an entry with exact-case key match. Only relevant in \
-+ av_dict_get(). */
-+#define AV_DICT_IGNORE_SUFFIX \
-+ 2 /**< Return first entry in a dictionary whose first part corresponds to \
-+ the search key, ignoring the suffix of the found key string. Only \
-+ relevant in av_dict_get(). */
-+#define AV_DICT_DONT_STRDUP_KEY \
-+ 4 /**< Take ownership of a key that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_STRDUP_VAL \
-+ 8 /**< Take ownership of a value that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries.
-+#define AV_DICT_APPEND \
-+ 32 /**< If the entry already exists, append to it. Note that no \
-+ delimiter is added, the strings are simply concatenated. */
-+#define AV_DICT_MULTIKEY \
-+ 64 /**< Allow to store several equal keys in the dictionary */
-+
-+typedef struct AVDictionaryEntry {
-+ char* key;
-+ char* value;
-+} AVDictionaryEntry;
-+
-+typedef struct AVDictionary AVDictionary;
-+
-+/**
-+ * Get a dictionary entry with matching key.
-+ *
-+ * The returned entry key or value must not be changed, or it will
-+ * cause undefined behavior.
-+ *
-+ * To iterate through all the dictionary entries, you can set the matching key
-+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
-+ *
-+ * @param prev Set to the previous matching element to find the next.
-+ * If set to NULL the first matching element is returned.
-+ * @param key matching key
-+ * @param flags a collection of AV_DICT_* flags controlling how the entry is
-+ * retrieved
-+ * @return found entry or NULL in case no matching entry was found in the
-+ * dictionary
-+ */
-+AVDictionaryEntry* av_dict_get(const AVDictionary* m, const char* key,
-+ const AVDictionaryEntry* prev, int flags);
-+
-+/**
-+ * Get number of entries in dictionary.
-+ *
-+ * @param m dictionary
-+ * @return number of entries in dictionary
-+ */
-+int av_dict_count(const AVDictionary* m);
-+
-+/**
-+ * Set the given entry in *pm, overwriting an existing entry.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
-+ * these arguments will be freed on error.
-+ *
-+ * Warning: Adding a new entry to a dictionary invalidates all existing entries
-+ * previously returned with av_dict_get.
-+ *
-+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
-+ * a dictionary struct is allocated and put in *pm.
-+ * @param key entry key to add to *pm (will either be av_strduped or added as a
-+ * new key depending on flags)
-+ * @param value entry value to add to *pm (will be av_strduped or added as a new
-+ * key depending on flags). Passing a NULL value will cause an existing entry to
-+ * be deleted.
-+ * @return >= 0 on success otherwise an error code <0
-+ */
-+int av_dict_set(AVDictionary** pm, const char* key, const char* value,
-+ int flags);
-+
-+/**
-+ * Convenience wrapper for av_dict_set that converts the value to a string
-+ * and stores it.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
-+ */
-+int av_dict_set_int(AVDictionary** pm, const char* key, int64_t value,
-+ int flags);
-+
-+/**
-+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
-+ *
-+ * In case of failure, all the successfully set entries are stored in
-+ * *pm. You may need to manually free the created dictionary.
-+ *
-+ * @param key_val_sep a 0-terminated list of characters used to separate
-+ * key from value
-+ * @param pairs_sep a 0-terminated list of characters used to separate
-+ * two pairs from each other
-+ * @param flags flags to use when adding to dictionary.
-+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
-+ * are ignored since the key/value tokens will always
-+ * be duplicated.
-+ * @return 0 on success, negative AVERROR code on failure
-+ */
-+int av_dict_parse_string(AVDictionary** pm, const char* str,
-+ const char* key_val_sep, const char* pairs_sep,
-+ int flags);
-+
-+/**
-+ * Copy entries from one AVDictionary struct into another.
-+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
-+ * this function will allocate a struct for you and put it in *dst
-+ * @param src pointer to source AVDictionary struct
-+ * @param flags flags to use when setting entries in *dst
-+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
-+ * @return 0 on success, negative AVERROR code on failure. If dst was allocated
-+ * by this function, callers should free the associated memory.
-+ */
-+int av_dict_copy(AVDictionary** dst, const AVDictionary* src, int flags);
-+
-+/**
-+ * Free all the memory allocated for an AVDictionary struct
-+ * and all keys and values.
-+ */
-+void av_dict_free(AVDictionary** m);
-+
-+/**
-+ * Get dictionary entries as a string.
-+ *
-+ * Create a string containing dictionary's entries.
-+ * Such string may be passed back to av_dict_parse_string().
-+ * @note String is escaped with backslashes ('\').
-+ *
-+ * @param[in] m dictionary
-+ * @param[out] buffer Pointer to buffer that will be allocated with
-+ * string containg entries. Buffer must be freed by the caller when is no longer
-+ * needed.
-+ * @param[in] key_val_sep character used to separate key from value
-+ * @param[in] pairs_sep character used to separate two pairs from each
-+ * other
-+ * @return >= 0 on success, negative on error
-+ * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the
-+ * same.
-+ */
-+int av_dict_get_string(const AVDictionary* m, char** buffer,
-+ const char key_val_sep, const char pairs_sep);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_DICT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-@@ -0,0 +1,158 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * error code definitions
-+ */
-+
-+#ifndef AVUTIL_ERROR_H
-+#define AVUTIL_ERROR_H
-+
-+#include <errno.h>
-+#include <stddef.h>
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup lavu_error
-+ *
-+ * @{
-+ */
-+
-+/* error handling */
-+#if EDOM > 0
-+# define AVERROR(e) \
-+ (-(e)) ///< Returns a negative error code from a POSIX error code, to
-+ ///< return from library functions.
-+# define AVUNERROR(e) \
-+ (-(e)) ///< Returns a POSIX error code from a library function error return
-+ ///< value.
-+#else
-+/* Some platforms have E* and errno already negated. */
-+# define AVERROR(e) (e)
-+# define AVUNERROR(e) (e)
-+#endif
-+
-+#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
-+
-+#define AVERROR_BSF_NOT_FOUND \
-+ FFERRTAG(0xF8, 'B', 'S', 'F') ///< Bitstream filter not found
-+#define AVERROR_BUG \
-+ FFERRTAG('B', 'U', 'G', '!') ///< Internal bug, also see AVERROR_BUG2
-+#define AVERROR_BUFFER_TOO_SMALL \
-+ FFERRTAG('B', 'U', 'F', 'S') ///< Buffer too small
-+#define AVERROR_DECODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'C') ///< Decoder not found
-+#define AVERROR_DEMUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'M') ///< Demuxer not found
-+#define AVERROR_ENCODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'E', 'N', 'C') ///< Encoder not found
-+#define AVERROR_EOF FFERRTAG('E', 'O', 'F', ' ') ///< End of file
-+#define AVERROR_EXIT \
-+ FFERRTAG('E', 'X', 'I', 'T') ///< Immediate exit was requested; the called
-+ ///< function should not be restarted
-+#define AVERROR_EXTERNAL \
-+ FFERRTAG('E', 'X', 'T', ' ') ///< Generic error in an external library
-+#define AVERROR_FILTER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'F', 'I', 'L') ///< Filter not found
-+#define AVERROR_INVALIDDATA \
-+ FFERRTAG('I', 'N', 'D', 'A') ///< Invalid data found when processing input
-+#define AVERROR_MUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'M', 'U', 'X') ///< Muxer not found
-+#define AVERROR_OPTION_NOT_FOUND \
-+ FFERRTAG(0xF8, 'O', 'P', 'T') ///< Option not found
-+#define AVERROR_PATCHWELCOME \
-+ FFERRTAG('P', 'A', 'W', \
-+ 'E') ///< Not yet implemented in FFmpeg, patches welcome
-+#define AVERROR_PROTOCOL_NOT_FOUND \
-+ FFERRTAG(0xF8, 'P', 'R', 'O') ///< Protocol not found
-+
-+#define AVERROR_STREAM_NOT_FOUND \
-+ FFERRTAG(0xF8, 'S', 'T', 'R') ///< Stream not found
-+/**
-+ * This is semantically identical to AVERROR_BUG
-+ * it has been introduced in Libav after our AVERROR_BUG and with a modified
-+ * value.
-+ */
-+#define AVERROR_BUG2 FFERRTAG('B', 'U', 'G', ' ')
-+#define AVERROR_UNKNOWN \
-+ FFERRTAG('U', 'N', 'K', \
-+ 'N') ///< Unknown error, typically from an external library
-+#define AVERROR_EXPERIMENTAL \
-+ (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set
-+ ///< strict_std_compliance if you really want to use it.
-+#define AVERROR_INPUT_CHANGED \
-+ (-0x636e6701) ///< Input changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_OUTPUT_CHANGED)
-+#define AVERROR_OUTPUT_CHANGED \
-+ (-0x636e6702) ///< Output changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_INPUT_CHANGED)
-+/* HTTP & RTSP errors */
-+#define AVERROR_HTTP_BAD_REQUEST FFERRTAG(0xF8, '4', '0', '0')
-+#define AVERROR_HTTP_UNAUTHORIZED FFERRTAG(0xF8, '4', '0', '1')
-+#define AVERROR_HTTP_FORBIDDEN FFERRTAG(0xF8, '4', '0', '3')
-+#define AVERROR_HTTP_NOT_FOUND FFERRTAG(0xF8, '4', '0', '4')
-+#define AVERROR_HTTP_OTHER_4XX FFERRTAG(0xF8, '4', 'X', 'X')
-+#define AVERROR_HTTP_SERVER_ERROR FFERRTAG(0xF8, '5', 'X', 'X')
-+
-+#define AV_ERROR_MAX_STRING_SIZE 64
-+
-+/**
-+ * Put a description of the AVERROR code errnum in errbuf.
-+ * In case of failure the global variable errno is set to indicate the
-+ * error. Even in case of failure av_strerror() will print a generic
-+ * error message indicating the errnum provided to errbuf.
-+ *
-+ * @param errnum error code to describe
-+ * @param errbuf buffer to which description is written
-+ * @param errbuf_size the size in bytes of errbuf
-+ * @return 0 on success, a negative value if a description for errnum
-+ * cannot be found
-+ */
-+int av_strerror(int errnum, char* errbuf, size_t errbuf_size);
-+
-+/**
-+ * Fill the provided buffer with a string containing an error string
-+ * corresponding to the AVERROR code errnum.
-+ *
-+ * @param errbuf a buffer
-+ * @param errbuf_size size in bytes of errbuf
-+ * @param errnum error code to describe
-+ * @return the buffer in input, filled with the error description
-+ * @see av_strerror()
-+ */
-+static inline char* av_make_error_string(char* errbuf, size_t errbuf_size,
-+ int errnum) {
-+ av_strerror(errnum, errbuf, errbuf_size);
-+ return errbuf;
-+}
-+
-+/**
-+ * Convenience macro, the return value should be used only directly in
-+ * function arguments but never stand-alone.
-+ */
-+#define av_err2str(errnum) \
-+ av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, \
-+ AV_ERROR_MAX_STRING_SIZE, errnum)
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_ERROR_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-@@ -0,0 +1,927 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_frame
-+ * reference-counted frame API
-+ */
-+
-+#ifndef AVUTIL_FRAME_H
-+#define AVUTIL_FRAME_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "buffer.h"
-+#include "dict.h"
-+#include "rational.h"
-+#include "samplefmt.h"
-+#include "pixfmt.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup lavu_frame AVFrame
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVFrame is an abstraction for reference-counted raw multimedia data.
-+ */
-+
-+enum AVFrameSideDataType {
-+ /**
-+ * The data is the AVPanScan struct defined in libavcodec.
-+ */
-+ AV_FRAME_DATA_PANSCAN,
-+ /**
-+ * ATSC A53 Part 4 Closed Captions.
-+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
-+ * The number of bytes of CC data is AVFrameSideData.size.
-+ */
-+ AV_FRAME_DATA_A53_CC,
-+ /**
-+ * Stereoscopic 3d metadata.
-+ * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
-+ */
-+ AV_FRAME_DATA_STEREO3D,
-+ /**
-+ * The data is the AVMatrixEncoding enum defined in
-+ * libavutil/channel_layout.h.
-+ */
-+ AV_FRAME_DATA_MATRIXENCODING,
-+ /**
-+ * Metadata relevant to a downmix procedure.
-+ * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
-+ */
-+ AV_FRAME_DATA_DOWNMIX_INFO,
-+ /**
-+ * ReplayGain information in the form of the AVReplayGain struct.
-+ */
-+ AV_FRAME_DATA_REPLAYGAIN,
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the frame for correct
-+ * presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_FRAME_DATA_DISPLAYMATRIX,
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_FRAME_DATA_AFD,
-+ /**
-+ * Motion vectors exported by some codecs (on demand through the export_mvs
-+ * flag set in the libavcodec AVCodecContext flags2 option).
-+ * The data is the AVMotionVector struct defined in
-+ * libavutil/motion_vector.h.
-+ */
-+ AV_FRAME_DATA_MOTION_VECTORS,
-+ /**
-+ * Recommmends skipping the specified number of samples. This is exported
-+ * only if the "skip_manual" AVOption is set in libavcodec.
-+ * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_FRAME_DATA_SKIP_SAMPLES,
-+ /**
-+ * This side data must be associated with an audio frame and corresponds to
-+ * enum AVAudioServiceType defined in avcodec.h.
-+ */
-+ AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
-+ /**
-+ * Mastering display metadata associated with a video frame. The payload is
-+ * an AVMasteringDisplayMetadata type and contains information about the
-+ * mastering display color volume.
-+ */
-+ AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
-+ /**
-+ * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
-+ * This is set on the first frame of a GOP that has a temporal reference of 0.
-+ */
-+ AV_FRAME_DATA_GOP_TIMECODE,
-+
-+ /**
-+ * The data represents the AVSphericalMapping structure defined in
-+ * libavutil/spherical.h.
-+ */
-+ AV_FRAME_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This payload contains data in
-+ * the form of the AVContentLightMetadata struct.
-+ */
-+ AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * The data contains an ICC profile as an opaque octet buffer following the
-+ * format described by ISO 15076-1 with an optional name defined in the
-+ * metadata key entry "name".
-+ */
-+ AV_FRAME_DATA_ICC_PROFILE,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_FRAME_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR dynamic metadata associated with a video frame. The payload is
-+ * an AVDynamicHDRPlus type and contains information for color
-+ * volume transform - application 4 of SMPTE 2094-40:2016 standard.
-+ */
-+ AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
-+
-+ /**
-+ * Regions Of Interest, the data is an array of AVRegionOfInterest type, the
-+ * number of array element is implied by AVFrameSideData.size /
-+ * AVRegionOfInterest.self_size.
-+ */
-+ AV_FRAME_DATA_REGIONS_OF_INTEREST,
-+
-+ /**
-+ * Encoding parameters for a video frame, as described by AVVideoEncParams.
-+ */
-+ AV_FRAME_DATA_VIDEO_ENC_PARAMS,
-+
-+ /**
-+ * User data unregistered metadata associated with a video frame.
-+ * This is the H.26[45] UDU SEI message, and shouldn't be used for any other
-+ * purpose The data is stored as uint8_t in AVFrameSideData.data which is 16
-+ * bytes of uuid_iso_iec_11578 followed by AVFrameSideData.size - 16 bytes of
-+ * user_data_payload_byte.
-+ */
-+ AV_FRAME_DATA_SEI_UNREGISTERED,
-+
-+ /**
-+ * Film grain parameters for a frame, described by AVFilmGrainParams.
-+ * Must be present for every frame which should have film grain applied.
-+ */
-+ AV_FRAME_DATA_FILM_GRAIN_PARAMS,
-+
-+ /**
-+ * Bounding boxes for object detection and classification,
-+ * as described by AVDetectionBBoxHeader.
-+ */
-+ AV_FRAME_DATA_DETECTION_BBOXES,
-+
-+ /**
-+ * Dolby Vision RPU raw data, suitable for passing to x265
-+ * or other libraries. Array of uint8_t, with NAL emulation
-+ * bytes intact.
-+ */
-+ AV_FRAME_DATA_DOVI_RPU_BUFFER,
-+
-+ /**
-+ * Parsed Dolby Vision metadata, suitable for passing to a software
-+ * implementation. The payload is the AVDOVIMetadata struct defined in
-+ * libavutil/dovi_meta.h.
-+ */
-+ AV_FRAME_DATA_DOVI_METADATA,
-+};
-+
-+enum AVActiveFormatDescription {
-+ AV_AFD_SAME = 8,
-+ AV_AFD_4_3 = 9,
-+ AV_AFD_16_9 = 10,
-+ AV_AFD_14_9 = 11,
-+ AV_AFD_4_3_SP_14_9 = 13,
-+ AV_AFD_16_9_SP_14_9 = 14,
-+ AV_AFD_SP_4_3 = 15,
-+};
-+
-+/**
-+ * Structure to hold side data for an AVFrame.
-+ *
-+ * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be
-+ * added to the end with a minor bump.
-+ */
-+typedef struct AVFrameSideData {
-+ enum AVFrameSideDataType type;
-+ uint8_t* data;
-+ size_t size;
-+ AVDictionary* metadata;
-+ AVBufferRef* buf;
-+} AVFrameSideData;
-+
-+/**
-+ * Structure describing a single Region Of Interest.
-+ *
-+ * When multiple regions are defined in a single side-data block, they
-+ * should be ordered from most to least important - some encoders are only
-+ * capable of supporting a limited number of distinct regions, so will have
-+ * to truncate the list.
-+ *
-+ * When overlapping regions are defined, the first region containing a given
-+ * area of the frame applies.
-+ */
-+typedef struct AVRegionOfInterest {
-+ /**
-+ * Must be set to the size of this data structure (that is,
-+ * sizeof(AVRegionOfInterest)).
-+ */
-+ uint32_t self_size;
-+ /**
-+ * Distance in pixels from the top edge of the frame to the top and
-+ * bottom edges and from the left edge of the frame to the left and
-+ * right edges of the rectangle defining this region of interest.
-+ *
-+ * The constraints on a region are encoder dependent, so the region
-+ * actually affected may be slightly larger for alignment or other
-+ * reasons.
-+ */
-+ int top;
-+ int bottom;
-+ int left;
-+ int right;
-+ /**
-+ * Quantisation offset.
-+ *
-+ * Must be in the range -1 to +1. A value of zero indicates no quality
-+ * change. A negative value asks for better quality (less quantisation),
-+ * while a positive value asks for worse quality (greater quantisation).
-+ *
-+ * The range is calibrated so that the extreme values indicate the
-+ * largest possible offset - if the rest of the frame is encoded with the
-+ * worst possible quality, an offset of -1 indicates that this region
-+ * should be encoded with the best possible quality anyway. Intermediate
-+ * values are then interpolated in some codec-dependent way.
-+ *
-+ * For example, in 10-bit H.264 the quantisation parameter varies between
-+ * -12 and 51. A typical qoffset value of -1/10 therefore indicates that
-+ * this region should be encoded with a QP around one-tenth of the full
-+ * range better than the rest of the frame. So, if most of the frame
-+ * were to be encoded with a QP of around 30, this region would get a QP
-+ * of around 24 (an offset of approximately -1/10 * (51 - -12) = -6.3).
-+ * An extreme value of -1 would indicate that this region should be
-+ * encoded with the best possible quality regardless of the treatment of
-+ * the rest of the frame - that is, should be encoded at a QP of -12.
-+ */
-+ AVRational qoffset;
-+} AVRegionOfInterest;
-+
-+/**
-+ * This structure describes decoded (raw) audio or video data.
-+ *
-+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
-+ * allocates the AVFrame itself, the buffers for the data must be managed
-+ * through other means (see below).
-+ * AVFrame must be freed with av_frame_free().
-+ *
-+ * AVFrame is typically allocated once and then reused multiple times to hold
-+ * different data (e.g. a single AVFrame to hold frames received from a
-+ * decoder). In such a case, av_frame_unref() will free any references held by
-+ * the frame and reset it to its original clean state before it
-+ * is reused again.
-+ *
-+ * The data described by an AVFrame is usually reference counted through the
-+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
-+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
-+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
-+ * every single data plane must be contained in one of the buffers in
-+ * AVFrame.buf or AVFrame.extended_buf.
-+ * There may be a single buffer for all the data, or one separate buffer for
-+ * each plane, or anything in between.
-+ *
-+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
-+ * to the end with a minor bump.
-+ *
-+ * Fields can be accessed through AVOptions, the name string used, matches the
-+ * C structure field name for fields accessible through AVOptions. The AVClass
-+ * for AVFrame can be obtained from avcodec_get_frame_class()
-+ */
-+typedef struct AVFrame {
-+#define AV_NUM_DATA_POINTERS 8
-+ /**
-+ * pointer to the picture/channel planes.
-+ * This might be different from the first allocated byte. For video,
-+ * it could even point to the end of the image data.
-+ *
-+ * All pointers in data and extended_data must point into one of the
-+ * AVBufferRef in buf or extended_buf.
-+ *
-+ * Some decoders access areas outside 0,0 - width,height, please
-+ * see avcodec_align_dimensions2(). Some filters and swscale can read
-+ * up to 16 bytes beyond the planes, if these filters are to be used,
-+ * then 16 extra bytes must be allocated.
-+ *
-+ * NOTE: Pointers not needed by the format MUST be set to NULL.
-+ *
-+ * @attention In case of video, the data[] pointers can point to the
-+ * end of image data in order to reverse line order, when used in
-+ * combination with negative values in the linesize[] array.
-+ */
-+ uint8_t* data[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For video, a positive or negative value, which is typically indicating
-+ * the size in bytes of each picture line, but it can also be:
-+ * - the negative byte size of lines for vertical flipping
-+ * (with data[n] pointing to the end of the data
-+ * - a positive or negative multiple of the byte size as for accessing
-+ * even and odd fields of a frame (possibly flipped)
-+ *
-+ * For audio, only linesize[0] may be set. For planar audio, each channel
-+ * plane must be the same size.
-+ *
-+ * For video the linesizes should be multiples of the CPUs alignment
-+ * preference, this is 16 or 32 for modern desktop CPUs.
-+ * Some code requires such alignment other code can be slower without
-+ * correct alignment, for yet other it makes no difference.
-+ *
-+ * @note The linesize may be larger than the size of usable data -- there
-+ * may be extra padding present for performance reasons.
-+ *
-+ * @attention In case of video, line size values can be negative to achieve
-+ * a vertically inverted iteration over image lines.
-+ */
-+ int linesize[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * pointers to the data planes/channels.
-+ *
-+ * For video, this should simply point to data[].
-+ *
-+ * For planar audio, each channel has a separate data pointer, and
-+ * linesize[0] contains the size of each channel buffer.
-+ * For packed audio, there is just one data pointer, and linesize[0]
-+ * contains the total size of the buffer for all channels.
-+ *
-+ * Note: Both data and extended_data should always be set in a valid frame,
-+ * but for planar audio with more channels that can fit in data,
-+ * extended_data must be used in order to access all channels.
-+ */
-+ uint8_t** extended_data;
-+
-+ /**
-+ * @name Video dimensions
-+ * Video frames only. The coded dimensions (in pixels) of the video frame,
-+ * i.e. the size of the rectangle that contains some well-defined values.
-+ *
-+ * @note The part of the frame intended for display/presentation is further
-+ * restricted by the @ref cropping "Cropping rectangle".
-+ * @{
-+ */
-+ int width, height;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * number of audio samples (per channel) described by this frame
-+ */
-+ int nb_samples;
-+
-+ /**
-+ * format of the frame, -1 if unknown or unset
-+ * Values correspond to enum AVPixelFormat for video frames,
-+ * enum AVSampleFormat for audio)
-+ */
-+ int format;
-+
-+ /**
-+ * 1 -> keyframe, 0-> not
-+ */
-+ int key_frame;
-+
-+ /**
-+ * Picture type of the frame.
-+ */
-+ enum AVPictureType pict_type;
-+
-+ /**
-+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Presentation timestamp in time_base units (time when frame should be shown
-+ * to user).
-+ */
-+ int64_t pts;
-+
-+ /**
-+ * DTS copied from the AVPacket that triggered returning this frame. (if frame
-+ * threading isn't used) This is also the Presentation time of this AVFrame
-+ * calculated from only AVPacket.dts values without pts values.
-+ */
-+ int64_t pkt_dts;
-+
-+ /**
-+ * Time base for the timestamps in this frame.
-+ * In the future, this field may be set on frames output by decoders or
-+ * filters, but its value will be by default ignored on input to encoders
-+ * or filters.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * picture number in bitstream order
-+ */
-+ int coded_picture_number;
-+ /**
-+ * picture number in display order
-+ */
-+ int display_picture_number;
-+
-+ /**
-+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-+ */
-+ int quality;
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * When decoding, this signals how much the picture must be delayed.
-+ * extra_delay = repeat_pict / (2*fps)
-+ */
-+ int repeat_pict;
-+
-+ /**
-+ * The content of the picture is interlaced.
-+ */
-+ int interlaced_frame;
-+
-+ /**
-+ * If the content is interlaced, is top field displayed first.
-+ */
-+ int top_field_first;
-+
-+ /**
-+ * Tell user application that palette has changed from previous frame.
-+ */
-+ int palette_has_changed;
-+
-+ /**
-+ * reordered opaque 64 bits (generally an integer or a double precision float
-+ * PTS but can be anything).
-+ * The user sets AVCodecContext.reordered_opaque to represent the input at
-+ * that time,
-+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-+ * to exactly one of the values provided by the user through
-+ * AVCodecContext.reordered_opaque
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Sample rate of the audio data.
-+ */
-+ int sample_rate;
-+
-+ /**
-+ * Channel layout of the audio data.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * AVBuffer references backing the data for this frame. All the pointers in
-+ * data and extended_data must point inside one of the buffers in buf or
-+ * extended_buf. This array must be filled contiguously -- if buf[i] is
-+ * non-NULL then buf[j] must also be non-NULL for all j < i.
-+ *
-+ * There may be at most one AVBuffer per data plane, so for video this array
-+ * always contains all the references. For planar audio with more than
-+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
-+ * this array. Then the extra AVBufferRef pointers are stored in the
-+ * extended_buf array.
-+ */
-+ AVBufferRef* buf[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
-+ * AVBufferRef pointers, this array will hold all the references which
-+ * cannot fit into AVFrame.buf.
-+ *
-+ * Note that this is different from AVFrame.extended_data, which always
-+ * contains all the pointers. This array only contains the extra pointers,
-+ * which cannot fit into AVFrame.buf.
-+ *
-+ * This array is always allocated using av_malloc() by whoever constructs
-+ * the frame. It is freed in av_frame_unref().
-+ */
-+ AVBufferRef** extended_buf;
-+ /**
-+ * Number of elements in extended_buf.
-+ */
-+ int nb_extended_buf;
-+
-+ AVFrameSideData** side_data;
-+ int nb_side_data;
-+
-+/**
-+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
-+ * @ingroup lavu_frame
-+ * Flags describing additional frame properties.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * The frame data may be corrupted, e.g. due to decoding errors.
-+ */
-+#define AV_FRAME_FLAG_CORRUPT (1 << 0)
-+/**
-+ * A flag to mark the frames which need to be decoded, but shouldn't be output.
-+ */
-+#define AV_FRAME_FLAG_DISCARD (1 << 2)
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * Frame flags, a combination of @ref lavu_frame_flags
-+ */
-+ int flags;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ enum AVColorPrimaries color_primaries;
-+
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * frame timestamp estimated using various heuristics, in stream time base
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int64_t best_effort_timestamp;
-+
-+ /**
-+ * reordered pos from the last AVPacket that has been input into the decoder
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_pos;
-+
-+ /**
-+ * duration of the corresponding packet, expressed in
-+ * AVStream->time_base units, 0 if unknown.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_duration;
-+
-+ /**
-+ * metadata.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVDictionary* metadata;
-+
-+ /**
-+ * decode error flags of the frame, set to a combination of
-+ * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
-+ * were errors during the decoding.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int decode_error_flags;
-+#define FF_DECODE_ERROR_INVALID_BITSTREAM 1
-+#define FF_DECODE_ERROR_MISSING_REFERENCE 2
-+#define FF_DECODE_ERROR_CONCEALMENT_ACTIVE 4
-+#define FF_DECODE_ERROR_DECODE_SLICES 8
-+
-+ /**
-+ * number of audio channels, only used for audio.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int channels;
-+
-+ /**
-+ * size of the corresponding packet containing the compressed
-+ * frame.
-+ * It is set to a negative value if unknown.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int pkt_size;
-+
-+ /**
-+ * For hwaccel-format frames, this should be a reference to the
-+ * AVHWFramesContext describing the frame.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the frame is unreferenced. av_frame_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target frame's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * @anchor cropping
-+ * @name Cropping
-+ * Video frames only. The number of pixels to discard from the the
-+ * top/bottom/left/right border of the frame to obtain the sub-rectangle of
-+ * the frame intended for presentation.
-+ * @{
-+ */
-+ size_t crop_top;
-+ size_t crop_bottom;
-+ size_t crop_left;
-+ size_t crop_right;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * AVBufferRef for internal use by a single libav* library.
-+ * Must not be used to transfer data between libraries.
-+ * Has to be NULL when ownership of the frame leaves the respective library.
-+ *
-+ * Code outside the FFmpeg libs should never check or change the contents of
-+ * the buffer ref.
-+ *
-+ * FFmpeg calls av_buffer_unref() on it when the frame is unreferenced.
-+ * av_frame_copy_props() calls create a new reference with av_buffer_ref()
-+ * for the target frame's private_ref field.
-+ */
-+ AVBufferRef* private_ref;
-+} AVFrame;
-+
-+#if FF_API_COLORSPACE_NAME
-+/**
-+ * Get the name of a colorspace.
-+ * @return a static string identifying the colorspace; can be NULL.
-+ * @deprecated use av_color_space_name()
-+ */
-+attribute_deprecated const char* av_get_colorspace_name(enum AVColorSpace val);
-+#endif
-+/**
-+ * Allocate an AVFrame and set its fields to default values. The resulting
-+ * struct must be freed using av_frame_free().
-+ *
-+ * @return An AVFrame filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVFrame itself, not the data buffers. Those
-+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
-+ * manually.
-+ */
-+AVFrame* av_frame_alloc(void);
-+
-+/**
-+ * Free the frame and any dynamically allocated objects in it,
-+ * e.g. extended_data. If the frame is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param frame frame to be freed. The pointer will be set to NULL.
-+ */
-+void av_frame_free(AVFrame** frame);
-+
-+/**
-+ * Set up a new reference to the data described by the source frame.
-+ *
-+ * Copy frame properties from src to dst and create a new reference for each
-+ * AVBufferRef from src.
-+ *
-+ * If src is not reference counted, new buffers are allocated and the data is
-+ * copied.
-+ *
-+ * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
-+ * or newly allocated with av_frame_alloc() before calling this
-+ * function, or undefined behavior will occur.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_frame_ref(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Create a new frame that references the same data as src.
-+ *
-+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
-+ *
-+ * @return newly created AVFrame on success, NULL on error.
-+ */
-+AVFrame* av_frame_clone(const AVFrame* src);
-+
-+/**
-+ * Unreference all the buffers referenced by frame and reset the frame fields.
-+ */
-+void av_frame_unref(AVFrame* frame);
-+
-+/**
-+ * Move everything contained in src to dst and reset src.
-+ *
-+ * @warning: dst is not unreferenced, but directly overwritten without reading
-+ * or deallocating its contents. Call av_frame_unref(dst) manually
-+ * before calling this function to ensure that no memory is leaked.
-+ */
-+void av_frame_move_ref(AVFrame* dst, AVFrame* src);
-+
-+/**
-+ * Allocate new buffer(s) for audio or video data.
-+ *
-+ * The following fields must be set on frame before calling this function:
-+ * - format (pixel format for video, sample format for audio)
-+ * - width and height for video
-+ * - nb_samples and channel_layout for audio
-+ *
-+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
-+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
-+ * For planar formats, one buffer will be allocated for each plane.
-+ *
-+ * @warning: if frame already has been allocated, calling this function will
-+ * leak memory. In addition, undefined behavior can occur in certain
-+ * cases.
-+ *
-+ * @param frame frame in which to store the new buffers.
-+ * @param align Required buffer size alignment. If equal to 0, alignment will be
-+ * chosen automatically for the current CPU. It is highly
-+ * recommended to pass 0 here unless you know what you are doing.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_get_buffer(AVFrame* frame, int align);
-+
-+/**
-+ * Check if the frame data is writable.
-+ *
-+ * @return A positive value if the frame data is writable (which is true if and
-+ * only if each of the underlying buffers has only one reference, namely the one
-+ * stored in this frame). Return 0 otherwise.
-+ *
-+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
-+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
-+ *
-+ * @see av_frame_make_writable(), av_buffer_is_writable()
-+ */
-+int av_frame_is_writable(AVFrame* frame);
-+
-+/**
-+ * Ensure that the frame data is writable, avoiding data copy if possible.
-+ *
-+ * Do nothing if the frame is writable, allocate new buffers and copy the data
-+ * if it is not.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ *
-+ * @see av_frame_is_writable(), av_buffer_is_writable(),
-+ * av_buffer_make_writable()
-+ */
-+int av_frame_make_writable(AVFrame* frame);
-+
-+/**
-+ * Copy the frame data from src to dst.
-+ *
-+ * This function does not allocate anything, dst must be already initialized and
-+ * allocated with the same parameters as src.
-+ *
-+ * This function only copies the frame data (i.e. the contents of the data /
-+ * extended data arrays), not any other properties.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_copy(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Copy only "metadata" fields from src to dst.
-+ *
-+ * Metadata for the purpose of this function are those fields that do not affect
-+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
-+ * aspect ratio (for video), but not width/height or channel layout.
-+ * Side data is also copied.
-+ */
-+int av_frame_copy_props(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Get the buffer reference a given data plane is stored in.
-+ *
-+ * @param plane index of the data plane of interest in frame->extended_data.
-+ *
-+ * @return the buffer reference that contains the plane or NULL if the input
-+ * frame is not valid.
-+ */
-+AVBufferRef* av_frame_get_plane_buffer(AVFrame* frame, int plane);
-+
-+/**
-+ * Add a new side data to a frame.
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type type of the added side data
-+ * @param size size of the side data
-+ *
-+ * @return newly added side data on success, NULL on error
-+ */
-+AVFrameSideData* av_frame_new_side_data(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Add a new side data to a frame from an existing AVBufferRef
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type the type of the added side data
-+ * @param buf an AVBufferRef to add as side data. The ownership of
-+ * the reference is transferred to the frame.
-+ *
-+ * @return newly added side data on success, NULL on error. On failure
-+ * the frame is unchanged and the AVBufferRef remains owned by
-+ * the caller.
-+ */
-+AVFrameSideData* av_frame_new_side_data_from_buf(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ AVBufferRef* buf);
-+
-+/**
-+ * @return a pointer to the side data of a given type on success, NULL if there
-+ * is no side data with such type in this frame.
-+ */
-+AVFrameSideData* av_frame_get_side_data(const AVFrame* frame,
-+ enum AVFrameSideDataType type);
-+
-+/**
-+ * Remove and free all side data instances of the given type.
-+ */
-+void av_frame_remove_side_data(AVFrame* frame, enum AVFrameSideDataType type);
-+
-+/**
-+ * Flags for frame cropping.
-+ */
-+enum {
-+ /**
-+ * Apply the maximum possible cropping, even if it requires setting the
-+ * AVFrame.data[] entries to unaligned pointers. Passing unaligned data
-+ * to FFmpeg API is generally not allowed, and causes undefined behavior
-+ * (such as crashes). You can pass unaligned data only to FFmpeg APIs that
-+ * are explicitly documented to accept it. Use this flag only if you
-+ * absolutely know what you are doing.
-+ */
-+ AV_FRAME_CROP_UNALIGNED = 1 << 0,
-+};
-+
-+/**
-+ * Crop the given video AVFrame according to its crop_left/crop_top/crop_right/
-+ * crop_bottom fields. If cropping is successful, the function will adjust the
-+ * data pointers and the width/height fields, and set the crop fields to 0.
-+ *
-+ * In all cases, the cropping boundaries will be rounded to the inherent
-+ * alignment of the pixel format. In some cases, such as for opaque hwaccel
-+ * formats, the left/top cropping is ignored. The crop fields are set to 0 even
-+ * if the cropping was rounded or ignored.
-+ *
-+ * @param frame the frame which should be cropped
-+ * @param flags Some combination of AV_FRAME_CROP_* flags, or 0.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error. If the cropping fields
-+ * were invalid, AVERROR(ERANGE) is returned, and nothing is changed.
-+ */
-+int av_frame_apply_cropping(AVFrame* frame, int flags);
-+
-+/**
-+ * @return a string identifying the side data type
-+ */
-+const char* av_frame_side_data_name(enum AVFrameSideDataType type);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_FRAME_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-@@ -0,0 +1,601 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_H
-+#define AVUTIL_HWCONTEXT_H
-+
-+#include "buffer.h"
-+#include "frame.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+enum AVHWDeviceType {
-+ AV_HWDEVICE_TYPE_NONE,
-+ AV_HWDEVICE_TYPE_VDPAU,
-+ AV_HWDEVICE_TYPE_CUDA,
-+ AV_HWDEVICE_TYPE_VAAPI,
-+ AV_HWDEVICE_TYPE_DXVA2,
-+ AV_HWDEVICE_TYPE_QSV,
-+ AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-+ AV_HWDEVICE_TYPE_D3D11VA,
-+ AV_HWDEVICE_TYPE_DRM,
-+ AV_HWDEVICE_TYPE_OPENCL,
-+ AV_HWDEVICE_TYPE_MEDIACODEC,
-+ AV_HWDEVICE_TYPE_VULKAN,
-+};
-+
-+typedef struct AVHWDeviceInternal AVHWDeviceInternal;
-+
-+/**
-+ * This struct aggregates all the (hardware/vendor-specific) "high-level" state,
-+ * i.e. state that is not tied to a concrete processing configuration.
-+ * E.g., in an API that supports hardware-accelerated encoding and decoding,
-+ * this struct will (if possible) wrap the state that is common to both encoding
-+ * and decoding and from which specific instances of encoders or decoders can be
-+ * derived.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism. The
-+ * av_hwdevice_ctx_alloc() constructor yields a reference, whose data field
-+ * points to the actual AVHWDeviceContext. Further objects derived from
-+ * AVHWDeviceContext (such as AVHWFramesContext, describing a frame pool with
-+ * specific properties) will hold an internal reference to it. After all the
-+ * references are released, the AVHWDeviceContext itself will be freed,
-+ * optionally invoking a user-specified callback for uninitializing the hardware
-+ * state.
-+ */
-+typedef struct AVHWDeviceContext {
-+ /**
-+ * A class for logging. Set by av_hwdevice_ctx_alloc().
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWDeviceInternal* internal;
-+
-+ /**
-+ * This field identifies the underlying API used for hardware access.
-+ *
-+ * This field is set when this struct is allocated and never changed
-+ * afterwards.
-+ */
-+ enum AVHWDeviceType type;
-+
-+ /**
-+ * The format-specific data, allocated and freed by libavutil along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwcontext_*.h) and filled as described in the
-+ * documentation before calling av_hwdevice_ctx_init().
-+ *
-+ * After calling av_hwdevice_ctx_init() this struct should not be modified
-+ * by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwdevice_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ *
-+ * @note when other objects (e.g an AVHWFramesContext) are derived from this
-+ * struct, this callback will be invoked after all such child objects
-+ * are fully uninitialized and their respective destructors invoked.
-+ */
-+ void (*free)(struct AVHWDeviceContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+} AVHWDeviceContext;
-+
-+typedef struct AVHWFramesInternal AVHWFramesInternal;
-+
-+/**
-+ * This struct describes a set or pool of "hardware" frames (i.e. those with
-+ * data not located in normal system memory). All the frames in the pool are
-+ * assumed to be allocated in the same way and interchangeable.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism and tied to a
-+ * given AVHWDeviceContext instance. The av_hwframe_ctx_alloc() constructor
-+ * yields a reference, whose data field points to the actual AVHWFramesContext
-+ * struct.
-+ */
-+typedef struct AVHWFramesContext {
-+ /**
-+ * A class for logging.
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWFramesInternal* internal;
-+
-+ /**
-+ * A reference to the parent AVHWDeviceContext. This reference is owned and
-+ * managed by the enclosing AVHWFramesContext, but the caller may derive
-+ * additional references from it.
-+ */
-+ AVBufferRef* device_ref;
-+
-+ /**
-+ * The parent AVHWDeviceContext. This is simply a pointer to
-+ * device_ref->data provided for convenience.
-+ *
-+ * Set by libavutil in av_hwframe_ctx_init().
-+ */
-+ AVHWDeviceContext* device_ctx;
-+
-+ /**
-+ * The format-specific data, allocated and freed automatically along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwframe_*.h) and filled as described in the
-+ * documentation before calling av_hwframe_ctx_init().
-+ *
-+ * After any frames using this context are created, the contents of this
-+ * struct should not be modified by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ */
-+ void (*free)(struct AVHWFramesContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+
-+ /**
-+ * A pool from which the frames are allocated by av_hwframe_get_buffer().
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ * The buffers returned by calling av_buffer_pool_get() on this pool must
-+ * have the properties described in the documentation in the corresponding hw
-+ * type's header (hwcontext_*.h). The pool will be freed strictly before
-+ * this struct's free() callback is invoked.
-+ *
-+ * This field may be NULL, then libavutil will attempt to allocate a pool
-+ * internally. Note that certain device types enforce pools allocated at
-+ * fixed size (frame count), which cannot be extended dynamically. In such a
-+ * case, initial_pool_size must be set appropriately.
-+ */
-+ AVBufferPool* pool;
-+
-+ /**
-+ * Initial size of the frame pool. If a device type does not support
-+ * dynamically resizing the pool, then this is also the maximum pool size.
-+ *
-+ * May be set by the caller before calling av_hwframe_ctx_init(). Must be
-+ * set if pool is NULL and the device type does not support dynamic pools.
-+ */
-+ int initial_pool_size;
-+
-+ /**
-+ * The pixel format identifying the underlying HW surface type.
-+ *
-+ * Must be a hwaccel format, i.e. the corresponding descriptor must have the
-+ * AV_PIX_FMT_FLAG_HWACCEL flag set.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ enum AVPixelFormat format;
-+
-+ /**
-+ * The pixel format identifying the actual data layout of the hardware
-+ * frames.
-+ *
-+ * Must be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * @note when the underlying API does not provide the exact data layout, but
-+ * only the colorspace/bit depth, this field should be set to the fully
-+ * planar version of that format (e.g. for 8-bit 420 YUV it should be
-+ * AV_PIX_FMT_YUV420P, not AV_PIX_FMT_NV12 or anything else).
-+ */
-+ enum AVPixelFormat sw_format;
-+
-+ /**
-+ * The allocated dimensions of the frames in this pool.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ int width, height;
-+} AVHWFramesContext;
-+
-+/**
-+ * Look up an AVHWDeviceType by name.
-+ *
-+ * @param name String name of the device type (case-insensitive).
-+ * @return The type from enum AVHWDeviceType, or AV_HWDEVICE_TYPE_NONE if
-+ * not found.
-+ */
-+enum AVHWDeviceType av_hwdevice_find_type_by_name(const char* name);
-+
-+/** Get the string name of an AVHWDeviceType.
-+ *
-+ * @param type Type from enum AVHWDeviceType.
-+ * @return Pointer to a static string containing the name, or NULL if the type
-+ * is not valid.
-+ */
-+const char* av_hwdevice_get_type_name(enum AVHWDeviceType type);
-+
-+/**
-+ * Iterate over supported device types.
-+ *
-+ * @param type AV_HWDEVICE_TYPE_NONE initially, then the previous type
-+ * returned by this function in subsequent iterations.
-+ * @return The next usable device type from enum AVHWDeviceType, or
-+ * AV_HWDEVICE_TYPE_NONE if there are no more.
-+ */
-+enum AVHWDeviceType av_hwdevice_iterate_types(enum AVHWDeviceType prev);
-+
-+/**
-+ * Allocate an AVHWDeviceContext for a given hardware type.
-+ *
-+ * @param type the type of the hardware device to allocate.
-+ * @return a reference to the newly created AVHWDeviceContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwdevice_ctx_alloc(enum AVHWDeviceType type);
-+
-+/**
-+ * Finalize the device context before use. This function must be called after
-+ * the context is filled with all the required information and before it is
-+ * used in any way.
-+ *
-+ * @param ref a reference to the AVHWDeviceContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwdevice_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Open a device of the specified type and create an AVHWDeviceContext for it.
-+ *
-+ * This is a convenience function intended to cover the simple cases. Callers
-+ * who need to fine-tune device creation/management should open the device
-+ * manually and then wrap it in an AVHWDeviceContext using
-+ * av_hwdevice_ctx_alloc()/av_hwdevice_ctx_init().
-+ *
-+ * The returned context is already initialized and ready for use, the caller
-+ * should not call av_hwdevice_ctx_init() on it. The user_opaque/free fields of
-+ * the created AVHWDeviceContext are set by this function and should not be
-+ * touched by the caller.
-+ *
-+ * @param device_ctx On success, a reference to the newly-created device context
-+ * will be written here. The reference is owned by the caller
-+ * and must be released with av_buffer_unref() when no longer
-+ * needed. On failure, NULL will be written to this pointer.
-+ * @param type The type of the device to create.
-+ * @param device A type-specific string identifying the device to open.
-+ * @param opts A dictionary of additional (type-specific) options to use in
-+ * opening the device. The dictionary remains owned by the caller.
-+ * @param flags currently unused
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create(AVBufferRef** device_ctx, enum AVHWDeviceType type,
-+ const char* device, AVDictionary* opts, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * If the source device is a device of the target type or was originally
-+ * derived from such a device (possibly through one or more intermediate
-+ * devices of other types), then this will return a reference to the
-+ * existing device of the same type as is requested.
-+ *
-+ * Otherwise, it will attempt to derive a new device from the given source
-+ * device. If direct derivation to the new type is not implemented, it will
-+ * attempt the same derivation from each ancestor of the source device in
-+ * turn looking for an implemented derivation method.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * This function performs the same action as av_hwdevice_ctx_create_derived,
-+ * however, it is able to set options for the new device to be derived.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param options Options for the new device to create, same format as in
-+ * av_hwdevice_ctx_create.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived_opts(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx,
-+ AVDictionary* options, int flags);
-+
-+/**
-+ * Allocate an AVHWFramesContext tied to a given device context.
-+ *
-+ * @param device_ctx a reference to a AVHWDeviceContext. This function will make
-+ * a new reference for internal use, the one passed to the
-+ * function remains owned by the caller.
-+ * @return a reference to the newly created AVHWFramesContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwframe_ctx_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Finalize the context before use. This function must be called after the
-+ * context is filled with all the required information and before it is attached
-+ * to any frames.
-+ *
-+ * @param ref a reference to the AVHWFramesContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Allocate a new frame attached to the given AVHWFramesContext.
-+ *
-+ * @param hwframe_ctx a reference to an AVHWFramesContext
-+ * @param frame an empty (freshly allocated or unreffed) frame to be filled with
-+ * newly allocated buffers.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_get_buffer(AVBufferRef* hwframe_ctx, AVFrame* frame, int flags);
-+
-+/**
-+ * Copy data to or from a hw surface. At least one of dst/src must have an
-+ * AVHWFramesContext attached.
-+ *
-+ * If src has an AVHWFramesContext attached, then the format of dst (if set)
-+ * must use one of the formats returned by av_hwframe_transfer_get_formats(src,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_FROM).
-+ * If dst has an AVHWFramesContext attached, then the format of src must use one
-+ * of the formats returned by av_hwframe_transfer_get_formats(dst,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_TO)
-+ *
-+ * dst may be "clean" (i.e. with data/buf pointers unset), in which case the
-+ * data buffers will be allocated by this function using av_frame_get_buffer().
-+ * If dst->format is set, then this format will be used, otherwise (when
-+ * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
-+ *
-+ * The two frames must have matching allocated dimensions (i.e. equal to
-+ * AVHWFramesContext.width/height), since not all device types support
-+ * transferring a sub-rectangle of the whole surface. The display dimensions
-+ * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
-+ * also have to be equal for both frames. When the display dimensions are
-+ * smaller than the allocated dimensions, the content of the padding in the
-+ * destination frame is unspecified.
-+ *
-+ * @param dst the destination frame. dst is not touched on failure.
-+ * @param src the source frame.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR error code on failure.
-+ */
-+int av_hwframe_transfer_data(AVFrame* dst, const AVFrame* src, int flags);
-+
-+enum AVHWFrameTransferDirection {
-+ /**
-+ * Transfer the data from the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_FROM,
-+
-+ /**
-+ * Transfer the data to the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_TO,
-+};
-+
-+/**
-+ * Get a list of possible source or target formats usable in
-+ * av_hwframe_transfer_data().
-+ *
-+ * @param hwframe_ctx the frame context to obtain the information for
-+ * @param dir the direction of the transfer
-+ * @param formats the pointer to the output format list will be written here.
-+ * The list is terminated with AV_PIX_FMT_NONE and must be freed
-+ * by the caller when no longer needed using av_free().
-+ * If this function returns successfully, the format list will
-+ * have at least one item (not counting the terminator).
-+ * On failure, the contents of this pointer are unspecified.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwframe_transfer_get_formats(AVBufferRef* hwframe_ctx,
-+ enum AVHWFrameTransferDirection dir,
-+ enum AVPixelFormat** formats, int flags);
-+
-+/**
-+ * This struct describes the constraints on hardware frames attached to
-+ * a given device with a hardware-specific configuration. This is returned
-+ * by av_hwdevice_get_hwframe_constraints() and must be freed by
-+ * av_hwframe_constraints_free() after use.
-+ */
-+typedef struct AVHWFramesConstraints {
-+ /**
-+ * A list of possible values for format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. This member will always be filled.
-+ */
-+ enum AVPixelFormat* valid_hw_formats;
-+
-+ /**
-+ * A list of possible values for sw_format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. Can be NULL if this information is
-+ * not known.
-+ */
-+ enum AVPixelFormat* valid_sw_formats;
-+
-+ /**
-+ * The minimum size of frames in this hw_frames_ctx.
-+ * (Zero if not known.)
-+ */
-+ int min_width;
-+ int min_height;
-+
-+ /**
-+ * The maximum size of frames in this hw_frames_ctx.
-+ * (INT_MAX if not known / no limit.)
-+ */
-+ int max_width;
-+ int max_height;
-+} AVHWFramesConstraints;
-+
-+/**
-+ * Allocate a HW-specific configuration structure for a given HW device.
-+ * After use, the user must free all members as required by the specific
-+ * hardware structure being used, then free the structure itself with
-+ * av_free().
-+ *
-+ * @param device_ctx a reference to the associated AVHWDeviceContext.
-+ * @return The newly created HW-specific configuration structure on
-+ * success or NULL on failure.
-+ */
-+void* av_hwdevice_hwconfig_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Get the constraints on HW frames given a device and the HW-specific
-+ * configuration to be used with that device. If no HW-specific
-+ * configuration is provided, returns the maximum possible capabilities
-+ * of the device.
-+ *
-+ * @param ref a reference to the associated AVHWDeviceContext.
-+ * @param hwconfig a filled HW-specific configuration structure, or NULL
-+ * to return the maximum possible capabilities of the device.
-+ * @return AVHWFramesConstraints structure describing the constraints
-+ * on the device, or NULL if not available.
-+ */
-+AVHWFramesConstraints* av_hwdevice_get_hwframe_constraints(
-+ AVBufferRef* ref, const void* hwconfig);
-+
-+/**
-+ * Free an AVHWFrameConstraints structure.
-+ *
-+ * @param constraints The (filled or unfilled) AVHWFrameConstraints structure.
-+ */
-+void av_hwframe_constraints_free(AVHWFramesConstraints** constraints);
-+
-+/**
-+ * Flags to apply to frame mappings.
-+ */
-+enum {
-+ /**
-+ * The mapping must be readable.
-+ */
-+ AV_HWFRAME_MAP_READ = 1 << 0,
-+ /**
-+ * The mapping must be writeable.
-+ */
-+ AV_HWFRAME_MAP_WRITE = 1 << 1,
-+ /**
-+ * The mapped frame will be overwritten completely in subsequent
-+ * operations, so the current frame data need not be loaded. Any values
-+ * which are not overwritten are unspecified.
-+ */
-+ AV_HWFRAME_MAP_OVERWRITE = 1 << 2,
-+ /**
-+ * The mapping must be direct. That is, there must not be any copying in
-+ * the map or unmap steps. Note that performance of direct mappings may
-+ * be much lower than normal memory.
-+ */
-+ AV_HWFRAME_MAP_DIRECT = 1 << 3,
-+};
-+
-+/**
-+ * Map a hardware frame.
-+ *
-+ * This has a number of different possible effects, depending on the format
-+ * and origin of the src and dst frames. On input, src should be a usable
-+ * frame with valid buffers and dst should be blank (typically as just created
-+ * by av_frame_alloc()). src should have an associated hwframe context, and
-+ * dst may optionally have a format and associated hwframe context.
-+ *
-+ * If src was created by mapping a frame from the hwframe context of dst,
-+ * then this function undoes the mapping - dst is replaced by a reference to
-+ * the frame that src was originally mapped from.
-+ *
-+ * If both src and dst have an associated hwframe context, then this function
-+ * attempts to map the src frame from its hardware context to that of dst and
-+ * then fill dst with appropriate data to be usable there. This will only be
-+ * possible if the hwframe contexts and associated devices are compatible -
-+ * given compatible devices, av_hwframe_ctx_create_derived() can be used to
-+ * create a hwframe context for dst in which mapping should be possible.
-+ *
-+ * If src has a hwframe context but dst does not, then the src frame is
-+ * mapped to normal memory and should thereafter be usable as a normal frame.
-+ * If the format is set on dst, then the mapping will attempt to create dst
-+ * with that format and fail if it is not possible. If format is unset (is
-+ * AV_PIX_FMT_NONE) then dst will be mapped with whatever the most appropriate
-+ * format to use is (probably the sw_format of the src hwframe context).
-+ *
-+ * A return value of AVERROR(ENOSYS) indicates that the mapping is not
-+ * possible with the given arguments and hwframe setup, while other return
-+ * values indicate that it failed somehow.
-+ *
-+ * @param dst Destination frame, to contain the mapping.
-+ * @param src Source frame, to be mapped.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_map(AVFrame* dst, const AVFrame* src, int flags);
-+
-+/**
-+ * Create and initialise an AVHWFramesContext as a mapping of another existing
-+ * AVHWFramesContext on a different device.
-+ *
-+ * av_hwframe_ctx_init() should not be called after this.
-+ *
-+ * @param derived_frame_ctx On success, a reference to the newly created
-+ * AVHWFramesContext.
-+ * @param derived_device_ctx A reference to the device to create the new
-+ * AVHWFramesContext on.
-+ * @param source_frame_ctx A reference to an existing AVHWFramesContext
-+ * which will be mapped to the derived context.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags, defining the
-+ * mapping parameters to apply to frames which are allocated
-+ * in the derived device.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_ctx_create_derived(AVBufferRef** derived_frame_ctx,
-+ enum AVPixelFormat format,
-+ AVBufferRef* derived_device_ctx,
-+ AVBufferRef* source_frame_ctx, int flags);
-+
-+#endif /* AVUTIL_HWCONTEXT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-@@ -0,0 +1,117 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_VAAPI_H
-+#define AVUTIL_HWCONTEXT_VAAPI_H
-+
-+#include <va/va.h>
-+
-+/**
-+ * @file
-+ * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
-+ *
-+ * Dynamic frame pools are supported, but note that any pool used as a render
-+ * target is required to be of fixed size in order to be be usable as an
-+ * argument to vaCreateContext().
-+ *
-+ * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
-+ * with the data pointer set to a VASurfaceID.
-+ */
-+
-+enum {
-+ /**
-+ * The quirks field has been set by the user and should not be detected
-+ * automatically by av_hwdevice_ctx_init().
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
-+ /**
-+ * The driver does not destroy parameter buffers when they are used by
-+ * vaRenderPicture(). Additional code will be required to destroy them
-+ * separately afterwards.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
-+
-+ /**
-+ * The driver does not support the VASurfaceAttribMemoryType attribute,
-+ * so the surface allocation code will not try to use it.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
-+
-+ /**
-+ * The driver does not support surface attributes at all.
-+ * The surface allocation code will never pass them to surface allocation,
-+ * and the results of the vaQuerySurfaceAttributes() call will be faked.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
-+};
-+
-+/**
-+ * VAAPI connection details.
-+ *
-+ * Allocated as AVHWDeviceContext.hwctx
-+ */
-+typedef struct AVVAAPIDeviceContext {
-+ /**
-+ * The VADisplay handle, to be filled by the user.
-+ */
-+ VADisplay display;
-+ /**
-+ * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
-+ * with reference to a table of known drivers, unless the
-+ * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present. The user
-+ * may need to refer to this field when performing any later
-+ * operations using VAAPI with the same VADisplay.
-+ */
-+ unsigned int driver_quirks;
-+} AVVAAPIDeviceContext;
-+
-+/**
-+ * VAAPI-specific data associated with a frame pool.
-+ *
-+ * Allocated as AVHWFramesContext.hwctx.
-+ */
-+typedef struct AVVAAPIFramesContext {
-+ /**
-+ * Set by the user to apply surface attributes to all surfaces in
-+ * the frame pool. If null, default settings are used.
-+ */
-+ VASurfaceAttrib* attributes;
-+ int nb_attributes;
-+ /**
-+ * The surfaces IDs of all surfaces in the pool after creation.
-+ * Only valid if AVHWFramesContext.initial_pool_size was positive.
-+ * These are intended to be used as the render_targets arguments to
-+ * vaCreateContext().
-+ */
-+ VASurfaceID* surface_ids;
-+ int nb_surfaces;
-+} AVVAAPIFramesContext;
-+
-+/**
-+ * VAAPI hardware pipeline configuration details.
-+ *
-+ * Allocated with av_hwdevice_hwconfig_alloc().
-+ */
-+typedef struct AVVAAPIHWConfig {
-+ /**
-+ * ID of a VAAPI pipeline configuration.
-+ */
-+ VAConfigID config_id;
-+} AVVAAPIHWConfig;
-+
-+#endif /* AVUTIL_HWCONTEXT_VAAPI_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2011 Mans Rullgard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_INTFLOAT_H
-+#define AVUTIL_INTFLOAT_H
-+
-+#include <stdint.h>
-+#include "attributes.h"
-+
-+union av_intfloat32 {
-+ uint32_t i;
-+ float f;
-+};
-+
-+union av_intfloat64 {
-+ uint64_t i;
-+ double f;
-+};
-+
-+/**
-+ * Reinterpret a 32-bit integer as a float.
-+ */
-+static av_always_inline float av_int2float(uint32_t i) {
-+ union av_intfloat32 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a float as a 32-bit integer.
-+ */
-+static av_always_inline uint32_t av_float2int(float f) {
-+ union av_intfloat32 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+/**
-+ * Reinterpret a 64-bit integer as a double.
-+ */
-+static av_always_inline double av_int2double(uint64_t i) {
-+ union av_intfloat64 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a double as a 64-bit integer.
-+ */
-+static av_always_inline uint64_t av_double2int(double f) {
-+ union av_intfloat64 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+#endif /* AVUTIL_INTFLOAT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-@@ -0,0 +1,388 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_LOG_H
-+#define AVUTIL_LOG_H
-+
-+#include <stdarg.h>
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+typedef enum {
-+ AV_CLASS_CATEGORY_NA = 0,
-+ AV_CLASS_CATEGORY_INPUT,
-+ AV_CLASS_CATEGORY_OUTPUT,
-+ AV_CLASS_CATEGORY_MUXER,
-+ AV_CLASS_CATEGORY_DEMUXER,
-+ AV_CLASS_CATEGORY_ENCODER,
-+ AV_CLASS_CATEGORY_DECODER,
-+ AV_CLASS_CATEGORY_FILTER,
-+ AV_CLASS_CATEGORY_BITSTREAM_FILTER,
-+ AV_CLASS_CATEGORY_SWSCALER,
-+ AV_CLASS_CATEGORY_SWRESAMPLER,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_INPUT,
-+ AV_CLASS_CATEGORY_NB ///< not part of ABI/API
-+} AVClassCategory;
-+
-+#define AV_IS_INPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT))
-+
-+#define AV_IS_OUTPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT))
-+
-+struct AVOptionRanges;
-+
-+/**
-+ * Describe the class of an AVClass context structure. That is an
-+ * arbitrary struct of which the first field is a pointer to an
-+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
-+ */
-+typedef struct AVClass {
-+ /**
-+ * The name of the class; usually it is the same name as the
-+ * context structure type to which the AVClass is associated.
-+ */
-+ const char* class_name;
-+
-+ /**
-+ * A pointer to a function which returns the name of a context
-+ * instance ctx associated with the class.
-+ */
-+ const char* (*item_name)(void* ctx);
-+
-+ /**
-+ * a pointer to the first option specified in the class if any or NULL
-+ *
-+ * @see av_set_default_options()
-+ */
-+ const struct AVOption* option;
-+
-+ /**
-+ * LIBAVUTIL_VERSION with which this structure was created.
-+ * This is used to allow fields to be added without requiring major
-+ * version bumps everywhere.
-+ */
-+
-+ int version;
-+
-+ /**
-+ * Offset in the structure where log_level_offset is stored.
-+ * 0 means there is no such variable
-+ */
-+ int log_level_offset_offset;
-+
-+ /**
-+ * Offset in the structure where a pointer to the parent context for
-+ * logging is stored. For example a decoder could pass its AVCodecContext
-+ * to eval as such a parent context, which an av_log() implementation
-+ * could then leverage to display the parent context.
-+ * The offset can be NULL.
-+ */
-+ int parent_log_context_offset;
-+
-+ /**
-+ * Category used for visualization (like color)
-+ * This is only set if the category is equal for all objects using this class.
-+ * available since version (51 << 16 | 56 << 8 | 100)
-+ */
-+ AVClassCategory category;
-+
-+ /**
-+ * Callback to return the category.
-+ * available since version (51 << 16 | 59 << 8 | 100)
-+ */
-+ AVClassCategory (*get_category)(void* ctx);
-+
-+ /**
-+ * Callback to return the supported/allowed ranges.
-+ * available since version (52.12)
-+ */
-+ int (*query_ranges)(struct AVOptionRanges**, void* obj, const char* key,
-+ int flags);
-+
-+ /**
-+ * Return next AVOptions-enabled child or NULL
-+ */
-+ void* (*child_next)(void* obj, void* prev);
-+
-+ /**
-+ * Iterate over the AVClasses corresponding to potential AVOptions-enabled
-+ * children.
-+ *
-+ * @param iter pointer to opaque iteration state. The caller must initialize
-+ * *iter to NULL before the first call.
-+ * @return AVClass for the next AVOptions-enabled child or NULL if there are
-+ * no more such children.
-+ *
-+ * @note The difference between child_next and this is that child_next
-+ * iterates over _already existing_ objects, while child_class_iterate
-+ * iterates over _all possible_ children.
-+ */
-+ const struct AVClass* (*child_class_iterate)(void** iter);
-+} AVClass;
-+
-+/**
-+ * @addtogroup lavu_log
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_log_constants Logging Constants
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Print no output.
-+ */
-+#define AV_LOG_QUIET -8
-+
-+/**
-+ * Something went really wrong and we will crash now.
-+ */
-+#define AV_LOG_PANIC 0
-+
-+/**
-+ * Something went wrong and recovery is not possible.
-+ * For example, no header was found for a format which depends
-+ * on headers or an illegal combination of parameters is used.
-+ */
-+#define AV_LOG_FATAL 8
-+
-+/**
-+ * Something went wrong and cannot losslessly be recovered.
-+ * However, not all future data is affected.
-+ */
-+#define AV_LOG_ERROR 16
-+
-+/**
-+ * Something somehow does not look correct. This may or may not
-+ * lead to problems. An example would be the use of '-vstrict -2'.
-+ */
-+#define AV_LOG_WARNING 24
-+
-+/**
-+ * Standard information.
-+ */
-+#define AV_LOG_INFO 32
-+
-+/**
-+ * Detailed information.
-+ */
-+#define AV_LOG_VERBOSE 40
-+
-+/**
-+ * Stuff which is only useful for libav* developers.
-+ */
-+#define AV_LOG_DEBUG 48
-+
-+/**
-+ * Extremely verbose debugging, useful for libav* development.
-+ */
-+#define AV_LOG_TRACE 56
-+
-+#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * Sets additional colors for extended debugging sessions.
-+ * @code
-+ av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n");
-+ @endcode
-+ * Requires 256color terminal support. Uses outside debugging is not
-+ * recommended.
-+ */
-+#define AV_LOG_C(x) ((x) << 8)
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ */
-+void av_log(void* avcl, int level, const char* fmt, ...) av_printf_format(3, 4);
-+
-+/**
-+ * Send the specified message to the log once with the initial_level and then
-+ * with the subsequent_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param initial_level importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant" for the first occurance.
-+ * @param subsequent_level importance level of the message expressed using a
-+ * @ref lavu_log_constants "Logging Constant" after the first occurance.
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param state a variable to keep trak of if a message has already been printed
-+ * this must be initialized to 0 before the first use. The same state
-+ * must not be accessed by 2 Threads simultaneously.
-+ */
-+void av_log_once(void* avcl, int initial_level, int subsequent_level,
-+ int* state, const char* fmt, ...) av_printf_format(5, 6);
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_vlog(void* avcl, int level, const char* fmt, va_list vl);
-+
-+/**
-+ * Get the current log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @return Current log level
-+ */
-+int av_log_get_level(void);
-+
-+/**
-+ * Set the log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @param level Logging level
-+ */
-+void av_log_set_level(int level);
-+
-+/**
-+ * Set the logging callback
-+ *
-+ * @note The callback must be thread safe, even if the application does not use
-+ * threads itself as some codecs are multithreaded.
-+ *
-+ * @see av_log_default_callback
-+ *
-+ * @param callback A logging function with a compatible signature.
-+ */
-+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
-+
-+/**
-+ * Default logging callback
-+ *
-+ * It prints the message to stderr, optionally colorizing it.
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_log_default_callback(void* avcl, int level, const char* fmt,
-+ va_list vl);
-+
-+/**
-+ * Return the context name
-+ *
-+ * @param ctx The AVClass context
-+ *
-+ * @return The AVClass class_name
-+ */
-+const char* av_default_item_name(void* ctx);
-+AVClassCategory av_default_get_category(void* ptr);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line
-+ * @param line_size size of the buffer
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ */
-+void av_log_format_line(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line;
-+ * may be NULL if line_size is 0
-+ * @param line_size size of the buffer; at most line_size-1 characters will
-+ * be written to the buffer, plus one null terminator
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ * @return Returns a negative value if an error occurred, otherwise returns
-+ * the number of characters that would have been written for a
-+ * sufficiently large buffer, not including the terminating null
-+ * character. If the return value is not less than line_size, it means
-+ * that the log message was truncated to fit the buffer.
-+ */
-+int av_log_format_line2(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Skip repeated messages, this requires the user app to use av_log() instead of
-+ * (f)printf as the 2 would otherwise interfere and lead to
-+ * "Last message repeated x times" messages below (f)printf messages with some
-+ * bad luck.
-+ * Also to receive the last, "last repeated" line if any, the user app must
-+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
-+ */
-+#define AV_LOG_SKIP_REPEATED 1
-+
-+/**
-+ * Include the log severity in messages originating from codecs.
-+ *
-+ * Results in messages such as:
-+ * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts
-+ */
-+#define AV_LOG_PRINT_LEVEL 2
-+
-+void av_log_set_flags(int arg);
-+int av_log_get_flags(void);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_LOG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-@@ -0,0 +1,87 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Utility Preprocessor macros
-+ */
-+
-+#ifndef AVUTIL_MACROS_H
-+#define AVUTIL_MACROS_H
-+
-+#include "libavutil/avconfig.h"
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_NE(be, le) (be)
-+#else
-+# define AV_NE(be, le) (le)
-+#endif
-+
-+/**
-+ * Comparator.
-+ * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0
-+ * if x == y. This is useful for instance in a qsort comparator callback.
-+ * Furthermore, compilers are able to optimize this to branchless code, and
-+ * there is no risk of overflow with signed types.
-+ * As with many macros, this evaluates its argument multiple times, it thus
-+ * must not have a side-effect.
-+ */
-+#define FFDIFFSIGN(x, y) (((x) > (y)) - ((x) < (y)))
-+
-+#define FFMAX(a, b) ((a) > (b) ? (a) : (b))
-+#define FFMAX3(a, b, c) FFMAX(FFMAX(a, b), c)
-+#define FFMIN(a, b) ((a) > (b) ? (b) : (a))
-+#define FFMIN3(a, b, c) FFMIN(FFMIN(a, b), c)
-+
-+#define FFSWAP(type, a, b) \
-+ do { \
-+ type SWAP_tmp = b; \
-+ b = a; \
-+ a = SWAP_tmp; \
-+ } while (0)
-+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-+
-+#define MKTAG(a, b, c, d) \
-+ ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-+#define MKBETAG(a, b, c, d) \
-+ ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-+
-+/**
-+ * @addtogroup preproc_misc Preprocessor String Macros
-+ *
-+ * String manipulation macros
-+ *
-+ * @{
-+ */
-+
-+#define AV_STRINGIFY(s) AV_TOSTRING(s)
-+#define AV_TOSTRING(s) #s
-+
-+#define AV_GLUE(a, b) a##b
-+#define AV_JOIN(a, b) AV_GLUE(a, b)
-+
-+/**
-+ * @}
-+ */
-+
-+#define AV_PRAGMA(s) _Pragma(#s)
-+
-+#define FFALIGN(x, a) (((x) + (a)-1) & ~((a)-1))
-+
-+#endif /* AVUTIL_MACROS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-@@ -0,0 +1,247 @@
-+/*
-+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @addtogroup lavu_math
-+ * Mathematical utilities for working with timestamp and time base.
-+ */
-+
-+#ifndef AVUTIL_MATHEMATICS_H
-+#define AVUTIL_MATHEMATICS_H
-+
-+#include <stdint.h>
-+#include <math.h>
-+#include "attributes.h"
-+#include "rational.h"
-+#include "intfloat.h"
-+
-+#ifndef M_E
-+# define M_E 2.7182818284590452354 /* e */
-+#endif
-+#ifndef M_LN2
-+# define M_LN2 0.69314718055994530942 /* log_e 2 */
-+#endif
-+#ifndef M_LN10
-+# define M_LN10 2.30258509299404568402 /* log_e 10 */
-+#endif
-+#ifndef M_LOG2_10
-+# define M_LOG2_10 3.32192809488736234787 /* log_2 10 */
-+#endif
-+#ifndef M_PHI
-+# define M_PHI 1.61803398874989484820 /* phi / golden ratio */
-+#endif
-+#ifndef M_PI
-+# define M_PI 3.14159265358979323846 /* pi */
-+#endif
-+#ifndef M_PI_2
-+# define M_PI_2 1.57079632679489661923 /* pi/2 */
-+#endif
-+#ifndef M_SQRT1_2
-+# define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
-+#endif
-+#ifndef M_SQRT2
-+# define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
-+#endif
-+#ifndef NAN
-+# define NAN av_int2float(0x7fc00000)
-+#endif
-+#ifndef INFINITY
-+# define INFINITY av_int2float(0x7f800000)
-+#endif
-+
-+/**
-+ * @addtogroup lavu_math
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rounding methods.
-+ */
-+enum AVRounding {
-+ AV_ROUND_ZERO = 0, ///< Round toward zero.
-+ AV_ROUND_INF = 1, ///< Round away from zero.
-+ AV_ROUND_DOWN = 2, ///< Round toward -infinity.
-+ AV_ROUND_UP = 3, ///< Round toward +infinity.
-+ AV_ROUND_NEAR_INF =
-+ 5, ///< Round to nearest and halfway cases away from zero.
-+ /**
-+ * Flag telling rescaling functions to pass `INT64_MIN`/`MAX` through
-+ * unchanged, avoiding special cases for #AV_NOPTS_VALUE.
-+ *
-+ * Unlike other values of the enumeration AVRounding, this value is a
-+ * bitmask that must be used in conjunction with another value of the
-+ * enumeration through a bitwise OR, in order to set behavior for normal
-+ * cases.
-+ *
-+ * @code{.c}
-+ * av_rescale_rnd(3, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling 3:
-+ * // Calculating 3 * 1 / 2
-+ * // 3 / 2 is rounded up to 2
-+ * // => 2
-+ *
-+ * av_rescale_rnd(AV_NOPTS_VALUE, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling AV_NOPTS_VALUE:
-+ * // AV_NOPTS_VALUE == INT64_MIN
-+ * // AV_NOPTS_VALUE is passed through
-+ * // => AV_NOPTS_VALUE
-+ * @endcode
-+ */
-+ AV_ROUND_PASS_MINMAX = 8192,
-+};
-+
-+/**
-+ * Compute the greatest common divisor of two integer operands.
-+ *
-+ * @param a,b Operands
-+ * @return GCD of a and b up to sign; if a >= 0 and b >= 0, return value is >=
-+ * 0; if a == 0 and b == 0, returns 0.
-+ */
-+int64_t av_const av_gcd(int64_t a, int64_t b);
-+
-+/**
-+ * Rescale a 64-bit integer with rounding to nearest.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow.
-+ *
-+ * This function is equivalent to av_rescale_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale_rnd(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow, and does not support different rounding methods.
-+ * If the result is not representable then INT64_MIN is returned.
-+ *
-+ * @see av_rescale(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * This function is equivalent to av_rescale_q_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q()
-+ */
-+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Compare two timestamps each in its own time base.
-+ *
-+ * @return One of the following values:
-+ * - -1 if `ts_a` is before `ts_b`
-+ * - 1 if `ts_a` is after `ts_b`
-+ * - 0 if they represent the same position
-+ *
-+ * @warning
-+ * The result of the function is undefined if one of the timestamps is outside
-+ * the `int64_t` range when represented in the other's timebase.
-+ */
-+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-+
-+/**
-+ * Compare the remainders of two integer operands divided by a common divisor.
-+ *
-+ * In other words, compare the least significant `log2(mod)` bits of integers
-+ * `a` and `b`.
-+ *
-+ * @code{.c}
-+ * av_compare_mod(0x11, 0x02, 0x10) < 0 // since 0x11 % 0x10 (0x1) < 0x02 %
-+ * 0x10 (0x2) av_compare_mod(0x11, 0x02, 0x20) > 0 // since 0x11 % 0x20 (0x11)
-+ * > 0x02 % 0x20 (0x02)
-+ * @endcode
-+ *
-+ * @param a,b Operands
-+ * @param mod Divisor; must be a power of 2
-+ * @return
-+ * - a negative value if `a % mod < b % mod`
-+ * - a positive value if `a % mod > b % mod`
-+ * - zero if `a % mod == b % mod`
-+ */
-+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-+
-+/**
-+ * Rescale a timestamp while preserving known durations.
-+ *
-+ * This function is designed to be called per audio packet to scale the input
-+ * timestamp to a different time base. Compared to a simple av_rescale_q()
-+ * call, this function is robust against possible inconsistent frame durations.
-+ *
-+ * The `last` parameter is a state variable that must be preserved for all
-+ * subsequent calls for the same stream. For the first call, `*last` should be
-+ * initialized to #AV_NOPTS_VALUE.
-+ *
-+ * @param[in] in_tb Input time base
-+ * @param[in] in_ts Input timestamp
-+ * @param[in] fs_tb Duration time base; typically this is finer-grained
-+ * (greater) than `in_tb` and `out_tb`
-+ * @param[in] duration Duration till the next call to this function (i.e.
-+ * duration of the current packet/frame)
-+ * @param[in,out] last Pointer to a timestamp expressed in terms of
-+ * `fs_tb`, acting as a state variable
-+ * @param[in] out_tb Output timebase
-+ * @return Timestamp expressed in terms of `out_tb`
-+ *
-+ * @note In the context of this function, "duration" is in term of samples, not
-+ * seconds.
-+ */
-+int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb,
-+ int duration, int64_t* last, AVRational out_tb);
-+
-+/**
-+ * Add a value to a timestamp.
-+ *
-+ * This function guarantees that when the same value is repeatly added that
-+ * no accumulation of rounding errors occurs.
-+ *
-+ * @param[in] ts Input timestamp
-+ * @param[in] ts_tb Input timestamp time base
-+ * @param[in] inc Value to be added
-+ * @param[in] inc_tb Time base of `inc`
-+ */
-+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb,
-+ int64_t inc);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MATHEMATICS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-@@ -0,0 +1,708 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_mem
-+ * Memory handling functions
-+ */
-+
-+#ifndef AVUTIL_MEM_H
-+#define AVUTIL_MEM_H
-+
-+#include <limits.h>
-+#include <stdint.h>
-+
-+#include "attributes.h"
-+#include "avutil.h"
-+#include "version.h"
-+
-+/**
-+ * @addtogroup lavu_mem
-+ * Utilities for manipulating memory.
-+ *
-+ * FFmpeg has several applications of memory that are not required of a typical
-+ * program. For example, the computing-heavy components like video decoding and
-+ * encoding can be sped up significantly through the use of aligned memory.
-+ *
-+ * However, for each of FFmpeg's applications of memory, there might not be a
-+ * recognized or standardized API for that specific use. Memory alignment, for
-+ * instance, varies wildly depending on operating systems, architectures, and
-+ * compilers. Hence, this component of @ref libavutil is created to make
-+ * dealing with memory consistently possible on all platforms.
-+ *
-+ * @{
-+ */
-+
-+#if FF_API_DECLARE_ALIGNED
-+/**
-+ *
-+ * @defgroup lavu_mem_macros Alignment Macros
-+ * Helper macros for declaring aligned variables.
-+ * @{
-+ */
-+
-+/**
-+ * @def DECLARE_ALIGNED(n,t,v)
-+ * Declare a variable that is aligned in memory.
-+ *
-+ * @code{.c}
-+ * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
-+ * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
-+ *
-+ * // The default-alignment equivalent would be
-+ * uint16_t aligned_int = 42;
-+ * uint8_t aligned_array[128];
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_ALIGNED(n,t,v)
-+ * Declare an aligned variable appropriate for use in inline assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_ALIGNED(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_CONST(n,t,v)
-+ * Declare a static constant aligned variable appropriate for use in inline
-+ * assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+# if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || \
-+ defined(__SUNPRO_C)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) const t __attribute__((aligned(n))) v
-+# elif defined(__DJGPP__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) \
-+ t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# elif defined(__GNUC__) || defined(__clang__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t av_used __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(n))) v
-+# elif defined(_MSC_VER)
-+# define DECLARE_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_CONST(n, t, v) __declspec(align(n)) static const t v
-+# else
-+# define DECLARE_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_CONST(n, t, v) static const t v
-+# endif
-+
-+/**
-+ * @}
-+ */
-+#endif
-+
-+/**
-+ * @defgroup lavu_mem_attrs Function Attributes
-+ * Function attributes applicable to memory handling functions.
-+ *
-+ * These function attributes can help compilers emit more useful warnings, or
-+ * generate better code.
-+ * @{
-+ */
-+
-+/**
-+ * @def av_malloc_attrib
-+ * Function attribute denoting a malloc-like function.
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `malloc` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_malloc_attrib __attribute__((__malloc__))
-+#else
-+# define av_malloc_attrib
-+#endif
-+
-+/**
-+ * @def av_alloc_size(...)
-+ * Function attribute used on a function that allocates memory, whose size is
-+ * given by the specified parameter(s).
-+ *
-+ * @code{.c}
-+ * void *av_malloc(size_t size) av_alloc_size(1);
-+ * void *av_calloc(size_t nmemb, size_t size) av_alloc_size(1, 2);
-+ * @endcode
-+ *
-+ * @param ... One or two parameter indexes, separated by a comma
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `alloc_size` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3)
-+# define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-+#else
-+# define av_alloc_size(...)
-+#endif
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_funcs Heap Management
-+ * Functions responsible for allocating, freeing, and copying memory.
-+ *
-+ * All memory allocation functions have a built-in upper limit of `INT_MAX`
-+ * bytes. This may be changed with av_max_alloc(), although exercise extreme
-+ * caution when doing so.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU).
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_mallocz()
-+ */
-+void* av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU) and zero all the bytes of the
-+ * block.
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if it cannot be allocated
-+ * @see av_malloc()
-+ */
-+void* av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block for an array with av_malloc().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of element
-+ * @param size Size of a single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_malloc()
-+ */
-+av_alloc_size(1, 2) void* av_malloc_array(size_t nmemb, size_t size);
-+
-+/**
-+ * Allocate a memory block for an array with av_mallocz().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of elements
-+ * @param size Size of the single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ *
-+ * @see av_mallocz()
-+ * @see av_malloc_array()
-+ */
-+void* av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2);
-+
-+#if FF_API_AV_MALLOCZ_ARRAY
-+/**
-+ * @deprecated use av_calloc()
-+ */
-+attribute_deprecated void* av_mallocz_array(size_t nmemb,
-+ size_t size) av_malloc_attrib
-+ av_alloc_size(1, 2);
-+#endif
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * If `ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param size Size in bytes of the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Pointer to a newly-reallocated block or `NULL` if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the returned pointer is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_fast_realloc()
-+ * @see av_reallocp()
-+ */
-+void* av_realloc(void* ptr, size_t size) av_alloc_size(2);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory through a pointer to a
-+ * pointer.
-+ *
-+ * If `*ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `*ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already allocated
-+ * with av_realloc(), or a pointer to `NULL`. The pointer
-+ * is updated on success, or freed on failure.
-+ * @param[in] size Size in bytes for the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+av_warn_unused_result int av_reallocp(void* ptr, size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * This function does the same thing as av_realloc(), except:
-+ * - It takes two size arguments and allocates `nelem * elsize` bytes,
-+ * after checking the result of the multiplication for integer overflow.
-+ * - It frees the input block in case of failure, thus avoiding the memory
-+ * leak with the classic
-+ * @code{.c}
-+ * buf = realloc(buf);
-+ * if (!buf)
-+ * return -1;
-+ * @endcode
-+ * pattern.
-+ */
-+void* av_realloc_f(void* ptr, size_t nelem, size_t elsize);
-+
-+/**
-+ * Allocate, reallocate, or free an array.
-+ *
-+ * If `ptr` is `NULL` and `nmemb` > 0, allocate a new block. If
-+ * `nmemb` is zero, free the memory block pointed to by `ptr`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param nmemb Number of elements in the array
-+ * @param size Size of the single element of the array
-+ *
-+ * @return Pointer to a newly-reallocated block or NULL if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_reallocp_array()
-+ */
-+av_alloc_size(2, 3) void* av_realloc_array(void* ptr, size_t nmemb,
-+ size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free an array through a pointer to a pointer.
-+ *
-+ * If `*ptr` is `NULL` and `nmemb` > 0, allocate a new block. If `nmemb` is
-+ * zero, free the memory block pointed to by `*ptr`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already
-+ * allocated with av_realloc(), or a pointer to `NULL`.
-+ * The pointer is updated on success, or freed on failure.
-+ * @param[in] nmemb Number of elements
-+ * @param[in] size Size of the single element
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+int av_reallocp_array(void* ptr, size_t nmemb, size_t size);
-+
-+/**
-+ * Reallocate the given buffer if it is not large enough, otherwise do nothing.
-+ *
-+ * If the given buffer is `NULL`, then a new uninitialized buffer is allocated.
-+ *
-+ * If the given buffer is not large enough, and reallocation fails, `NULL` is
-+ * returned and `*size` is set to 0, but the original buffer is not changed or
-+ * freed.
-+ *
-+ * A typical use pattern follows:
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * uint8_t *new_buf = av_fast_realloc(buf, ¤t_size, size_needed);
-+ * if (!new_buf) {
-+ * // Allocation failed; clean up original buffer
-+ * av_freep(&buf);
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Already allocated buffer, or `NULL`
-+ * @param[in,out] size Pointer to the size of buffer `ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `ptr`
-+ * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
-+ * buffer if the buffer was not large enough, or `NULL` in case of
-+ * error
-+ * @see av_realloc()
-+ * @see av_fast_malloc()
-+ */
-+void* av_fast_realloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate a buffer, reusing the given one if large enough.
-+ *
-+ * Contrary to av_fast_realloc(), the current buffer contents might not be
-+ * preserved and on error the old buffer is freed, thus no special handling to
-+ * avoid memleaks is necessary.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * av_fast_malloc(&buf, ¤t_size, size_needed);
-+ * if (!buf) {
-+ * // Allocation failed; buf already freed
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_realloc()
-+ * @see av_fast_mallocz()
-+ */
-+void av_fast_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate and clear a buffer, reusing the given one if large enough.
-+ *
-+ * Like av_fast_malloc(), but all newly allocated space is initially cleared.
-+ * Reused buffer is not cleared.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_fast_malloc()
-+ */
-+void av_fast_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family.
-+ *
-+ * @param ptr Pointer to the memory block which should be freed.
-+ *
-+ * @note `ptr = NULL` is explicitly allowed.
-+ * @note It is recommended that you use av_freep() instead, to prevent leaving
-+ * behind dangling pointers.
-+ * @see av_freep()
-+ */
-+void av_free(void* ptr);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family, and set the pointer pointing to it to `NULL`.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = av_malloc(16);
-+ * av_free(buf);
-+ * // buf now contains a dangling pointer to freed memory, and accidental
-+ * // dereference of buf will result in a use-after-free, which may be a
-+ * // security risk.
-+ *
-+ * uint8_t *buf = av_malloc(16);
-+ * av_freep(&buf);
-+ * // buf is now NULL, and accidental dereference will only result in a
-+ * // NULL-pointer dereference.
-+ * @endcode
-+ *
-+ * @param ptr Pointer to the pointer to the memory block which should be freed
-+ * @note `*ptr = NULL` is safe and leads to no action.
-+ * @see av_free()
-+ */
-+void av_freep(void* ptr);
-+
-+/**
-+ * Duplicate a string.
-+ *
-+ * @param s String to be duplicated
-+ * @return Pointer to a newly-allocated string containing a
-+ * copy of `s` or `NULL` if the string cannot be allocated
-+ * @see av_strndup()
-+ */
-+char* av_strdup(const char* s) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a substring of a string.
-+ *
-+ * @param s String to be duplicated
-+ * @param len Maximum length of the resulting string (not counting the
-+ * terminating byte)
-+ * @return Pointer to a newly-allocated string containing a
-+ * substring of `s` or `NULL` if the string cannot be allocated
-+ */
-+char* av_strndup(const char* s, size_t len) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a buffer with av_malloc().
-+ *
-+ * @param p Buffer to be duplicated
-+ * @param size Size in bytes of the buffer copied
-+ * @return Pointer to a newly allocated buffer containing a
-+ * copy of `p` or `NULL` if the buffer cannot be allocated
-+ */
-+void* av_memdup(const void* p, size_t size);
-+
-+/**
-+ * Overlapping memcpy() implementation.
-+ *
-+ * @param dst Destination buffer
-+ * @param back Number of bytes back to start copying (i.e. the initial size of
-+ * the overlapping window); must be > 0
-+ * @param cnt Number of bytes to copy; must be >= 0
-+ *
-+ * @note `cnt > back` is valid, this will copy the bytes we just copied,
-+ * thus creating a repeating pattern with a period length of `back`.
-+ */
-+void av_memcpy_backptr(uint8_t* dst, int back, int cnt);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_dynarray Dynamic Array
-+ *
-+ * Utilities to make an array grow when needed.
-+ *
-+ * Sometimes, the programmer would want to have an array that can grow when
-+ * needed. The libavutil dynamic array utilities fill that need.
-+ *
-+ * libavutil supports two systems of appending elements onto a dynamically
-+ * allocated array, the first one storing the pointer to the value in the
-+ * array, and the second storing the value directly. In both systems, the
-+ * caller is responsible for maintaining a variable containing the length of
-+ * the array, as well as freeing of the array after use.
-+ *
-+ * The first system stores pointers to values in a block of dynamically
-+ * allocated memory. Since only pointers are stored, the function does not need
-+ * to know the size of the type. Both av_dynarray_add() and
-+ * av_dynarray_add_nofree() implement this system.
-+ *
-+ * @code
-+ * type **array = NULL; //< an array of pointers to values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added2);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // &to_be_added == array[0]
-+ * // &to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * The second system stores the value directly in a block of memory. As a
-+ * result, the function has to know the size of the type. av_dynarray2_add()
-+ * implements this mechanism.
-+ *
-+ * @code
-+ * type *array = NULL; //< an array of values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array), NULL);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ * memcpy(addr, &to_be_added, sizeof(to_be_added));
-+ *
-+ * // Shortcut of the above.
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array),
-+ * (const void *)&to_be_added2);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // to_be_added == array[0]
-+ * // to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Add the pointer to an element to a dynamic array.
-+ *
-+ * The array to grow is supposed to be an array of pointers to
-+ * structures, and the element to add must be a pointer to an already
-+ * allocated structure.
-+ *
-+ * The array is reallocated when its size reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem Element to add
-+ * @see av_dynarray_add_nofree(), av_dynarray2_add()
-+ */
-+void av_dynarray_add(void* tab_ptr, int* nb_ptr, void* elem);
-+
-+/**
-+ * Add an element to a dynamic array.
-+ *
-+ * Function has the same functionality as av_dynarray_add(),
-+ * but it doesn't free memory on fails. It returns error code
-+ * instead and leave current buffer untouched.
-+ *
-+ * @return >=0 on success, negative otherwise
-+ * @see av_dynarray_add(), av_dynarray2_add()
-+ */
-+av_warn_unused_result int av_dynarray_add_nofree(void* tab_ptr, int* nb_ptr,
-+ void* elem);
-+
-+/**
-+ * Add an element of size `elem_size` to a dynamic array.
-+ *
-+ * The array is reallocated when its number of elements reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem_size Size in bytes of an element in the array
-+ * @param[in] elem_data Pointer to the data of the element to add. If
-+ * `NULL`, the space of the newly added element is
-+ * allocated but left uninitialized.
-+ *
-+ * @return Pointer to the data of the element to copy in the newly allocated
-+ * space
-+ * @see av_dynarray_add(), av_dynarray_add_nofree()
-+ */
-+void* av_dynarray2_add(void** tab_ptr, int* nb_ptr, size_t elem_size,
-+ const uint8_t* elem_data);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_misc Miscellaneous Functions
-+ *
-+ * Other functions related to memory allocation.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Multiply two `size_t` values checking for overflow.
-+ *
-+ * @param[in] a,b Operands of multiplication
-+ * @param[out] r Pointer to the result of the operation
-+ * @return 0 on success, AVERROR(EINVAL) on overflow
-+ */
-+int av_size_mult(size_t a, size_t b, size_t* r);
-+
-+/**
-+ * Set the maximum size that may be allocated in one block.
-+ *
-+ * The value specified with this function is effective for all libavutil's @ref
-+ * lavu_mem_funcs "heap management functions."
-+ *
-+ * By default, the max value is defined as `INT_MAX`.
-+ *
-+ * @param max Value to be set as the new maximum size
-+ *
-+ * @warning Exercise extreme caution when using this function. Don't touch
-+ * this if you do not understand the full consequence of doing so.
-+ */
-+void av_max_alloc(size_t max);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MEM_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-@@ -0,0 +1,808 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_PIXFMT_H
-+#define AVUTIL_PIXFMT_H
-+
-+/**
-+ * @file
-+ * pixel format definitions
-+ */
-+
-+#include "libavutil/avconfig.h"
-+#include "version.h"
-+
-+#define AVPALETTE_SIZE 1024
-+#define AVPALETTE_COUNT 256
-+
-+/**
-+ * Pixel format.
-+ *
-+ * @note
-+ * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
-+ * color is put together as:
-+ * (A << 24) | (R << 16) | (G << 8) | B
-+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
-+ * big-endian CPUs.
-+ *
-+ * @note
-+ * If the resolution is not a multiple of the chroma subsampling factor
-+ * then the chroma plane resolution must be rounded up.
-+ *
-+ * @par
-+ * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
-+ * image data is stored in AVFrame.data[0]. The palette is transported in
-+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
-+ * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
-+ * also endian-specific). Note also that the individual RGB32 palette
-+ * components stored in AVFrame.data[1] should be in the range 0..255.
-+ * This is important as many custom PAL8 video codecs that were designed
-+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
-+ *
-+ * @par
-+ * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
-+ * for pal8. This palette is filled in automatically by the function
-+ * allocating the picture.
-+ */
-+enum AVPixelFormat {
-+ AV_PIX_FMT_NONE = -1,
-+ AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-+ AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-+ AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-+ AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_GRAY8, ///< Y , 8bpp
-+ AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_PAL8, ///< 8 bits with AV_PIX_FMT_RGB32 palette
-+ AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV420P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV422P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV444P and
-+ ///< setting color_range
-+ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-+ AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-+ AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
-+ AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
-+ AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
-+ AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
-+ AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
-+
-+ AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-+ AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-+ AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-+ AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-+
-+ AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
-+ AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
-+ AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in
-+ ///< favor of AV_PIX_FMT_YUV440P and setting color_range
-+ AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2
-+ ///< Y & A samples)
-+ AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ /**
-+ * Hardware acceleration through VA-API, data[3] contains a
-+ * VASurfaceID.
-+ */
-+ AV_PIX_FMT_VAAPI,
-+
-+ AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3]
-+ ///< contains a LPDIRECT3DSURFACE9 pointer
-+
-+ AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_YA8, ///< 8 bits gray, 8 bits alpha
-+
-+ AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+ AV_PIX_FMT_GRAY8A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+
-+ AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ /**
-+ * The following 12 formats have the disadvantage of needing 1 format for each
-+ * bit depth. Notice that each 9/10 bits sample is stored in 16 bits with
-+ * extra padding. If you want to support multiple bit depths, then using
-+ * AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
-+ */
-+ AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P10BE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P10LE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P10BE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P10LE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P10BE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P10LE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
-+ AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
-+ AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
-+ AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian
-+ AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian
-+ AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian
-+ AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian
-+ AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+
-+ AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3]
-+ ///< contains a VdpVideoSurface
-+
-+ AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< little-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< big-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample
-+ ///< per 2x1 Y samples)
-+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), little-endian
-+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), big-endian
-+
-+ AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+ AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+
-+ AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
-+
-+ AV_PIX_FMT_YA16BE, ///< 16 bits gray, 16 bits alpha (big-endian)
-+ AV_PIX_FMT_YA16LE, ///< 16 bits gray, 16 bits alpha (little-endian)
-+
-+ AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
-+ AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
-+ AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
-+ /**
-+ * HW acceleration through QSV, data[3] contains a pointer to the
-+ * mfxFrameSurface1 structure.
-+ */
-+ AV_PIX_FMT_QSV,
-+ /**
-+ * HW acceleration though MMAL, data[3] contains a pointer to the
-+ * MMAL_BUFFER_HEADER_T structure.
-+ */
-+ AV_PIX_FMT_MMAL,
-+
-+ AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11 via old API,
-+ ///< Picture.data[3] contains a
-+ ///< ID3D11VideoDecoderOutputView pointer
-+
-+ /**
-+ * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
-+ * exactly as for system memory frames.
-+ */
-+ AV_PIX_FMT_CUDA,
-+
-+ AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined
-+ AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined
-+ AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined
-+ AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined
-+
-+ AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian
-+ AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
-+ AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
-+ AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
-+ AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1
-+ ///< Y samples) full scale (JPEG), deprecated in favor
-+ ///< of AV_PIX_FMT_YUV411P and setting color_range
-+
-+ AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, big-endian
-+
-+ AV_PIX_FMT_XVMC, ///< XVideo Motion Acceleration via common packet passing
-+
-+ AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_AYUV64LE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), little-endian
-+ AV_PIX_FMT_AYUV64BE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), big-endian
-+
-+ AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
-+
-+ AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, little-endian
-+ AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, big-endian
-+
-+ AV_PIX_FMT_GBRAP12BE, ///< planar GBR 4:4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRAP12LE, ///< planar GBR 4:4:4:4 48bpp, little-endian
-+
-+ AV_PIX_FMT_GBRAP10BE, ///< planar GBR 4:4:4:4 40bpp, big-endian
-+ AV_PIX_FMT_GBRAP10LE, ///< planar GBR 4:4:4:4 40bpp, little-endian
-+
-+ AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec
-+
-+ AV_PIX_FMT_GRAY12BE, ///< Y , 12bpp, big-endian
-+ AV_PIX_FMT_GRAY12LE, ///< Y , 12bpp, little-endian
-+ AV_PIX_FMT_GRAY10BE, ///< Y , 10bpp, big-endian
-+ AV_PIX_FMT_GRAY10LE, ///< Y , 10bpp, little-endian
-+
-+ AV_PIX_FMT_P016LE, ///< like NV12, with 16bpp per component, little-endian
-+ AV_PIX_FMT_P016BE, ///< like NV12, with 16bpp per component, big-endian
-+
-+ /**
-+ * Hardware surfaces for Direct3D11.
-+ *
-+ * This is preferred over the legacy AV_PIX_FMT_D3D11VA_VLD. The new D3D11
-+ * hwaccel API and filtering support AV_PIX_FMT_D3D11 only.
-+ *
-+ * data[0] contains a ID3D11Texture2D pointer, and data[1] contains the
-+ * texture array index of the frame as intptr_t if the ID3D11Texture2D is
-+ * an array texture (or always 0 if it's a normal texture).
-+ */
-+ AV_PIX_FMT_D3D11,
-+
-+ AV_PIX_FMT_GRAY9BE, ///< Y , 9bpp, big-endian
-+ AV_PIX_FMT_GRAY9LE, ///< Y , 9bpp, little-endian
-+
-+ AV_PIX_FMT_GBRPF32BE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< big-endian
-+ AV_PIX_FMT_GBRPF32LE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< little-endian
-+ AV_PIX_FMT_GBRAPF32BE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, big-endian
-+ AV_PIX_FMT_GBRAPF32LE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, little-endian
-+
-+ /**
-+ * DRM-managed buffers exposed through PRIME buffer sharing.
-+ *
-+ * data[0] points to an AVDRMFrameDescriptor.
-+ */
-+ AV_PIX_FMT_DRM_PRIME,
-+ /**
-+ * Hardware surfaces for OpenCL.
-+ *
-+ * data[i] contain 2D image objects (typed in C as cl_mem, used
-+ * in OpenCL as image2d_t) for each plane of the surface.
-+ */
-+ AV_PIX_FMT_OPENCL,
-+
-+ AV_PIX_FMT_GRAY14BE, ///< Y , 14bpp, big-endian
-+ AV_PIX_FMT_GRAY14LE, ///< Y , 14bpp, little-endian
-+
-+ AV_PIX_FMT_GRAYF32BE, ///< IEEE-754 single precision Y, 32bpp, big-endian
-+ AV_PIX_FMT_GRAYF32LE, ///< IEEE-754 single precision Y, 32bpp, little-endian
-+
-+ AV_PIX_FMT_YUVA422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, little-endian
-+ AV_PIX_FMT_YUVA444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, little-endian
-+
-+ AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
-+
-+ /**
-+ * Vulkan hardware images.
-+ *
-+ * data[0] points to an AVVkFrame
-+ */
-+ AV_PIX_FMT_VULKAN,
-+
-+ AV_PIX_FMT_Y210BE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, big-endian
-+ AV_PIX_FMT_Y210LE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, little-endian
-+
-+ AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), big-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), big-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_P210BE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P210LE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P410BE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P410LE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P216BE, ///< interleaved chroma YUV 4:2:2, 32bpp, big-endian
-+ AV_PIX_FMT_P216LE, ///< interleaved chroma YUV 4:2:2, 32bpp, liddle-endian
-+
-+ AV_PIX_FMT_P416BE, ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian
-+ AV_PIX_FMT_P416LE, ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian
-+
-+ AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to
-+ ///< link with shared libav* because the number of formats
-+ ///< might differ between versions
-+};
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-+#else
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-+#endif
-+
-+#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA)
-+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-+#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA)
-+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-+#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0)
-+#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0)
-+
-+#define AV_PIX_FMT_GRAY9 AV_PIX_FMT_NE(GRAY9BE, GRAY9LE)
-+#define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
-+#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
-+#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
-+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-+#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE)
-+#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE)
-+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-+#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-+#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE)
-+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-+#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
-+
-+#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE, YUV420P9LE)
-+#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE, YUV422P9LE)
-+#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE, YUV444P9LE)
-+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-+#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE)
-+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-+#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
-+#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
-+#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE)
-+#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
-+#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
-+#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
-+#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
-+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-+
-+#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE, GBRP9LE)
-+#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE)
-+#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE)
-+#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE)
-+#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE)
-+#define AV_PIX_FMT_GBRAP10 AV_PIX_FMT_NE(GBRAP10BE, GBRAP10LE)
-+#define AV_PIX_FMT_GBRAP12 AV_PIX_FMT_NE(GBRAP12BE, GBRAP12LE)
-+#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE)
-+
-+#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE)
-+#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE)
-+#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE)
-+#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE)
-+
-+#define AV_PIX_FMT_GBRPF32 AV_PIX_FMT_NE(GBRPF32BE, GBRPF32LE)
-+#define AV_PIX_FMT_GBRAPF32 AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
-+
-+#define AV_PIX_FMT_GRAYF32 AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
-+
-+#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE, YUVA420P9LE)
-+#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE, YUVA422P9LE)
-+#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE, YUVA444P9LE)
-+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-+#define AV_PIX_FMT_YUVA422P12 AV_PIX_FMT_NE(YUVA422P12BE, YUVA422P12LE)
-+#define AV_PIX_FMT_YUVA444P12 AV_PIX_FMT_NE(YUVA444P12BE, YUVA444P12LE)
-+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-+
-+#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
-+#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
-+#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE)
-+#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)
-+
-+#define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE)
-+#define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE)
-+#define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE)
-+
-+#define AV_PIX_FMT_P210 AV_PIX_FMT_NE(P210BE, P210LE)
-+#define AV_PIX_FMT_P410 AV_PIX_FMT_NE(P410BE, P410LE)
-+#define AV_PIX_FMT_P216 AV_PIX_FMT_NE(P216BE, P216LE)
-+#define AV_PIX_FMT_P416 AV_PIX_FMT_NE(P416BE, P416LE)
-+
-+/**
-+ * Chromaticity coordinates of the source primaries.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.1 and
-+ * ITU-T H.273.
-+ */
-+enum AVColorPrimaries {
-+ AVCOL_PRI_RESERVED0 = 0,
-+ AVCOL_PRI_BT709 =
-+ 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP 177 Annex B
-+ AVCOL_PRI_UNSPECIFIED = 2,
-+ AVCOL_PRI_RESERVED = 3,
-+ AVCOL_PRI_BT470M =
-+ 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+
-+ AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM
-+ AVCOL_PRI_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-+ AVCOL_PRI_SMPTE240M =
-+ 7, ///< identical to above, also called "SMPTE C" even though it uses D65
-+ AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C
-+ AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
-+ AVCOL_PRI_SMPTE428 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
-+ AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428,
-+ AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
-+ AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
-+ AVCOL_PRI_EBU3213 = 22, ///< EBU Tech. 3213-E (nothing there) / one of JEDEC
-+ ///< P22 group phosphors
-+ AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213,
-+ AVCOL_PRI_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Color Transfer Characteristic.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.2.
-+ */
-+enum AVColorTransferCharacteristic {
-+ AVCOL_TRC_RESERVED0 = 0,
-+ AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
-+ AVCOL_TRC_UNSPECIFIED = 2,
-+ AVCOL_TRC_RESERVED = 3,
-+ AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-+ AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
-+ AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358
-+ ///< 525 or 625 / ITU-R BT1700 NTSC
-+ AVCOL_TRC_SMPTE240M = 7,
-+ AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
-+ AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
-+ AVCOL_TRC_LOG_SQRT =
-+ 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
-+ AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-+ AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
-+ AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-+ AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10-bit system
-+ AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12-bit system
-+ AVCOL_TRC_SMPTE2084 =
-+ 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
-+ AVCOL_TRC_SMPTEST2084 = AVCOL_TRC_SMPTE2084,
-+ AVCOL_TRC_SMPTE428 = 17, ///< SMPTE ST 428-1
-+ AVCOL_TRC_SMPTEST428_1 = AVCOL_TRC_SMPTE428,
-+ AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma"
-+ AVCOL_TRC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * YUV colorspace type.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.3.
-+ */
-+enum AVColorSpace {
-+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC
-+ ///< 61966-2-1 (sRGB), YZX and ST 428-1
-+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 /
-+ ///< derived in SMPTE RP 177 Annex B
-+ AVCOL_SPC_UNSPECIFIED = 2,
-+ AVCOL_SPC_RESERVED =
-+ 3, ///< reserved for future use by ITU-T and ISO/IEC just like 15-255 are
-+ AVCOL_SPC_FCC =
-+ 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+ AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-+ AVCOL_SPC_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC /
-+ ///< functionally identical to above
-+ AVCOL_SPC_SMPTE240M =
-+ 7, ///< derived from 170M primaries and D65 white point, 170M is derived
-+ ///< from BT470 System M's primaries
-+ AVCOL_SPC_YCGCO =
-+ 8, ///< used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-+ AVCOL_SPC_YCOCG = AVCOL_SPC_YCGCO,
-+ AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
-+ AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
-+ AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x
-+ AVCOL_SPC_CHROMA_DERIVED_NCL =
-+ 12, ///< Chromaticity-derived non-constant luminance system
-+ AVCOL_SPC_CHROMA_DERIVED_CL =
-+ 13, ///< Chromaticity-derived constant luminance system
-+ AVCOL_SPC_ICTCP = 14, ///< ITU-R BT.2100-0, ICtCp
-+ AVCOL_SPC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Visual content value range.
-+ *
-+ * These values are based on definitions that can be found in multiple
-+ * specifications, such as ITU-T BT.709 (3.4 - Quantization of RGB, luminance
-+ * and colour-difference signals), ITU-T BT.2020 (Table 5 - Digital
-+ * Representation) as well as ITU-T BT.2100 (Table 9 - Digital 10- and 12-bit
-+ * integer representation). At the time of writing, the BT.2100 one is
-+ * recommended, as it also defines the full range representation.
-+ *
-+ * Common definitions:
-+ * - For RGB and luma planes such as Y in YCbCr and I in ICtCp,
-+ * 'E' is the original value in range of 0.0 to 1.0.
-+ * - For chroma planes such as Cb,Cr and Ct,Cp, 'E' is the original
-+ * value in range of -0.5 to 0.5.
-+ * - 'n' is the output bit depth.
-+ * - For additional definitions such as rounding and clipping to valid n
-+ * bit unsigned integer range, please refer to BT.2100 (Table 9).
-+ */
-+enum AVColorRange {
-+ AVCOL_RANGE_UNSPECIFIED = 0,
-+
-+ /**
-+ * Narrow or limited range content.
-+ *
-+ * - For luma planes:
-+ *
-+ * (219 * E + 16) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-235 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (224 * E + 128) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-240 for 8 bits
-+ */
-+ AVCOL_RANGE_MPEG = 1,
-+
-+ /**
-+ * Full range content.
-+ *
-+ * - For RGB and luma planes:
-+ *
-+ * (2^n - 1) * E
-+ *
-+ * F.ex. the range of 0-255 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (2^n - 1) * E + 2^(n - 1)
-+ *
-+ * F.ex. the range of 1-255 for 8 bits
-+ */
-+ AVCOL_RANGE_JPEG = 2,
-+ AVCOL_RANGE_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Location of chroma samples.
-+ *
-+ * Illustration showing the location of the first (top left) chroma sample of
-+ *the image, the left shows only luma, the right shows the location of the
-+ *chroma sample, the 2 could be imagined to overlay each other but are drawn
-+ *separately due to limitations of ASCII
-+ *
-+ * 1st 2nd 1st 2nd horizontal luma sample positions
-+ * v v v v
-+ * ______ ______
-+ *1st luma line > |X X ... |3 4 X ... X are luma samples,
-+ * | |1 2 1-6 are possible chroma positions
-+ *2nd luma line > |X X ... |5 6 X ... 0 is undefined/unknown position
-+ */
-+enum AVChromaLocation {
-+ AVCHROMA_LOC_UNSPECIFIED = 0,
-+ AVCHROMA_LOC_LEFT = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0
-+ AVCHROMA_LOC_CENTER = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0
-+ AVCHROMA_LOC_TOPLEFT =
-+ 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2
-+ AVCHROMA_LOC_TOP = 4,
-+ AVCHROMA_LOC_BOTTOMLEFT = 5,
-+ AVCHROMA_LOC_BOTTOM = 6,
-+ AVCHROMA_LOC_NB ///< Not part of ABI
-+};
-+
-+#endif /* AVUTIL_PIXFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-@@ -0,0 +1,221 @@
-+/*
-+ * rational numbers
-+ * Copyright (c) 2003 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_math_rational
-+ * Utilties for rational number calculation.
-+ * @author Michael Niedermayer <michaelni(a)gmx.at>
-+ */
-+
-+#ifndef AVUTIL_RATIONAL_H
-+#define AVUTIL_RATIONAL_H
-+
-+#include <stdint.h>
-+#include <limits.h>
-+#include "attributes.h"
-+
-+/**
-+ * @defgroup lavu_math_rational AVRational
-+ * @ingroup lavu_math
-+ * Rational number calculation.
-+ *
-+ * While rational numbers can be expressed as floating-point numbers, the
-+ * conversion process is a lossy one, so are floating-point operations. On the
-+ * other hand, the nature of FFmpeg demands highly accurate calculation of
-+ * timestamps. This set of rational number utilities serves as a generic
-+ * interface for manipulating rational numbers as pairs of numerators and
-+ * denominators.
-+ *
-+ * Many of the functions that operate on AVRational's have the suffix `_q`, in
-+ * reference to the mathematical symbol "ℚ" (Q) which denotes the set of all
-+ * rational numbers.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rational number (pair of numerator and denominator).
-+ */
-+typedef struct AVRational {
-+ int num; ///< Numerator
-+ int den; ///< Denominator
-+} AVRational;
-+
-+/**
-+ * Create an AVRational.
-+ *
-+ * Useful for compilers that do not support compound literals.
-+ *
-+ * @note The return value is not reduced.
-+ * @see av_reduce()
-+ */
-+static inline AVRational av_make_q(int num, int den) {
-+ AVRational r = {num, den};
-+ return r;
-+}
-+
-+/**
-+ * Compare two rationals.
-+ *
-+ * @param a First rational
-+ * @param b Second rational
-+ *
-+ * @return One of the following values:
-+ * - 0 if `a == b`
-+ * - 1 if `a > b`
-+ * - -1 if `a < b`
-+ * - `INT_MIN` if one of the values is of the form `0 / 0`
-+ */
-+static inline int av_cmp_q(AVRational a, AVRational b) {
-+ const int64_t tmp = a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-+
-+ if (tmp)
-+ return (int)((tmp ^ a.den ^ b.den) >> 63) | 1;
-+ else if (b.den && a.den)
-+ return 0;
-+ else if (a.num && b.num)
-+ return (a.num >> 31) - (b.num >> 31);
-+ else
-+ return INT_MIN;
-+}
-+
-+/**
-+ * Convert an AVRational to a `double`.
-+ * @param a AVRational to convert
-+ * @return `a` in floating-point form
-+ * @see av_d2q()
-+ */
-+static inline double av_q2d(AVRational a) { return a.num / (double)a.den; }
-+
-+/**
-+ * Reduce a fraction.
-+ *
-+ * This is useful for framerate calculations.
-+ *
-+ * @param[out] dst_num Destination numerator
-+ * @param[out] dst_den Destination denominator
-+ * @param[in] num Source numerator
-+ * @param[in] den Source denominator
-+ * @param[in] max Maximum allowed values for `dst_num` & `dst_den`
-+ * @return 1 if the operation is exact, 0 otherwise
-+ */
-+int av_reduce(int* dst_num, int* dst_den, int64_t num, int64_t den,
-+ int64_t max);
-+
-+/**
-+ * Multiply two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b*c
-+ */
-+AVRational av_mul_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Divide one rational by another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b/c
-+ */
-+AVRational av_div_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Add two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b+c
-+ */
-+AVRational av_add_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Subtract one rational from another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b-c
-+ */
-+AVRational av_sub_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Invert a rational.
-+ * @param q value
-+ * @return 1 / q
-+ */
-+static av_always_inline AVRational av_inv_q(AVRational q) {
-+ AVRational r = {q.den, q.num};
-+ return r;
-+}
-+
-+/**
-+ * Convert a double precision floating point number to a rational.
-+ *
-+ * In case of infinity, the returned value is expressed as `{1, 0}` or
-+ * `{-1, 0}` depending on the sign.
-+ *
-+ * @param d `double` to convert
-+ * @param max Maximum allowed numerator and denominator
-+ * @return `d` in AVRational form
-+ * @see av_q2d()
-+ */
-+AVRational av_d2q(double d, int max) av_const;
-+
-+/**
-+ * Find which of the two rationals is closer to another rational.
-+ *
-+ * @param q Rational to be compared against
-+ * @param q1,q2 Rationals to be tested
-+ * @return One of the following values:
-+ * - 1 if `q1` is nearer to `q` than `q2`
-+ * - -1 if `q2` is nearer to `q` than `q1`
-+ * - 0 if they have the same distance
-+ */
-+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-+
-+/**
-+ * Find the value in a list of rationals nearest a given reference rational.
-+ *
-+ * @param q Reference rational
-+ * @param q_list Array of rationals terminated by `{0, 0}`
-+ * @return Index of the nearest value found in the array
-+ */
-+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-+
-+/**
-+ * Convert an AVRational to a IEEE 32-bit `float` expressed in fixed-point
-+ * format.
-+ *
-+ * @param q Rational to be converted
-+ * @return Equivalent floating-point value, expressed as an unsigned 32-bit
-+ * integer.
-+ * @note The returned value is platform-indepedant.
-+ */
-+uint32_t av_q2intfloat(AVRational q);
-+
-+/**
-+ * Return the best rational so that a and b are multiple of it.
-+ * If the resulting denominator is larger than max_den, return def.
-+ */
-+AVRational av_gcd_q(AVRational a, AVRational b, int max_den, AVRational def);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_RATIONAL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-@@ -0,0 +1,276 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_SAMPLEFMT_H
-+#define AVUTIL_SAMPLEFMT_H
-+
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ *
-+ * @defgroup lavu_sampfmts Audio sample formats
-+ *
-+ * Audio sample format enumeration and related convenience functions.
-+ * @{
-+ */
-+
-+/**
-+ * Audio sample formats
-+ *
-+ * - The data described by the sample format is always in native-endian order.
-+ * Sample values can be expressed by native C types, hence the lack of a
-+ * signed 24-bit sample format even though it is a common raw audio data format.
-+ *
-+ * - The floating-point formats are based on full volume being in the range
-+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
-+ *
-+ * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
-+ * (such as AVFrame in libavcodec) is as follows:
-+ *
-+ * @par
-+ * For planar sample formats, each audio channel is in a separate data plane,
-+ * and linesize is the buffer size, in bytes, for a single plane. All data
-+ * planes must be the same size. For packed sample formats, only the first data
-+ * plane is used, and samples for each channel are interleaved. In this case,
-+ * linesize is the buffer size, in bytes, for the 1 plane.
-+ *
-+ */
-+enum AVSampleFormat {
-+ AV_SAMPLE_FMT_NONE = -1,
-+ AV_SAMPLE_FMT_U8, ///< unsigned 8 bits
-+ AV_SAMPLE_FMT_S16, ///< signed 16 bits
-+ AV_SAMPLE_FMT_S32, ///< signed 32 bits
-+ AV_SAMPLE_FMT_FLT, ///< float
-+ AV_SAMPLE_FMT_DBL, ///< double
-+
-+ AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
-+ AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
-+ AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
-+ AV_SAMPLE_FMT_FLTP, ///< float, planar
-+ AV_SAMPLE_FMT_DBLP, ///< double, planar
-+ AV_SAMPLE_FMT_S64, ///< signed 64 bits
-+ AV_SAMPLE_FMT_S64P, ///< signed 64 bits, planar
-+
-+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking
-+ ///< dynamically
-+};
-+
-+/**
-+ * Return the name of sample_fmt, or NULL if sample_fmt is not
-+ * recognized.
-+ */
-+const char* av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
-+ * on error.
-+ */
-+enum AVSampleFormat av_get_sample_fmt(const char* name);
-+
-+/**
-+ * Return the planar<->packed alternative form of the given sample format, or
-+ * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
-+ * requested planar/packed format, the format returned is the same as the
-+ * input.
-+ */
-+enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt,
-+ int planar);
-+
-+/**
-+ * Get the packed alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in packed format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the packed alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the planar alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in planar format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the planar alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Generate a string corresponding to the sample format with
-+ * sample_fmt, or a header if sample_fmt is negative.
-+ *
-+ * @param buf the buffer where to write the string
-+ * @param buf_size the size of buf
-+ * @param sample_fmt the number of the sample format to print the
-+ * corresponding info string, or a negative value to print the
-+ * corresponding header.
-+ * @return the pointer to the filled buffer or NULL if sample_fmt is
-+ * unknown or in case of other errors
-+ */
-+char* av_get_sample_fmt_string(char* buf, int buf_size,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return number of bytes per sample.
-+ *
-+ * @param sample_fmt the sample format
-+ * @return number of bytes per sample or zero if unknown for the given
-+ * sample format
-+ */
-+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Check if the sample format is planar.
-+ *
-+ * @param sample_fmt the sample format to inspect
-+ * @return 1 if the sample format is planar, 0 if it is interleaved
-+ */
-+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the required buffer size for the given audio parameters.
-+ *
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return required buffer size, or negative error code on failure
-+ */
-+int av_samples_get_buffer_size(int* linesize, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * @}
-+ *
-+ * @defgroup lavu_sampmanip Samples manipulation
-+ *
-+ * Functions that manipulate audio samples
-+ * @{
-+ */
-+
-+/**
-+ * Fill plane data pointers and linesize for samples with sample
-+ * format sample_fmt.
-+ *
-+ * The audio_data array is filled with the pointers to the samples data planes:
-+ * for planar, set the start point of each channel's data within the buffer,
-+ * for packed, set the start point of the entire buffer only.
-+ *
-+ * The value pointed to by linesize is set to the aligned size of each
-+ * channel's data buffer for planar layout, or to the aligned size of the
-+ * buffer for all channels for packed layout.
-+ *
-+ * The buffer in buf must be big enough to contain all the samples
-+ * (use av_samples_get_buffer_size() to compute its minimum size),
-+ * otherwise the audio_data pointers will point to invalid data.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param buf the pointer to a buffer containing the samples
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return minimum size in bytes required for the buffer on
-+ * success, or a negative error code on failure
-+ */
-+int av_samples_fill_arrays(uint8_t** audio_data, int* linesize,
-+ const uint8_t* buf, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
-+ * linesize accordingly.
-+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
-+ * Allocated data will be initialized to silence.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize aligned size for audio buffer(s), may be NULL
-+ * @param nb_channels number of audio channels
-+ * @param nb_samples number of samples per channel
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return >=0 on success or a negative error code on failure
-+ * @todo return the size of the allocated buffer in case of success at the next
-+ * bump
-+ * @see av_samples_fill_arrays()
-+ * @see av_samples_alloc_array_and_samples()
-+ */
-+int av_samples_alloc(uint8_t** audio_data, int* linesize, int nb_channels,
-+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a data pointers array, samples buffer for nb_samples
-+ * samples, and fill data pointers and linesize accordingly.
-+ *
-+ * This is the same as av_samples_alloc(), but also allocates the data
-+ * pointers array.
-+ *
-+ * @see av_samples_alloc()
-+ */
-+int av_samples_alloc_array_and_samples(uint8_t*** audio_data, int* linesize,
-+ int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt,
-+ int align);
-+
-+/**
-+ * Copy samples from src to dst.
-+ *
-+ * @param dst destination array of pointers to data planes
-+ * @param src source array of pointers to data planes
-+ * @param dst_offset offset in samples at which the data will be written to dst
-+ * @param src_offset offset in samples at which the data will be read from src
-+ * @param nb_samples number of samples to be copied
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_copy(uint8_t** dst, uint8_t* const* src, int dst_offset,
-+ int src_offset, int nb_samples, int nb_channels,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Fill an audio buffer with silence.
-+ *
-+ * @param audio_data array of pointers to data planes
-+ * @param offset offset in samples at which to start filling
-+ * @param nb_samples number of samples to fill
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_set_silence(uint8_t** audio_data, int offset, int nb_samples,
-+ int nb_channels, enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+#endif /* AVUTIL_SAMPLEFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-@@ -0,0 +1,118 @@
-+/*
-+ * copyright (c) 2003 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Libavutil version macros
-+ */
-+
-+#ifndef AVUTIL_VERSION_H
-+#define AVUTIL_VERSION_H
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup version_utils
-+ *
-+ * Useful to check and match library version in order to maintain
-+ * backward compatibility.
-+ *
-+ * The FFmpeg libraries follow a versioning sheme very similar to
-+ * Semantic Versioning (http://semver.org/)
-+ * The difference is that the component called PATCH is called MICRO in FFmpeg
-+ * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
-+ * Also we do not increase MICRO for every bugfix or change in git master.
-+ *
-+ * Prior to FFmpeg 3.2 point releases did not change any lib version number to
-+ * avoid aliassing different git master checkouts.
-+ * Starting with FFmpeg 3.2, the released library versions will occupy
-+ * a separate MAJOR.MINOR that is not used on the master development branch.
-+ * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
-+ * for the release and master will continue at 55.12.100 after it. Each new
-+ * point release will then bump the MICRO improving the usefulness of the lib
-+ * versions.
-+ *
-+ * @{
-+ */
-+
-+#define AV_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c))
-+#define AV_VERSION_DOT(a, b, c) a##.##b##.##c
-+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-+
-+/**
-+ * Extract version components from the full ::AV_VERSION_INT int as returned
-+ * by functions like ::avformat_version() and ::avcodec_version()
-+ */
-+#define AV_VERSION_MAJOR(a) ((a) >> 16)
-+#define AV_VERSION_MINOR(a) (((a)&0x00FF00) >> 8)
-+#define AV_VERSION_MICRO(a) ((a)&0xFF)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_ver Version and Build diagnostics
-+ *
-+ * Macros and function useful to check at compiletime and at runtime
-+ * which version of libavutil is in use.
-+ *
-+ * @{
-+ */
-+
-+#define LIBAVUTIL_VERSION_MAJOR 57
-+#define LIBAVUTIL_VERSION_MINOR 17
-+#define LIBAVUTIL_VERSION_MICRO 100
-+
-+#define LIBAVUTIL_VERSION_INT \
-+ AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_VERSION \
-+ AV_VERSION(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
-+
-+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-+
-+/**
-+ * @defgroup lavu_depr_guards Deprecation Guards
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ *
-+ * @{
-+ */
-+
-+#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -0,0 +1,36 @@
-+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-+# vim: set filetype=python:
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+UNIFIED_SOURCES += [
-+ '../FFmpegAudioDecoder.cpp',
-+ '../FFmpegDataDecoder.cpp',
-+ '../FFmpegDecoderModule.cpp',
-+ '../FFmpegVideoDecoder.cpp',
-+]
-+LOCAL_INCLUDES += [
-+ '..',
-+ '/media/mozva',
-+ 'include',
-+]
-+
-+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-+ CXXFLAGS += [ '-Wno-deprecated-declarations' ]
-+if CONFIG['CC_TYPE'] == 'clang':
-+ CXXFLAGS += [
-+ '-Wno-unknown-attributes',
-+ ]
-+if CONFIG['CC_TYPE'] == 'gcc':
-+ CXXFLAGS += [
-+ '-Wno-attributes',
-+ ]
-+if CONFIG['MOZ_WAYLAND']:
-+ CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
-+ DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-+ USE_LIBS += ['mozva']
-+
-+include("/ipc/chromium/chromium-config.mozbuild")
-+
-+FINAL_LIBRARY = 'xul'
-diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build
---- a/dom/media/platforms/ffmpeg/moz.build
-+++ b/dom/media/platforms/ffmpeg/moz.build
-@@ -14,6 +14,7 @@
- "libav55",
- "ffmpeg57",
- "ffmpeg58",
-+ "ffmpeg59",
- ]
-
- UNIFIED_SOURCES += [
-
diff --git a/D139697.diff b/D139697.diff
deleted file mode 100644
index 2b9dc32..0000000
--- a/D139697.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -29,9 +29,6 @@
- if CONFIG['MOZ_WAYLAND']:
- CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
- DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-- UNIFIED_SOURCES += [
-- '../FFmpegVideoFramePool.cpp',
-- ]
- USE_LIBS += ['mozva']
-
- include("/ipc/chromium/chromium-config.mozbuild")
-diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-@@ -41,6 +41,9 @@
- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
- DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
- USE_LIBS += ["mozva"]
-+ UNIFIED_SOURCES += [
-+ "../FFmpegVideoFramePool.cpp",
-+ ]
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-
diff --git a/D139698.diff b/D139698.diff
deleted file mode 100644
index 7bf7af9..0000000
--- a/D139698.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-@@ -64,14 +64,16 @@
- AV_FUNC_56 = 1 << 3,
- AV_FUNC_57 = 1 << 4,
- AV_FUNC_58 = 1 << 5,
-+ AV_FUNC_59 = 1 << 6,
- AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_56 = AV_FUNC_56 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_57 = AV_FUNC_57 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_58 = AV_FUNC_58 | AV_FUNC_AVUTIL_MASK,
-+ AV_FUNC_AVUTIL_59 = AV_FUNC_59 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 |
-- AV_FUNC_57 | AV_FUNC_58,
-+ AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59,
- AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK
- };
-
-@@ -94,6 +96,9 @@
- case 58:
- version = AV_FUNC_58;
- break;
-+ case 59:
-+ version = AV_FUNC_59;
-+ break;
- default:
- FFMPEG_LOG("Unknown avcodec version");
- Unlink();
-@@ -128,15 +133,19 @@
- : LinkResult::MissingLibAVFunction; \
- }
-
-- AV_FUNC(av_lockmgr_register, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(av_lockmgr_register, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_alloc_context3, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_close, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_audio4, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_video2, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_decode_audio4, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
-+ AV_FUNC(avcodec_decode_video2, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_find_decoder, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_flush_buffers, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_open2, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_register_all, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_register_all, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(av_init_packet, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_close, AV_FUNC_AVCODEC_ALL)
-@@ -145,49 +154,56 @@
- AV_FUNC(avcodec_alloc_frame, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_get_frame_defaults, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_free_frame, AV_FUNC_54)
-- AV_FUNC(avcodec_send_packet, AV_FUNC_58)
-- AV_FUNC(avcodec_receive_frame, AV_FUNC_58)
-+ AV_FUNC(avcodec_send_packet, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC(avcodec_receive_frame, AV_FUNC_58 | AV_FUNC_59)
- AV_FUNC(avcodec_default_get_buffer2,
-- (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58))
-+ (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59))
- AV_FUNC_OPTION(av_rdft_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_calc, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_end, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_freep, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC(av_frame_alloc,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_free,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_unref,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC(av_image_check_size, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_image_get_buffer_size, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC_OPTION(av_buffer_get_opaque,
-- (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_buffer_create, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC_OPTION(av_buffer_get_opaque, (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_buffer_create,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL)
- AV_FUNC_OPTION(av_frame_get_color_range, AV_FUNC_AVUTIL_ALL)
-
- #ifdef MOZ_WAYLAND
-- AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string, AV_FUNC_AVUTIL_58)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string,
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59)
- #endif
- #undef AV_FUNC
- #undef AV_FUNC_OPTION
-@@ -219,7 +235,9 @@
- # undef VAD_FUNC_OPTION_SILENT
- #endif
-
-- avcodec_register_all();
-+ if (avcodec_register_all) {
-+ avcodec_register_all();
-+ }
- if (MOZ_LOG_TEST(sPDMLog, LogLevel::Debug)) {
- av_log_set_level(AV_LOG_DEBUG);
- } else if (MOZ_LOG_TEST(sPDMLog, LogLevel::Info)) {
-diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-@@ -27,6 +27,7 @@
- static const char* sLibs[] = {
- // clang-format off
- #if defined(XP_DARWIN)
-+ "libavcodec.59.dylib",
- "libavcodec.58.dylib",
- "libavcodec.57.dylib",
- "libavcodec.56.dylib",
-@@ -34,6 +35,7 @@
- "libavcodec.54.dylib",
- "libavcodec.53.dylib",
- #else
-+ "libavcodec.so.59",
- "libavcodec.so.58",
- "libavcodec-ffmpeg.so.58",
- "libavcodec-ffmpeg.so.57",
-@@ -76,7 +78,6 @@
- sLinkStatusLibraryName = lib;
- return true;
- case FFmpegLibWrapper::LinkResult::NoProvidedLib:
-- MOZ_ASSERT_UNREACHABLE("Incorrectly-setup sLibAV");
- break;
- case FFmpegLibWrapper::LinkResult::NoAVCodecVersion:
- if (sLinkStatus > LinkStatus_INVALID_CANDIDATE) {
-@@ -152,6 +153,9 @@
- case 58:
- module = FFmpegDecoderModule<58>::Create(&sLibAV);
- break;
-+ case 59:
-+ module = FFmpegDecoderModule<59>::Create(&sLibAV);
-+ break;
- default:
- module = nullptr;
- }
-
diff --git a/D139699.diff b/D139699.diff
deleted file mode 100644
index a4be4c5..0000000
--- a/D139699.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-@@ -206,15 +206,49 @@
- media::TimeUnit pts = aSample->mTime;
-
- while (packet.size > 0) {
-- int decoded;
-- int bytesConsumed =
-+ int decoded = false;
-+ int bytesConsumed = -1;
-+#if LIBAVCODEC_VERSION_MAJOR < 59
-+ bytesConsumed =
- mLib->avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
--
- if (bytesConsumed < 0) {
- NS_WARNING("FFmpeg audio decoder error.");
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
- RESULT_DETAIL("FFmpeg audio error:%d", bytesConsumed));
- }
-+#else
-+# define AVERROR_OK 0
-+
-+ int ret = mLib->avcodec_receive_frame(mCodecContext, mFrame);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ decoded = true;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF): {
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ }
-+ }
-+ ret = mLib->avcodec_send_packet(mCodecContext, &packet);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ bytesConsumed = packet.size;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF):
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ default:
-+ NS_WARNING("FFmpeg audio decoder error.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-+ RESULT_DETAIL("FFmpeg audio error"));
-+ }
-+#endif
-
- if (decoded) {
- if (mFrame->format != AV_SAMPLE_FMT_FLT &&
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -39,6 +39,9 @@
- # define AV_PIX_FMT_YUV444P10LE PIX_FMT_YUV444P10LE
- # define AV_PIX_FMT_NONE PIX_FMT_NONE
- #endif
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+# define AV_PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI
-+#endif
- #include "mozilla/PodOperations.h"
- #include "mozilla/StaticPrefs_media.h"
- #include "mozilla/TaskQueue.h"
-@@ -766,6 +769,14 @@
- }
- #endif
-
-+static int64_t GetFramePts(AVFrame* aFrame) {
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+ return aFrame->pts;
-+#else
-+ return aFrame->pkt_pts;
-+#endif
-+}
-+
- MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- MediaRawData* aSample, uint8_t* aData, int aSize, bool* aGotFrame,
- MediaDataDecoder::DecodedData& aResults) {
-@@ -831,7 +842,7 @@
- MediaResult rv;
- # ifdef MOZ_WAYLAND_USE_VAAPI
- if (IsHardwareAccelerated()) {
-- rv = CreateImageVAAPI(mFrame->pkt_pos, mFrame->pkt_pts,
-+ rv = CreateImageVAAPI(mFrame->pkt_pos, GetFramePts(mFrame),
- mFrame->pkt_duration, aResults);
- // If VA-API playback failed, just quit. Decoder is going to be restarted
- // without VA-API.
-@@ -844,8 +855,8 @@
- } else
- # endif
- {
-- rv = CreateImage(mFrame->pkt_pos, mFrame->pkt_pts, mFrame->pkt_duration,
-- aResults);
-+ rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame),
-+ mFrame->pkt_duration, aResults);
- }
- if (NS_FAILED(rv)) {
- return rv;
-@@ -879,9 +890,9 @@
- "DoDecodeFrame:decode_video: rv=%d decoded=%d "
- "(Input: pts(%" PRId64 ") dts(%" PRId64 ") Output: pts(%" PRId64
- ") "
-- "opaque(%" PRId64 ") pkt_pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
-+ "opaque(%" PRId64 ") pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
- bytesConsumed, decoded, packet.pts, packet.dts, mFrame->pts,
-- mFrame->reordered_opaque, mFrame->pkt_pts, mFrame->pkt_dts);
-+ mFrame->reordered_opaque, mFrame->pts, mFrame->pkt_dts);
-
- if (bytesConsumed < 0) {
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-@@ -896,7 +907,8 @@
- }
-
- // If we've decoded a frame then we need to output it
-- int64_t pts = mPtsContext.GuessCorrectPts(mFrame->pkt_pts, mFrame->pkt_dts);
-+ int64_t pts =
-+ mPtsContext.GuessCorrectPts(GetFramePts(mFrame), mFrame->pkt_dts);
- // Retrieve duration from dts.
- // We use the first entry found matching this dts (this is done to
- // handle damaged file with multiple frames with the same dts)
-
diff --git a/D139703.diff b/D139703.diff
deleted file mode 100644
index 4c929fd..0000000
--- a/D139703.diff
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -10,6 +10,7 @@
-
- is_64bit = "JS_64BIT" in buildconfig.defines
- cpu_arch = buildconfig.substs["CPU_ARCH"]
-+is_gcc = buildconfig.substs["CC_TYPE"] == "gcc"
-
-
- def fmt_insn(s):
-@@ -19,21 +20,21 @@
- def gen_seqcst(fun_name):
- if cpu_arch in ("x86", "x86_64"):
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("mfence\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "aarch64":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb ish\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "arm":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb sy\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
-@@ -63,7 +64,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -91,7 +92,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -117,7 +118,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -154,7 +155,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -180,7 +181,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -204,7 +205,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -235,7 +236,7 @@
- assert size == 64
- insns += fmt_insn("xchgq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+r" (val)
- : [addr] "r" (addr)
-@@ -266,7 +267,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -297,7 +298,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -321,7 +322,7 @@
- # Use a +A constraint to load `oldval` into EDX:EAX as input/output.
- # `newval` is loaded into ECX:EBX.
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile ("lock; cmpxchg8b (%%[addr])\n\t"
-@@ -337,7 +338,7 @@
- }
- if cpu_arch == "arm" and size == 64:
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- uint32_t oldval0 = oldval & 0xffff'ffff;
-@@ -380,7 +381,7 @@
- assert size == 64
- insns += fmt_insn("lock; cmpxchgq %[newval], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile (%(insns)s
-@@ -425,7 +426,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("1: dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -466,7 +467,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("1: dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -501,7 +502,7 @@
- assert size == 64
- insns += fmt_insn("lock; xaddq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+&r" (val)
- : [addr] "r" (addr)
-@@ -539,7 +540,7 @@
- insns = insns.replace("OP", op)
- insns += fmt_insn("jnz 0b")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res, scratch;
- asm volatile (%(insns)s
- : [res] "=&a" (res), [scratch] "=&r" (scratch)
-@@ -581,7 +582,7 @@
- insns += fmt_insn("cbnz %w[scratch2], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -621,7 +622,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -681,7 +682,7 @@
- offset -= 1
-
- return """
-- inline void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
-+ INLINE_ATTR void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
- %(cpp_type)s* dst_ = reinterpret_cast<%(cpp_type)s*>(dst);
- const %(cpp_type)s* src_ = reinterpret_cast<const %(cpp_type)s*>(src);
- %(cpp_type)s scratch;
-@@ -853,6 +854,13 @@
- "constexpr size_t JS_GENERATED_ATOMICS_WORDSIZE = " + str(wordsize) + ";\n"
- )
-
-+ # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
-+ # See bug 1756347.
-+ if is_gcc and cpu_arch == "x86":
-+ contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline")
-+ else:
-+ contents = contents.replace("INLINE_ATTR", "inline")
-+
- c_out.write(
- HEADER_TEMPLATE
- % {
-
diff --git a/D139704.diff b/D139704.diff
deleted file mode 100644
index ab1ea42..0000000
--- a/D139704.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -666,12 +666,12 @@
- insns += fmt_insn("str %x[scratch], [%x[dst], OFFSET]")
- elif cpu_arch == "arm":
- if size == 1:
-- insns += fmt_insn("ldrb %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("strb %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldrb %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("strb %[scratch], [%[dst], #OFFSET]")
- else:
- assert size == 4
-- insns += fmt_insn("ldr %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("str %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldr %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("str %[scratch], [%[dst], #OFFSET]")
- else:
- raise Exception("Unexpected arch")
- insns = insns.replace("OFFSET", str(offset * size))
-
diff --git a/D142257.diff b/D142257.diff
new file mode 100644
index 0000000..5779e41
--- /dev/null
+++ b/D142257.diff
@@ -0,0 +1,313 @@
+diff -up firefox-99.0/gfx/gl/GLContextEGL.h.D142257 firefox-99.0/gfx/gl/GLContextEGL.h
+--- firefox-99.0/gfx/gl/GLContextEGL.h.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextEGL.h 2022-04-06 10:32:53.287145554 +0200
+@@ -21,11 +21,9 @@ class CompositorWidget;
+ } // namespace widget
+ namespace gl {
+
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId);
+-
+ inline std::shared_ptr<EglDisplay> DefaultEglDisplay(
+ nsACString* const out_failureId) {
+- const auto lib = DefaultEglLibrary(out_failureId);
++ const auto lib = GLLibraryEGL::Get(out_failureId);
+ if (!lib) {
+ return nullptr;
+ }
+diff -up firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 firefox-99.0/gfx/gl/GLContextProviderEGL.cpp
+--- firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextProviderEGL.cpp 2022-04-06 10:34:20.468017966 +0200
+@@ -237,7 +237,7 @@ class GLContextEGLFactory {
+ already_AddRefed<GLContext> GLContextEGLFactory::CreateImpl(
+ EGLNativeWindowType aWindow, bool aHardwareWebRender, bool aUseGles) {
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ gfxCriticalNote << "Failed[3] to load EGL library: " << failureId.get();
+ return nullptr;
+@@ -1209,32 +1209,8 @@ already_AddRefed<GLContext> GLContextPro
+ /*static*/
+ GLContext* GLContextProviderEGL::GetGlobalContext() { return nullptr; }
+
+-// -
+-
+-static StaticMutex sMutex;
+-static StaticRefPtr<GLLibraryEGL> gDefaultEglLibrary;
+-
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId) {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- gDefaultEglLibrary = GLLibraryEGL::Create(out_failureId);
+- if (!gDefaultEglLibrary) {
+- NS_WARNING("GLLibraryEGL::Create failed");
+- }
+- }
+- return gDefaultEglLibrary.get();
+-}
+-
+-// -
+-
+ /*static*/
+-void GLContextProviderEGL::Shutdown() {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- return;
+- }
+- gDefaultEglLibrary = nullptr;
+-}
++void GLContextProviderEGL::Shutdown() { GLLibraryEGL::Shutdown(); }
+
+ } /* namespace gl */
+ } /* namespace mozilla */
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.cpp
+--- firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -48,6 +48,9 @@
+ namespace mozilla {
+ namespace gl {
+
++StaticMutex GLLibraryEGL::sMutex;
++StaticRefPtr<GLLibraryEGL> GLLibraryEGL::sInstance;
++
+ // should match the order of EGLExtensions, and be null-terminated.
+ static const char* sEGLLibraryExtensionNames[] = {
+ "EGL_ANDROID_get_native_client_buffer", "EGL_ANGLE_device_creation",
+@@ -140,15 +143,17 @@ static PRLibrary* LoadLibraryForEGLOnWin
+
+ #endif // XP_WIN
+
+-static std::shared_ptr<EglDisplay> GetAndInitDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const auto display = egl.fGetDisplay(displayType);
+ if (!display) return nullptr;
+- return EglDisplay::Create(egl, display, false);
++ return EglDisplay::Create(egl, display, false, aProofOfLock);
+ }
+
+-static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const EGLAttrib attrib_list[] = {
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
+@@ -167,11 +172,12 @@ static std::shared_ptr<EglDisplay> GetAn
+ return nullptr;
+ }
+
+- return EglDisplay::Create(egl, display, true);
++ return EglDisplay::Create(egl, display, true, aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ ID3D11Device* const d3d11Device) {
++ StaticMutexAutoLock lock(sMutex);
+ EGLDeviceEXT eglDevice =
+ fCreateDeviceANGLE(LOCAL_EGL_D3D11_DEVICE_ANGLE, d3d11Device, nullptr);
+ if (!eglDevice) {
+@@ -199,7 +205,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ return nullptr;
+ }
+
+- const auto ret = EglDisplay::Create(*this, display, false);
++ const auto ret = EglDisplay::Create(*this, display, false, lock);
+
+ if (!ret) {
+ const EGLint err = fGetError();
+@@ -263,7 +269,8 @@ class AngleErrorReporting {
+ AngleErrorReporting gAngleErrorReporter;
+
+ static std::shared_ptr<EglDisplay> GetAndInitDisplayForAccelANGLE(
+- GLLibraryEGL& egl, nsACString* const out_failureId) {
++ GLLibraryEGL& egl, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ gfx::FeatureState& d3d11ANGLE =
+ gfx::gfxConfig::GetFeature(gfx::Feature::D3D11_HW_ANGLE);
+
+@@ -285,16 +292,18 @@ static std::shared_ptr<EglDisplay> GetAn
+ });
+
+ if (gfx::gfxConfig::IsForcedOnByUser(gfx::Feature::D3D11_HW_ANGLE)) {
+- return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE);
++ return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> ret;
+ if (d3d11ANGLE.IsEnabled()) {
+- ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
++ ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ if (!ret) {
+- ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ }
+
+ if (!ret && out_failureId->IsEmpty()) {
+@@ -326,12 +335,20 @@ Maybe<SymbolLoader> GLLibraryEGL::GetSym
+ // -
+
+ /* static */
+-RefPtr<GLLibraryEGL> GLLibraryEGL::Create(nsACString* const out_failureId) {
+- RefPtr<GLLibraryEGL> ret = new GLLibraryEGL;
+- if (!ret->Init(out_failureId)) {
+- return nullptr;
++RefPtr<GLLibraryEGL> GLLibraryEGL::Get(nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ if (!sInstance) {
++ sInstance = new GLLibraryEGL;
++ if (NS_WARN_IF(!sInstance->Init(out_failureId))) {
++ sInstance = nullptr;
++ }
+ }
+- return ret;
++ return sInstance;
++}
++
++/* static */ void GLLibraryEGL::Shutdown() {
++ StaticMutexAutoLock lock(sMutex);
++ sInstance = nullptr;
+ }
+
+ bool GLLibraryEGL::Init(nsACString* const out_failureId) {
+@@ -640,9 +657,9 @@ static void MarkExtensions(const char* r
+ // -
+
+ // static
+-std::shared_ptr<EglDisplay> EglDisplay::Create(GLLibraryEGL& lib,
+- const EGLDisplay display,
+- const bool isWarp) {
++std::shared_ptr<EglDisplay> EglDisplay::Create(
++ GLLibraryEGL& lib, const EGLDisplay display, const bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock) {
+ // Retrieve the EglDisplay if it already exists
+ {
+ const auto itr = lib.mActiveDisplays.find(display);
+@@ -710,6 +727,7 @@ EglDisplay::EglDisplay(const PrivateUseO
+ }
+
+ EglDisplay::~EglDisplay() {
++ StaticMutexAutoLock lock(GLLibraryEGL::sMutex);
+ fTerminate();
+ mLib->mActiveDisplays.erase(mDisplay);
+ }
+@@ -718,16 +736,24 @@ EglDisplay::~EglDisplay() {
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::DefaultDisplay(
+ nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
+ auto ret = mDefaultDisplay.lock();
+ if (ret) return ret;
+
+- ret = CreateDisplay(false, out_failureId);
++ ret = CreateDisplayLocked(false, out_failureId, lock);
+ mDefaultDisplay = ret;
+ return ret;
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ const bool forceAccel, nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ return CreateDisplayLocked(forceAccel, out_failureId, lock);
++}
++
++std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplayLocked(
++ const bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ std::shared_ptr<EglDisplay> ret;
+
+ if (IsExtensionSupported(EGLLibExtension::ANGLE_platform_angle_d3d)) {
+@@ -747,7 +773,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Hardware accelerated ANGLE path (supported or force accel)
+ if (shouldTryAccel) {
+- ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId);
++ ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId, aProofOfLock);
+ }
+
+ // Report the acceleration status to telemetry
+@@ -766,7 +792,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Fallback to a WARP display if ANGLE fails, or if WARP is forced
+ if (!ret && shouldTryWARP) {
+- ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ if (!ret) {
+ if (out_failureId->IsEmpty()) {
+ *out_failureId = "FEATURE_FAILURE_WARP_FALLBACK"_ns;
+@@ -788,7 +814,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ }
+ }
+ #endif
+- ret = GetAndInitDisplay(*this, nativeDisplay);
++ ret = GetAndInitDisplay(*this, nativeDisplay, aProofOfLock);
+ }
+
+ if (!ret) {
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.h
+--- firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.h 2022-04-06 10:32:53.288145587 +0200
+@@ -13,6 +13,8 @@
+ #include "mozilla/EnumTypeTraits.h"
+ #include "mozilla/Maybe.h"
+ #include "mozilla/RefPtr.h"
++#include "mozilla/StaticMutex.h"
++#include "mozilla/StaticPtr.h"
+ #include "nsISupports.h"
+ #include "prlink.h"
+
+@@ -125,14 +127,22 @@ class GLLibraryEGL final {
+ std::unordered_map<EGLDisplay, std::weak_ptr<EglDisplay>> mActiveDisplays;
+
+ public:
+- static RefPtr<GLLibraryEGL> Create(nsACString* const out_failureId);
++ static RefPtr<GLLibraryEGL> Get(nsACString* const out_failureId);
++ static void Shutdown();
+
+ private:
+ ~GLLibraryEGL() = default;
+
++ static StaticMutex sMutex;
++ static StaticRefPtr<GLLibraryEGL> sInstance GUARDED_BY(sMutex);
++
+ bool Init(nsACString* const out_failureId);
+ void InitLibExtensions();
+
++ std::shared_ptr<EglDisplay> CreateDisplayLocked(
++ bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock);
++
+ public:
+ Maybe<SymbolLoader> GetSymbolLoader() const;
+
+@@ -599,8 +609,9 @@ class EglDisplay final {
+ struct PrivateUseOnly final {};
+
+ public:
+- static std::shared_ptr<EglDisplay> Create(GLLibraryEGL&, EGLDisplay,
+- bool isWarp);
++ static std::shared_ptr<EglDisplay> Create(
++ GLLibraryEGL&, EGLDisplay, bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock);
+
+ // Only `public` for make_shared.
+ EglDisplay(const PrivateUseOnly&, GLLibraryEGL&, EGLDisplay, bool isWarp);
+diff -up firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 firefox-99.0/gfx/webrender_bindings/RenderThread.cpp
+--- firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 2022-03-31 01:24:51.000000000 +0200
++++ firefox-99.0/gfx/webrender_bindings/RenderThread.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -1163,7 +1163,7 @@ static already_AddRefed<gl::GLContext> C
+ }
+
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = gl::GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ aError.Assign(
+ nsPrintfCString("RcANGLE(load EGL lib failed: %s)", failureId.get()));
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
deleted file mode 100644
index 3ecdbed..0000000
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:27:07.808429721 +0200
-@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
- CreateAndStartupPDM<AppleDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled() &&
-- StaticPrefs::media_rdd_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled() &&
-+ StaticPrefs::media_rdd_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- CreateAndStartupPDM<AgnosticDecoderModule>();
- }
-
-@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
-@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
diff --git a/firefox.spec b/firefox.spec
index abb7a07..238bca8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -126,7 +126,7 @@ ExcludeArch: aarch64
%if %{?system_nss}
%global nspr_version 4.26
%global nspr_build_version %{nspr_version}
-%global nss_version 3.74
+%global nss_version 3.76
%global nss_build_version %{nss_version}
%endif
@@ -162,7 +162,7 @@ ExcludeArch: aarch64
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 98.0.2
+Version: 99.0
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -214,16 +214,8 @@ Patch49: build-arm-libaom.patch
Patch53: firefox-gcc-build.patch
Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
-Patch57: firefox-disable-ffvpx-with-vapi.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-#Patch64: mozilla-1753402.patch
-# GCC12 build fixes
-Patch65: D139022.diff
-Patch66: D139078.diff
-Patch67: D139088.diff
-Patch68: D139703.diff
-Patch69: D139704.diff
Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
@@ -250,11 +242,7 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch
-# ffmpeg50
-Patch500: D139696.diff
-Patch501: D139697.diff
-Patch502: D139698.diff
-Patch503: D139699.diff
+Patch416: D142257.diff
# PGO/LTO patches
Patch600: pgo.patch
@@ -471,14 +459,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-#%patch55 -p1 -b .testing
-%patch57 -p1 -b .ffvpx-with-vapi
-#%patch64 -p1 -b .1753402
-%patch65 -p1 -b .D139022
-%patch66 -p1 -b .D139078
-%patch67 -p1 -b .D139088
-%patch68 -p1 -b .D139703
-%patch69 -p1 -b .D139704
%ifarch aarch64
%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
%endif
@@ -505,14 +485,7 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333
-
-# ffmpeg50
-%ifnarch ppc64le
-%patch500 -p1 -b .D139696
-%patch501 -p1 -b .D139697
-%patch502 -p1 -b .D139698
-%patch503 -p1 -b .D139699
-%endif
+%patch416 -p1 -b .D142257
# PGO patches
%if %{build_with_pgo}
@@ -1079,6 +1052,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Apr 6 2022 Martin Stransky <stransky(a)redhat.com> - 99.0-1
+- Updated to 99.0
+
* Thu Mar 31 2022 Martin Stransky <stransky(a)redhat.com> - 98.0.2-1
- Updated to 98.0.2
diff --git a/mozilla-1670333.patch b/mozilla-1670333.patch
index 19e64c0..1c5c476 100644
--- a/mozilla-1670333.patch
+++ b/mozilla-1670333.patch
@@ -1,6 +1,6 @@
-diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/media/mp4/MP4Demuxer.cpp
---- firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/mp4/MP4Demuxer.cpp 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp 2022-04-04 09:58:35.606351546 +0200
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
__func__, ##__VA_ARGS__)
@@ -23,9 +23,9 @@ diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/medi
if (sample->mKeyframe != keyframe) {
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
"@ pts:%" PRId64 " dur:%" PRId64
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 2021-04-19 13:36:44.087761790 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:39:52.676433734 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.cpp 2022-04-04 10:09:57.383419125 +0200
@@ -58,6 +58,8 @@
#include <functional>
@@ -35,22 +35,16 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
namespace mozilla {
#define PDM_INIT_LOG(msg, ...) \
-@@ -572,10 +574,10 @@ void PDMFactory::CreateDefaultPDMs() {
- }
- #endif
+@@ -495,7 +497,7 @@ void PDMFactory::CreateRddPDMs() {
#ifdef MOZ_FFMPEG
-- if (StaticPrefs::media_ffmpeg_enabled() &&
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ StaticPrefs::media_rdd_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
-- FFmpegRuntimeLinker::LinkStatusCode());
-+ if (StaticPrefs::media_ffmpeg_enabled()) {
-+ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
-+ if (!mFFmpegUsed) {
-+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(FFmpegRuntimeLinker::LinkStatusCode()); }
++ !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+ FFmpegRuntimeLinker::LinkStatusCode());
}
- #endif
- #ifdef MOZ_FFVPX
-@@ -592,8 +594,9 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
CreateAndStartupPDM<AgnosticDecoderModule>();
@@ -61,9 +55,9 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
}
}
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 firefox-88.0/dom/media/platforms/PDMFactory.h
---- firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.h 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
+--- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.h 2022-04-04 09:58:35.606351546 +0200
@@ -121,6 +121,7 @@ class PDMFactory final {
RefPtr<PlatformDecoderModule> mNullPDM;
diff --git a/pgo.patch b/pgo.patch
index e7e715b..eec103c 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,7 +1,7 @@
-diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/build/moz.configure/lto-pgo.configure
---- firefox-96.0/build/moz.configure/lto-pgo.configure.pgo 2022-01-06 19:32:35.000000000 +0100
-+++ firefox-96.0/build/moz.configure/lto-pgo.configure 2022-01-11 15:43:02.193378698 +0100
-@@ -248,8 +248,8 @@ def lto(
+diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
+--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/moz.configure/lto-pgo.configure 2022-04-04 10:15:45.387694143 +0200
+@@ -247,8 +247,8 @@ def lto(
cflags.append("-flto")
ldflags.append("-flto")
else:
@@ -12,7 +12,7 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
if target.os == "Android" and value == "cross":
# Work around https://github.com/rust-lang/rust/issues/90088
-@@ -265,7 +265,7 @@ def lto(
+@@ -264,7 +264,7 @@ def lto(
if value == "full":
cflags.append("-flto")
else:
@@ -21,9 +21,9 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
# AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
cflags.append("-fuse-ld=lld")
-diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/profileserver.py
---- firefox-96.0/build/pgo/profileserver.py.pgo 2022-01-06 16:56:23.000000000 +0100
-+++ firefox-96.0/build/pgo/profileserver.py 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
+--- firefox-99.0/build/pgo/profileserver.py.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/pgo/profileserver.py 2022-04-04 10:15:45.387694143 +0200
@@ -11,7 +11,7 @@ import glob
import subprocess
@@ -70,9 +70,9 @@ diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/prof
llvm_profdata = env.get("LLVM_PROFDATA")
if llvm_profdata:
profraw_files = glob.glob("*.profraw")
-diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozconfig.unix
---- firefox-96.0/build/unix/mozconfig.unix.pgo 2022-01-06 16:56:24.000000000 +0100
-+++ firefox-96.0/build/unix/mozconfig.unix 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
+--- firefox-99.0/build/unix/mozconfig.unix.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/unix/mozconfig.unix 2022-04-04 10:15:45.387694143 +0200
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -89,18 +89,18 @@ diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozc
# We want to make sure we use binutils and other binaries in the tooltool
# package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-96.0/extensions/spellcheck/src/moz.build.pgo firefox-96.0/extensions/spellcheck/src/moz.build
---- firefox-96.0/extensions/spellcheck/src/moz.build.pgo 2022-01-11 15:43:02.193378698 +0100
-+++ firefox-96.0/extensions/spellcheck/src/moz.build 2022-01-11 15:49:52.929362701 +0100
+diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
+--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/extensions/spellcheck/src/moz.build 2022-04-04 10:15:45.387694143 +0200
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
"mozInlineSpellChecker.h",
"mozSpellChecker.h",
]
+
+CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-96.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-01-06 16:58:15.000000000 +0100
-+++ firefox-96.0/toolkit/components/terminator/nsTerminator.cpp 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-04-04 10:15:45.387694143 +0200
++++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp 2022-04-04 10:19:07.022239556 +0200
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
}
#endif
@@ -111,5 +111,5 @@ diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox
+ crashAfterMS = INT32_MAX;
+
UniquePtr<Options> options(new Options());
- const PRIntervalTime ticksDuration =
- PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
+ // crashAfterTicks is guaranteed to be > 0 as
+ // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
diff --git a/sources b/sources
index 67b7300..302967c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520
SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2
-SHA512 (firefox-98.0.2.source.tar.xz) = b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e
-SHA512 (firefox-langpacks-98.0.2-20220331.tar.xz) = eba580d5dcef421f2a4e3be62a2fdf0788328cc065ae8019062e5d524f5d49b15709892e5846b9fa63148278983c8e627ad85d8a4656502c9f6543474bb94bc6
+SHA512 (firefox-99.0.source.tar.xz) = 08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c
+SHA512 (firefox-langpacks-99.0-20220331.tar.xz) = 9ab5d8989644da67cacfe729c13309ed4f42b654b9b9113bcdb7155b59fcb12fc816de8a3fdea709c9d91f2d5b168eebec5ada6f7637e111ea374adc9eb9c984
2 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=c7aece4788...
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=35a5afbafa....
Change:
-%ifarch aarch64
-%ifnarch ppc64le
Thanks.
Full change:
============
commit c7aece478831dbb673b452b9a73c43f62a5efabc
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:55:42 2022 +0200
removed aarch64 unused patch
diff --git a/crossbeam-downgrade-rhbz2063961.patch b/crossbeam-downgrade-rhbz2063961.patch
deleted file mode 100644
index 428c3ec..0000000
--- a/crossbeam-downgrade-rhbz2063961.patch
+++ /dev/null
@@ -1,5110 +0,0 @@
-diff -up firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/Cargo.lock
---- firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 01:15:33.000000000 +0100
-+++ firefox-98.0/Cargo.lock 2022-03-16 09:35:09.020396771 +0100
-@@ -65,9 +65,9 @@ dependencies = [
-
- [[package]]
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
-+checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
-
- [[package]]
- name = "app_services_logger"
-@@ -148,9 +148,9 @@ source = "git+https://github.com/smol-rs
-
- [[package]]
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
-+checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -443,9 +443,9 @@ dependencies = [
-
- [[package]]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"
-+checksum = "9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"
- dependencies = [
- "cfg-if 1.0.0",
- ]
-@@ -482,7 +482,7 @@ version = "0.1.0"
- dependencies = [
- "bits_client",
- "comedy",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "libc",
- "log",
- "moz_task",
-@@ -493,9 +493,9 @@ dependencies = [
-
- [[package]]
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-+checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
- dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
-@@ -553,16 +553,16 @@ version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "jobserver",
- "num_cpus",
- ]
-
- [[package]]
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
-
- [[package]]
- name = "byte-tools"
-@@ -600,9 +600,9 @@ checksum = "c4872d67bab6358e59559027aa3b
-
- [[package]]
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
-
- [[package]]
- name = "cascade_bloom_filter"
-@@ -628,7 +628,7 @@ version = "0.0.1"
- dependencies = [
- "base64 0.10.1",
- "byteorder",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "log",
- "malloc_size_of_derive",
-@@ -977,12 +977,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
-+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1003,8 +1003,8 @@ source = "registry+https://github.com/ru
- checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-epoch 0.9.6",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-epoch 0.9.5",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1024,12 +1024,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
-+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "memoffset 0.6.5",
- "scopeguard",
-@@ -1067,9 +1067,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-@@ -2728,7 +2728,7 @@ name = "kvstore"
- version = "0.1.0"
- dependencies = [
- "atomic_refcell",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "lazy_static",
- "libc",
-@@ -4216,7 +4216,7 @@ checksum = "d78120e2c850279833f1dd3582f7
- dependencies = [
- "crossbeam-channel",
- "crossbeam-deque 0.8.1",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "num_cpus",
- ]
-@@ -4400,7 +4400,7 @@ dependencies = [
- "base64 0.13.0",
- "blake2b_simd",
- "constant_time_eq",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -6020,7 +6020,7 @@ dependencies = [
- name = "xulstore"
- version = "0.1.0"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "libc",
- "log",
-diff -up firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json
---- firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json 2022-03-16 09:33:31.989159760 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"ce2fb7f23073f4f0bd58bae44baab86fa6c3d3595f32d28b410ec52394b3f64c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"5a60bd1fe1717c044c7ab34c062ce6651c0cb08596a5878e391c2755ecac07f9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"330286a28b4d4da255db38bc267da17fb03f2333ea26684f82124973ffcaea43","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"f8bc5174219da947e6292891864f35307d5c400fd5690f51d574edaa5e39b8a4","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"5e3414ce23940106f95102f85e643cb5bed5e8ed9027557963c728d5f46d5586","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"a1a52f9874f0aa1382fb404f029c6fa88e53afe38fb2417877d5711f1f2b90c9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"f39d4684ce6ce473b585d2f9bc8b7a355cf28e5b5c936431d8072ac5c4fe94fd","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"382956f4bd3dcd1f6036efb8f11193595a7c60e0a5dbf5f2da149f1f25183abf","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"45331ef18c4c69acf4b80f5f55d2cefb55cc82f00e854b81d54c3df36a639003","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/Cargo.toml
---- firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/Cargo.toml 2022-03-16 09:33:31.989159760 +0100
-@@ -13,7 +13,7 @@
- edition = "2018"
- rust-version = "1.38"
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Flexible concrete Error type built on std::error::Error"
- documentation = "https://docs.rs/anyhow"
-@@ -32,7 +32,7 @@ version = "0.3"
- default-features = false
-
- [dev-dependencies.rustversion]
--version = "1.0.6"
-+version = "1.0"
-
- [dev-dependencies.syn]
- version = "1.0"
-diff -up firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/backtrace.rs
---- firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/backtrace.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -182,7 +182,7 @@ mod capture {
- impl Backtrace {
- fn enabled() -> bool {
- static ENABLED: AtomicUsize = AtomicUsize::new(0);
-- match ENABLED.load(Ordering::Relaxed) {
-+ match ENABLED.load(Ordering::SeqCst) {
- 0 => {}
- 1 => return false,
- _ => return true,
-@@ -194,7 +194,7 @@ mod capture {
- None => false,
- },
- };
-- ENABLED.store(enabled as usize + 1, Ordering::Relaxed);
-+ ENABLED.store(enabled as usize + 1, Ordering::SeqCst);
- enabled
- }
-
-diff -up firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/lib.rs
---- firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/lib.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -210,7 +210,7 @@
- //! will require an explicit `.map_err(Error::msg)` when working with a
- //! non-Anyhow error type inside a function that returns Anyhow's error type.
-
--#![doc(html_root_url = "https://docs.rs/anyhow/1.0.52")]
-+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.51")]
- #![cfg_attr(backtrace, feature(backtrace))]
- #![cfg_attr(doc_cfg, feature(doc_cfg))]
- #![cfg_attr(not(feature = "std"), no_std)]
-@@ -225,7 +225,6 @@
- clippy::needless_doctest_main,
- clippy::new_ret_no_self,
- clippy::redundant_else,
-- clippy::return_self_not_must_use,
- clippy::unused_self,
- clippy::used_underscore_binding,
- clippy::wildcard_imports,
-diff -up firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs
---- firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -2,7 +2,8 @@
-
- use std::error::Error as StdError;
- use std::fmt::{self, Display};
--use std::sync::atomic::{AtomicBool, Ordering};
-+use std::sync::atomic::AtomicBool;
-+use std::sync::atomic::Ordering::SeqCst;
- use std::sync::Arc;
-
- #[derive(Debug)]
-@@ -18,7 +19,7 @@ impl Flag {
- }
-
- pub fn get(&self) -> bool {
-- self.atomic.load(Ordering::Relaxed)
-+ self.atomic.load(SeqCst)
- }
- }
-
-@@ -47,7 +48,7 @@ impl Display for DetectDrop {
-
- impl Drop for DetectDrop {
- fn drop(&mut self) {
-- let already_dropped = self.has_dropped.atomic.swap(true, Ordering::Relaxed);
-+ let already_dropped = self.has_dropped.atomic.swap(true, SeqCst);
- assert!(!already_dropped);
- }
- }
-diff -up firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs
---- firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -5,7 +5,6 @@
- clippy::items_after_statements,
- clippy::let_and_return,
- clippy::let_underscore_drop,
-- clippy::logic_bug,
- clippy::match_bool,
- clippy::never_loop,
- clippy::redundant_closure_call,
-@@ -46,15 +45,13 @@ impl<T> Trait for T {}
- fn assert_err<T: Debug>(result: impl FnOnce() -> Result<T>, expected: &'static str) {
- let actual = result().unwrap_err().to_string();
-
-- // In general different rustc versions will format the interpolated lhs and
-- // rhs $:expr fragment with insignificant differences in whitespace or
-- // punctuation, so we check the message in full against nightly and do just
-- // a cursory test on older toolchains.
-- if rustversion::cfg!(nightly) && !cfg!(miri) {
-- assert_eq!(actual, expected);
-- } else {
-- assert_eq!(actual.contains(" vs "), expected.contains(" vs "));
-+ let mut accepted_alternatives = expected.split('\n');
-+ let expected = accepted_alternatives.next_back().unwrap();
-+ if accepted_alternatives.any(|alternative| actual == alternative) {
-+ return;
- }
-+
-+ assert_eq!(actual, expected);
- }
-
- #[test]
-@@ -101,7 +98,7 @@ fn test_low_precedence_binary_operator()
- let test = || Ok(ensure!(while false == true && false {} < ()));
- assert_err(
- test,
-- "Condition failed: `while false == true && false {} < ()` (() vs ())",
-+ "Condition failed: `while false == true && false { } < ()` (() vs ())",
- );
- }
-
-@@ -148,41 +145,41 @@ fn test_unary() {
- fn test_if() {
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {}.t(1) == 2));
-- assert_err(test, "Condition failed: `if false {}.t(1) == 2` (1 vs 2)");
-+ assert_err(test, "Condition failed: `if false { }.t(1) == 2` (1 vs 2)");
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else if false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else if false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else if false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -192,49 +189,53 @@ fn test_loop() {
- let test = || Ok(ensure!(1 + loop { break 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(1 + 'a: loop { break 'a 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while let None = Some(1) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while let None = Some(1) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while let None = Some(1) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for true | false in iter::empty() {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for true | false in iter::empty() {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for true | false in iter::empty() { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -263,13 +264,13 @@ fn test_atom() {
- let test = || Ok(ensure!(S + async { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async { 1 } == true` (false vs true)",
- );
-
- let test = || Ok(ensure!(S + async move { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async move { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async move { 1 } == true` (false vs true)",
- );
-
- let x = &1;
-@@ -380,7 +381,7 @@ fn test_macro() {
- let test = || Ok(ensure!(stringify! {} != ""));
- assert_err(
- test,
-- "Condition failed: `stringify! {} != \"\"` (\"\" vs \"\")",
-+ "Condition failed: `stringify! { } != \"\"` (\"\" vs \"\")",
- );
- }
-
-@@ -528,7 +529,7 @@ fn test_as() {
- let test = || Ok(ensure!(f as for<'a> fn() as usize * 0 != 0));
- assert_err(
- test,
-- "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)", // FIXME
-+ "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)",
- );
-
- let test = || Ok(ensure!(f as unsafe fn() as usize * 0 != 0));
-@@ -613,7 +614,7 @@ fn test_pat() {
- let test = || Ok(ensure!(if let -1..=1 = 0 { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let &0 = &0 { 0 } else { 1 } == 1));
-@@ -656,13 +657,13 @@ fn test_pat() {
- let test = || Ok(ensure!(if let P::<u8> {} = p { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let ::std::marker::PhantomData = p {} != ()));
- assert_err(
- test,
-- "Condition failed: `if let ::std::marker::PhantomData = p {} != ()` (() vs ())",
-+ "Condition failed: `if let ::std::marker::PhantomData = p { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let <S as Trait>::V = 0 { 0 } else { 1 } == 1));
-@@ -674,7 +675,7 @@ fn test_pat() {
- let test = || Ok(ensure!(for _ in iter::once(()) {} != ()));
- assert_err(
- test,
-- "Condition failed: `for _ in iter::once(()) {} != ()` (() vs ())",
-+ "Condition failed: `for _ in iter::once(()) { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let stringify!(x) = "x" { 0 } else { 1 } == 1));
-diff -up firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json
---- firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json 2022-03-16 09:33:31.990159794 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9168c83306a2940b86790578d9d72c23d70bad572bf67ad3def2c8265bd0c270","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"f1002235c33fc292e6784937c2c64d6e7ba105147b9a82126c830d09b86c1059","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"df12d6551ce0a8e3416f83fe92686ab2a22fb0a5dadb45499f531c8822c63c3e","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"1df5569f4615620172affeaa86da629623f32a0bb15f790a10c0837bd9da27e6","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"0f70f0bda0e86a43e6d6f6980f1ef8a1989c3e32db593bd60f920025a25728d5","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"21ce55872b2a6d57077ada797a5c3ae78a3d218570605a7509951b45afa212b3","tests/ui/missing-async-in-impl.rs":"5a5538d08d11c145211a92af0d8973eee8b21f33b90adda85430805bd3dbbc83","tests/ui/missing-async-in-impl.stderr":"2916bc8a51e25f4dd18eaf433b916d533943eac2c1afbee64e9a89e7b928040d","tests/ui/missing-async-in-trait.rs":"dc67241593f270233ba885df92e59164126416e68d49d8d62edc251666b5db6e","tests/ui/missing-async-in-trait.stderr":"67e66e7b19358830deff3ba01f5d701a9ae05c4e6fa9c081c49c1c75efbb7ade","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"e5ee994398bf8294324d61df02467a4229f68f4113bf5acc004851c03d66ec6a","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"cd7bf2fe9023021837b2b3e8cc164ffc18900b01cf704c68cde91edd07d65dc8","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"7865153d1e41ecdfa64b197901e3bda57bcda0c486bbcf11dc6e9837ceb40b29","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"01e6800bcabca87306c72269e38d1eac53ef1e8ad9951a9be052b97aff16364d","tests/ui/unreachable.rs":"be0aa7cc129fe42a1fbd85e36b3f08c6a2bd16c90ed2e33fc4c50e40ce085bcd","tests/ui/unreachable.stderr":"73beb71cb74076f2cb45485271de31658cf59f4143e62daa34b9f2a8980ddfcd","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"64fc5d45cb51330f0a1e85e69a28b69ddda12a109aa6a8ba3eaee1ac58d93b5f"},"package":"061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"fda2e0dc95a93f95edaa7dfdf9b7323593214c1b9e165789cd8b8e6057349ecb","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"231d1e732f295949939583df7169f49f950317679e7415ee6b5d38b8414f8b7b","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"8a60ea2181287bfd42bcc73df1d157398f202f60991ec91eb906029e3a1ae88b","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"fd6f80e2cae790f6370c537eaabedb17e9ff06c2b1f056d3d7071ed7f021f831","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"f3c32ae57ead984ac985641bd07f50a894b572d6b8b8269556cf606f34d05101","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"1e1cbcbbfded1da0a252666f2077d806d11e16fccea825c7d58805c1d88a9d58","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"636a03cc42933b59d73032ce6cea862e33c16efb9c7fe7f27749247998bc9f23","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"e6cb190e02f0226df6444065aaca3051f7db8ae599bba18a685155c52bb799b6","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"590ba1db336f57133b66b83a576afa6f96f2201147b9c90eea4bdc84b966b19c","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"63ed733b35b71f29ff0e863d287049e831dd0923978d16f5679ebd4d9d1c6d69","tests/ui/unreachable.rs":"7905c3fd0115753d18d64e12c39f42f3abec7a41b02572ea009c7d93f6d7751d","tests/ui/unreachable.stderr":"1fe3a63e44a99c62c489e1994176f03c2218bf382439bc20f1f12d368fe1558a","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"be1893e21e626f0f76d16799bf27ad12df304384245462515e1fa63f06a83d80"},"package":"44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/Cargo.toml
---- firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/Cargo.toml 2022-03-16 09:33:31.990159794 +0100
-@@ -11,9 +11,8 @@
-
- [package]
- edition = "2018"
--rust-version = "1.39"
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Type erasure for async trait methods"
- documentation = "https://docs.rs/async-trait"
-@@ -48,5 +47,5 @@ version = "0.1.14"
- version = "0.1.14"
-
- [dev-dependencies.trybuild]
--version = "1.0.49"
-+version = "1.0.19"
- features = ["diff"]
-diff -up firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/src/expand.rs
---- firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/src/expand.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -125,8 +125,6 @@ fn lint_suppress_with_body() -> Attribut
- parse_quote! {
- #[allow(
- clippy::let_unit_value,
-- clippy::no_effect_underscore_binding,
-- clippy::shadow_same,
- clippy::type_complexity,
- clippy::type_repetition_in_bounds,
- clippy::used_underscore_binding
-diff -up firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/test.rs
---- firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/test.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -6,7 +6,6 @@
- clippy::let_underscore_drop,
- clippy::let_unit_value,
- clippy::missing_panics_doc,
-- clippy::missing_safety_doc,
- clippy::needless_return,
- clippy::trivially_copy_pass_by_ref,
- clippy::unused_async
-@@ -1377,15 +1376,3 @@ pub mod issue169 {
-
- pub fn test(_t: &dyn Trait) {}
- }
--
--// https://github.com/dtolnay/async-trait/issues/183
--pub mod issue183 {
-- #![deny(clippy::shadow_same)]
--
-- use async_trait::async_trait;
--
-- #[async_trait]
-- trait Foo {
-- async fn foo(_n: i32) {}
-- }
--}
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,13 +1,13 @@
- error: trait objects without an explicit `dyn` are deprecated
-- --> tests/ui/bare-trait-object.rs:11:16
-+ --> $DIR/bare-trait-object.rs:11:16
- |
- 11 | impl Trait for Send + Sync {
- | ^^^^^^^^^^^ help: use `dyn`: `dyn Send + Sync`
- |
- note: the lint level is defined here
-- --> tests/ui/bare-trait-object.rs:1:9
-+ --> $DIR/bare-trait-object.rs:1:9
- |
- 1 | #![deny(bare_trait_objects)]
- | ^^^^^^^^^^^^^^^^^^
- = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-- = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promot...>
-+ = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:17:16
-+ --> $DIR/delimiter-span.rs:17:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-@@ -8,7 +8,7 @@ error: no rules expected the token `{`
- | ^ no rules expected this token in macro call
-
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:18:16
-+ --> $DIR/delimiter-span.rs:18:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error[E0726]: implicit elided lifetime not allowed here
-- --> tests/ui/lifetime-span.rs:12:6
-+ --> $DIR/lifetime-span.rs:12:6
- |
- 12 | impl Trait for A {
- | ^^^^^- help: indicate the anonymous lifetime: `<'_>`
-@@ -7,7 +7,7 @@ error[E0726]: implicit elided lifetime n
- = note: assuming a `'static` lifetime...
-
- error[E0107]: this trait takes 0 lifetime arguments but 1 lifetime argument was supplied
-- --> tests/ui/lifetime-span.rs:32:10
-+ --> $DIR/lifetime-span.rs:32:10
- |
- 32 | impl<'r> Trait2<'r> for B {
- | ^^^^^^---- help: remove these generics
-@@ -15,13 +15,13 @@ error[E0107]: this trait takes 0 lifetim
- | expected 0 lifetime arguments
- |
- note: trait defined here, with 0 lifetime parameters
-- --> tests/ui/lifetime-span.rs:22:11
-+ --> $DIR/lifetime-span.rs:22:11
- |
- 22 | pub trait Trait2 {
- | ^^^^^^
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:13:14
-+ --> $DIR/lifetime-span.rs:13:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -30,7 +30,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:18:14
-+ --> $DIR/lifetime-span.rs:18:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -39,7 +39,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:33:14
-+ --> $DIR/lifetime-span.rs:33:14
- |
- 23 | async fn method<'r>(&'r self);
- | ---- lifetimes in impl do not match this method in trait
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: associated function in `impl` without body
-- --> tests/ui/missing-body.rs:12:5
-+ --> $DIR/missing-body.rs:12:5
- |
- 12 | async fn f(&self);
- | ^^^^^^^^^^^^^^^^^-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,11 +1,11 @@
- error: unused return value of `Interface::f` that must be used
-- --> tests/ui/must-use.rs:18:5
-+ --> $DIR/must-use.rs:18:5
- |
- 18 | Thing.f();
- | ^^^^^^^^^^
- |
- note: the lint level is defined here
-- --> tests/ui/must-use.rs:1:9
-+ --> $DIR/must-use.rs:1:9
- |
- 1 | #![deny(unused_must_use)]
- | ^^^^^^^^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:17:21
-+ --> $DIR/self-span.rs:17:21
- |
- 17 | let _: () = self;
- | -- ^^^^ expected `()`, found struct `S`
-@@ -7,13 +7,13 @@ error[E0308]: mismatched types
- | expected due to this
-
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/self-span.rs:18:23
-+ --> $DIR/self-span.rs:18:23
- |
- 18 | let _: Self = Self;
- | ^^^^ help: use curly brackets: `Self { /* fields */ }`
-
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:25:21
-+ --> $DIR/self-span.rs:25:21
- |
- 25 | let _: () = self;
- | -- ^^^^ expected `()`, found enum `E`
-@@ -21,7 +21,7 @@ error[E0308]: mismatched types
- | expected due to this
-
- error[E0533]: expected unit struct, unit variant or constant, found struct variant `Self::V`
-- --> tests/ui/self-span.rs:26:23
-+ --> $DIR/self-span.rs:26:23
- |
- 26 | let _: Self = Self::V;
- | ^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:8:26
-+ --> $DIR/send-not-implemented.rs:8:26
- |
- 8 | async fn test(&self) {
- | __________________________^
-@@ -9,9 +9,9 @@ error: future cannot be sent between thr
- 12 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:11:9
-+ --> $DIR/send-not-implemented.rs:11:9
- |
- 10 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-@@ -22,7 +22,7 @@ note: future is not `Send` as this value
- = note: required for the cast to the object type `dyn Future<Output = ()> + Send`
-
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:14:38
-+ --> $DIR/send-not-implemented.rs:14:38
- |
- 14 | async fn test_ret(&self) -> bool {
- | ______________________________________^
-@@ -33,9 +33,9 @@ error: future cannot be sent between thr
- 19 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:17:9
-+ --> $DIR/send-not-implemented.rs:17:9
- |
- 16 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -12,8 +12,8 @@ pub trait Trait {
- #[async_trait]
- pub trait TraitFoo {
- async fn f() {
-- let _y = unimplemented!();
-- let _z = _y;
-+ let y = unimplemented!();
-+ let z = y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,13 +1,13 @@
- error: unreachable statement
-- --> tests/ui/unreachable.rs:16:9
-+ --> $DIR/unreachable.rs:16:9
- |
--15 | let _y = unimplemented!();
-- | ---------------- any code following this expression is unreachable
--16 | let _z = _y;
-- | ^^^^^^^^^^^^ unreachable statement
-+15 | let y = unimplemented!();
-+ | ---------------- any code following this expression is unreachable
-+16 | let z = y;
-+ | ^^^^^^^^^^ unreachable statement
- |
- note: the lint level is defined here
-- --> tests/ui/unreachable.rs:1:9
-+ --> $DIR/unreachable.rs:1:9
- |
- 1 | #![deny(warnings)]
- | ^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/unsupported-self.rs:11:17
-+ --> $DIR/unsupported-self.rs:11:17
- |
- 11 | let _ = Self;
- | ^^^^
-diff -up firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"28a1d4b7f04f3989f856789ec569d890a91b9dfdc8775ff8cbd4e0c1b2f8f9f2","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"250d841ee01b90209c6c4ad304969de145287c6c6588850b95e6f843ec4dd579","src/tests.rs":"5e62c77cfa155fd8affa8ff3c7ea688d80bce6f4956f9956582775ae3adca1a6"},"package":"bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"1da2771067c7bb47f182c75624cec456ef99daf6882314633a2a68aefc2616ad","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"6dcb62a9279ecad8cdcfe37f383282089753e28adc0f2785ca73d50040bc89e7","src/tests.rs":"f67d17aa8faed5e3838322de9b98bb0cdc58d35fe5870e3f5c65ef1ef788966e"},"package":"9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/Cargo.toml
---- firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -3,15 +3,16 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- authors = ["Ilkka Rauta <ilkka.rauta(a)gmail.com>"]
- description = "BitReader helps reading individual bits from a slice of bytes.\n\nYou can read \"unusual\" numbers of bits from the byte slice, for example 13 bits\nat once. The reader internally keeps track of position within the buffer.\n"
- homepage = "https://github.com/irauta/bitreader"
-diff -up firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/lib.rs
---- firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/lib.rs 2022-03-16 09:37:01.761157888 +0100
-@@ -50,7 +50,6 @@
- cfg_if::cfg_if!{
- if #[cfg(feature = "std")] {
- extern crate std;
-- use std::cmp::min;
- use std::prelude::v1::*;
- use std::fmt;
- use std::error::Error;
-@@ -58,7 +57,6 @@ cfg_if::cfg_if!{
- } else {
- use core::result;
- use core::fmt;
-- use core::cmp::min;
- }
- }
-
-@@ -71,9 +69,6 @@ pub struct BitReader<'a> {
- /// Position from the start of the slice, counted as bits instead of bytes
- position: u64,
- relative_offset: u64,
--
-- /// Length this reader is allowed to read from the slice, counted as bits instead of bytes.
-- length: u64,
- }
-
- impl<'a> BitReader<'a> {
-@@ -84,7 +79,6 @@ impl<'a> BitReader<'a> {
- bytes: bytes,
- position: 0,
- relative_offset: 0,
-- length: bytes.len() as u64 * 8,
- }
- }
-
-@@ -115,45 +109,6 @@ impl<'a> BitReader<'a> {
- bytes: self.bytes,
- position: self.position,
- relative_offset: self.position,
-- length: self.length - self.position,
-- }
-- }
--
-- /// Returns a copy of current BitReader, with the difference that its position() returns
-- /// positions relative to the position of the original BitReader at the construction time, and
-- /// will not allow reading more than len bits. After construction, both readers are otherwise
-- // completely independent, except of course for sharing the same source data.
-- ///
-- /// ```
-- /// use bitreader::BitReader;
-- /// use bitreader::BitReaderError;
-- ///
-- /// let bytes = &[0b11110000, 0b00001111];
-- /// let mut original = BitReader::new(bytes);
-- /// assert_eq!(original.read_u8(4).unwrap(), 0b1111);
-- /// assert_eq!(original.position(), 4);
-- ///
-- /// let mut relative = original.relative_reader_atmost(8);
-- /// assert_eq!(relative.position(), 0);
-- ///
-- /// assert_eq!(original.read_u8(8).unwrap(), 0);
-- /// assert_eq!(relative.read_u8(8).unwrap(), 0);
-- ///
-- /// assert_eq!(original.position(), 12);
-- /// assert_eq!(relative.position(), 8);
-- ///
-- /// assert_eq!(relative.read_u8(8).unwrap_err(), BitReaderError::NotEnoughData{
-- /// position: 8,
-- /// length: 8,
-- /// requested: 8
-- /// });
-- /// ```
-- pub fn relative_reader_atmost(&self, len: u64) -> BitReader<'a> {
-- BitReader {
-- bytes: self.bytes,
-- position: self.position,
-- relative_offset: self.position,
-- length: min(self.length - self.position, len),
- }
- }
-
-@@ -175,9 +130,9 @@ impl<'a> BitReader<'a> {
- let requested = output_bytes.len() as u64 * 8;
- if requested > self.remaining() {
- Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-- requested,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
-+ requested: requested,
- })
- } else {
- for byte in output_bytes.iter_mut() {
-@@ -266,10 +221,10 @@ impl<'a> BitReader<'a> {
- /// Skip arbitrary number of bits. However, you can skip at most to the end of the byte slice.
- pub fn skip(&mut self, bit_count: u64) -> Result<()> {
- let end_position = self.position + bit_count;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count,
- });
- }
-@@ -284,7 +239,8 @@ impl<'a> BitReader<'a> {
-
- /// Returns the number of bits not yet read from the underlying slice.
- pub fn remaining(&self) -> u64 {
-- self.length - self.position
-+ let total_bits = self.bytes.len() as u64 * 8;
-+ total_bits - self.position
- }
-
- /// Helper to make sure the "bit cursor" is exactly at the beginning of a byte, or at specific
-@@ -335,10 +291,10 @@ impl<'a> BitReader<'a> {
- }
- let start_position = self.position;
- let end_position = self.position + bit_count as u64;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count as u64,
- });
- }
-@@ -366,13 +322,8 @@ pub type Result<T> = result::Result<T, B
- pub enum BitReaderError {
- /// Requested more bits than there are left in the byte slice at the current position.
- NotEnoughData {
-- /// Current posititon in bits relative to the beginning of the reader.
- position: u64,
--
-- /// Total readable length in bits of the underlaying slice.
- length: u64,
--
-- /// Bits requested to be read.
- requested: u64,
- },
- /// Requested more bits than the returned variable can hold, for example more than 8 bits when
-diff -up firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/tests.rs
---- firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/tests.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -282,34 +282,3 @@ fn read_slice_too_much() {
- });
- assert_eq!(&output, &[0u8; 4]);
- }
--
--#[test]
--fn relative_reader() {
-- let bytes = &[
-- 0b0001_0010, 0b0011_0100,
-- ];
-- let mut reader = BitReader::new(bytes);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0001);
--
-- let mut relative_reader = reader.relative_reader();
--
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 16,
-- length: 16,
-- requested: 1
-- });
--
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(relative_reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 12,
-- length: 12,
-- requested: 1
-- });
--}
-diff -up firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json
---- firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"b79e2347297dee32b9483747ee3cf145bd60e8c9d14cc02929287dabde4685ff","README.md":"b90c7a163a0fbff29e2c049953968c8cbfe8aa616d7e36775f0a565761dcc671","src/avx2.rs":"b79f36e3a7442d241e3fdf2ec159866aea31b78883660a63cdc9b1a262f18d10","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"b0404c81988e4de8d8864437c512937d9e888c681ef4739ef2d5db1650bd8766","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"a274acd298a394c014096a8214a0dc1db7439d1e920bd2ad75707fadcc501e10","src/sse41.rs":"58e9e2ec97d266e9fb4cfa874f8cfcf5ee046911837824ceea4b99cd4007560b","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"648c10063fa1a16a961df45f194f50982bdf3d41d04586a48d2cc6d69e0252c1","README.md":"2253eba78d5af06642073c5dfd41253fb8be73d3a0e823bc3d7642c9d0ad0c6c","src/avx2.rs":"a97ec761e4e7f70ff6311f4c1e67cb5136ac66cfc51bc49525b81f9e23814d81","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"67723a3abc30dc7f3d488f434ced884b5ce962a807991c8f1cc9940df869c342","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"c47baa15b311bc95d49f3d189111fe45756fb7d623a1f48f0050ae591817aedf","src/sse41.rs":"7a644b1056b804ada9ddc7586552a4a5c769e576d610ffe7ec74065f7eaff491","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml
---- firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -13,12 +13,11 @@
- [package]
- edition = "2018"
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- authors = ["Jack O'Connor"]
- description = "a pure Rust BLAKE2b implementation with dynamic SIMD"
- documentation = "https://docs.rs/blake2b_simd"
- readme = "README.md"
--keywords = ["blake2b", "blake2bp", "blake2"]
- license = "MIT"
- repository = "https://github.com/oconnor663/blake2_simd"
- [dependencies.arrayref]
-@@ -34,4 +33,3 @@ version = "0.1.3"
- [features]
- default = ["std"]
- std = []
--uninline_portable = []
-diff -up firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/README.md
---- firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/README.md 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
-
- An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- [`blake2s_simd`](../blake2s).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -74,33 +74,32 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 32), _mm256_slli_epi64(x, 64 - 32))
-+ _mm256_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 24), _mm256_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm256_setr_epi8(
-+ 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10, 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13,
-+ 14, 15, 8, 9, 10,
-+ );
-+ _mm256_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 16), _mm256_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm256_setr_epi8(
-+ 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9, 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12,
-+ 13, 14, 15, 8, 9,
-+ );
-+ _mm256_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 63), _mm256_slli_epi64(x, 64 - 63))
-+ _mm256_or_si256(_mm256_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
- //!
- //! An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- //! [`blake2s_simd`](https://docs.rs/blake2s_simd).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -23,9 +23,7 @@ fn g(v: &mut [Word; 16], a: usize, b: us
- v[b] = (v[b] ^ v[c]).rotate_right(63);
- }
-
--// This is too much inlining for some small chips like ARM Cortex-M0, so the
--// uninline_portable feature is provided to disable it.
--#[cfg_attr(not(feature = "uninline_portable"), inline(always))]
-+#[inline(always)]
- fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
- // Select the message schedule based on the round.
- let s = SIGMA[r];
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -70,33 +70,26 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 32), _mm_slli_epi64(x, 64 - 32))
-+ _mm_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 24), _mm_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm_setr_epi8(3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10);
-+ _mm_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 16), _mm_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm_setr_epi8(2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9);
-+ _mm_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 63), _mm_slli_epi64(x, 64 - 63))
-+ _mm_or_si128(_mm_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"31820be449d15a59a3fd124c89c5c5108bd8934fbd1c11d8d31cca3f9b082aee","Cargo.toml":"9a34d33f35a8271f6fed49f54b096ed9dcf80dd899f60205cf58962529abb4b9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"9a3b4407bab9fdf0f4a2acf5c2d3876f4c78fd25f1b8159462f07343a234fc8e","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"a0dcc1b5691e4a445f35fe84be46a938515dfdca1651396b880682547ae91292","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"d8d997589a7449f14cdd21fb85583f6c94eb0d3ea2c832d3c4c570e92a0a5cdd","src/lib.rs":"835cbcfa2ac45d9d8d40a13258922419027f60c9481e2cbc1b22690edea2f481"},"package":"a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"fb807cac318c99faa6fe40bcb6ddefd867c2048b9f2badd813281ddc808191b8","Cargo.toml":"74ed9ce9af6ed0be99c388989ab7e919ca1272fdd7e8a0d223506c790a74f1d5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"84d13918b74c4175683118042305b0a4ff90333da9abf214bcf46d9b546ae319","README.tpl":"ec385000e14590a306855e7893daed0168102f33166bdc1e5cf5fa5599dac03f","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"d18d363677a97a73225cb5c5b90e6187f7b5aae93979a41e40417fdd5a3f9975","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"8f445224c914c7a4f532636798f2b6ac254e650aa58aa57bd61aee1003d7f6af","src/lib.rs":"05bee63bd4bbfcf09a31b6511b5ec3f56ea1e973d079b398ff15d77be9a13d4a"},"package":"8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/Cargo.toml
---- firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -12,7 +12,7 @@
- [package]
- edition = "2018"
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- authors = ["Nick Fitzgerald <fitzgen(a)gmail.com>"]
- exclude = ["/.github/*", "/benches", "/tests", "valgrind.supp", "bumpalo.png"]
- description = "A fast bump allocation arena for Rust."
-diff -up firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md
---- firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -28,30 +28,6 @@ Released YYYY-MM-DD.
-
- --------------------------------------------------------------------------------
-
--## 3.9.1
--
--Released 2022-01-06.
--
--### Fixed
--
--* Fixed link to logo in docs and README.md
--
----------------------------------------------------------------------------------
--
--## 3.9.0
--
--Released 2022-01-05.
--
--### Changed
--
--* The minimum supported Rust version (MSRV) has been raised to Rust 1.54.0.
--
--* `bumpalo::collections::Vec<T>` implements relevant traits for all arrays of
-- any size `N` via const generics. Previously, it was just arrays up to length
-- 32. Similar for `bumpalo::boxed::Box<[T; N]>`.
--
----------------------------------------------------------------------------------
--
- ## 3.8.0
-
- Released 2021-10-19.
-diff -up firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.md
---- firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,5 +1,6 @@
- # `bumpalo`
-
-+
- **A fast bump allocation arena for Rust.**
-
- [![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-@@ -7,7 +8,7 @@
- [![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
- [![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-
--![](https://github.com/fitzgen/bumpalo/raw/main/bumpalo.png)
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-
- ### Bump Allocation
-
-@@ -32,12 +33,11 @@ pointer back to the start of the arena's
- deallocation *extremely* fast, but allocated objects' `Drop` implementations are
- not invoked.
-
--> **However:** [`bumpalo::boxed::Box<T>`][box] can be used to wrap
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
- > `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
- > implementation when the `Box<T>` wrapper goes out of scope. This is similar to
- > how [`std::boxed::Box`] works, except without deallocating its backing memory.
-
--[box]: https://docs.rs/bumpalo/latest/bumpalo/boxed/struct.Box.html
- [`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-
- ### What happens when the memory chunk is full?
-@@ -80,22 +80,19 @@ collection types are modified to allocat
- arenas.
-
- ```rust
--#[cfg(feature = "collections")]
--{
-- use bumpalo::{Bump, collections::Vec};
--
-- // Create a new bump arena.
-- let bump = Bump::new();
--
-- // Create a vector of integers whose storage is backed by the bump arena. The
-- // vector cannot outlive its backing arena, and this property is enforced with
-- // Rust's lifetime rules.
-- let mut v = Vec::new_in(&bump);
--
-- // Push a bunch of integers onto `v`!
-- for i in 0..100 {
-- v.push(i);
-- }
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
- }
- ```
-
-@@ -117,36 +114,33 @@ can use this to work around the fact tha
- in its space itself.
-
- ```rust
--#[cfg(feature = "boxed")]
--{
-- use bumpalo::{Bump, boxed::Box};
-- use std::sync::atomic::{AtomicUsize, Ordering};
--
-- static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
--
-- struct CountDrops;
--
-- impl Drop for CountDrops {
-- fn drop(&mut self) {
-- NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-- }
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
- }
-+}
-
-- // Create a new bump arena.
-- let bump = Bump::new();
-+// Create a new bump arena.
-+let bump = Bump::new();
-
-- // Create a `CountDrops` inside the bump arena.
-- let mut c = Box::new_in(CountDrops, &bump);
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-
-- // No `CountDrops` have been dropped yet.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-
-- // Drop our `Box<CountDrops>`.
-- drop(c);
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-
-- // Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
--}
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
- ```
-
- ### `#![no_std]` Support
-@@ -180,14 +174,14 @@ bumpalo = { version = "3.4.0", features
-
- Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- ```
-
- Finally, use `std` collections with `Bump`, so that their internal heap
- allocations are made within the given bump arena:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- use bumpalo::Bump;
-
-@@ -203,8 +197,9 @@ v.push(2);
-
- #### Minimum Supported Rust Version (MSRV)
-
--This crate is guaranteed to compile on stable Rust **1.54** and up. It might
--compile with older versions but that may change in any new patch release.
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-
- We reserve the right to increment the MSRV on minor releases, however we will strive
- to only do it deliberately and for good reasons.
-+
-diff -up firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.tpl
---- firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 2022-03-16 09:33:31.992159860 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.tpl 2022-03-16 09:33:31.992159860 +0100
-@@ -0,0 +1,3 @@
-+# `{{crate}}`
-+
-+{{readme}}
-diff -up firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/boxed.rs
---- firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/boxed.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -647,25 +647,39 @@ impl<'a, F: ?Sized + Future + Unpin> Fut
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> From<Box<'a, [T; N]>> for Box<'a, [T]> {
-- fn from(mut arr: Box<'a, [T; N]>) -> Box<'a, [T]> {
-- let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), N);
-- mem::forget(arr);
-- unsafe { Box::from_raw(ptr) }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> From<Box<'a, [T; $N]>> for Box<'a, [T]> {
-+ fn from(mut arr: Box<'a, [T; $N]>) -> Box<'a, [T]> {
-+ let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), $N);
-+ mem::forget(arr);
-+ unsafe { Box::from_raw(ptr) }
-+ }
-+ }
-+
-+
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> TryFrom<Box<'a, [T]>> for Box<'a, [T; $N]> {
-+ type Error = Box<'a, [T]>;
-+ fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; $N]>, Box<'a, [T]>> {
-+ if slice.len() == $N {
-+ let ptr = slice.as_mut_ptr() as *mut [T; $N];
-+ mem::forget(slice);
-+ Ok(unsafe { Box::from_raw(ptr) })
-+ } else {
-+ Err(slice)
-+ }
-+ }
-+ }
-+ )+
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> TryFrom<Box<'a, [T]>> for Box<'a, [T; N]> {
-- type Error = Box<'a, [T]>;
-- fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; N]>, Box<'a, [T]>> {
-- if slice.len() == N {
-- let ptr = slice.as_mut_ptr() as *mut [T; N];
-- mem::forget(slice);
-- Ok(unsafe { Box::from_raw(ptr) })
-- } else {
-- Err(slice)
-- }
-- }
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
- }
-diff -up firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs
---- firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1983,23 +1983,26 @@ __impl_slice_eq1! { Vec<'a, A>, &'b [B]
- __impl_slice_eq1! { Vec<'a, A>, &'b mut [B] }
- // __impl_slice_eq1! { Cow<'a, [A]>, Vec<'b, B>, Clone }
-
--macro_rules! __impl_slice_eq1_array {
-- ($Lhs: ty, $Rhs: ty) => {
-- impl<'a, 'b, A, B, const N: usize> PartialEq<$Rhs> for $Lhs
-- where
-- A: PartialEq<B>,
-- {
-- #[inline]
-- fn eq(&self, other: &$Rhs) -> bool {
-- self[..] == other[..]
-- }
-- }
-- };
--}
--
--__impl_slice_eq1_array! { Vec<'a, A>, [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b mut [B; N] }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ // NOTE: some less important impls are omitted to reduce code bloat
-+ __impl_slice_eq1! { Vec<'a, A>, [B; $N] }
-+ __impl_slice_eq1! { Vec<'a, A>, &'b [B; $N] }
-+ // __impl_slice_eq1! { Vec<A>, &'b mut [B; $N] }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b mut [B; $N], Clone }
-+ )+
-+ }
-+}
-+
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
-+}
-
- /// Implements comparison of vectors, lexicographically.
- impl<'bump, T: 'bump + PartialOrd> PartialOrd for Vec<'bump, T> {
-@@ -2070,18 +2073,6 @@ impl<'bump, T: 'bump> BorrowMut<[T]> for
- }
- }
-
--impl<'bump, T> Drop for Vec<'bump, T> {
-- fn drop(&mut self) {
-- unsafe {
-- // use drop for [T]
-- // use a raw slice to refer to the elements of the vector as weakest necessary type;
-- // could avoid questions of validity in certain cases
-- ptr::drop_in_place(ptr::slice_from_raw_parts_mut(self.as_mut_ptr(), self.len))
-- }
-- // RawVec handles deallocation
-- }
--}
--
- ////////////////////////////////////////////////////////////////////////////////
- // Clone-on-write
- ////////////////////////////////////////////////////////////////////////////////
-diff -up firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/lib.rs
---- firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/lib.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1,4 +1,222 @@
--#![doc = include_str!("../README.md")]
-+/*!
-+
-+**A fast bump allocation arena for Rust.**
-+
-+[![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-+[![](https://img.shields.io/crates/v/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-+
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-+
-+## Bump Allocation
-+
-+Bump allocation is a fast, but limited approach to allocation. We have a chunk
-+of memory, and we maintain a pointer within that memory. Whenever we allocate an
-+object, we do a quick test that we have enough capacity left in our chunk to
-+allocate the object and then update the pointer by the object's size. *That's
-+it!*
-+
-+The disadvantage of bump allocation is that there is no general way to
-+deallocate individual objects or reclaim the memory region for a
-+no-longer-in-use object.
-+
-+These trade offs make bump allocation well-suited for *phase-oriented*
-+allocations. That is, a group of objects that will all be allocated during the
-+same program phase, used, and then can all be deallocated together as a group.
-+
-+## Deallocation en Masse, but No `Drop`
-+
-+To deallocate all the objects in the arena at once, we can simply reset the bump
-+pointer back to the start of the arena's memory chunk. This makes mass
-+deallocation *extremely* fast, but allocated objects' `Drop` implementations are
-+not invoked.
-+
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
-+> `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
-+> implementation when the `Box<T>` wrapper goes out of scope. This is similar to
-+> how [`std::boxed::Box`] works, except without deallocating its backing memory.
-+
-+[`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-+
-+## What happens when the memory chunk is full?
-+
-+This implementation will allocate a new memory chunk from the global allocator
-+and then start bump allocating into this new memory chunk.
-+
-+## Example
-+
-+```
-+use bumpalo::Bump;
-+use std::u64;
-+
-+struct Doggo {
-+ cuteness: u64,
-+ age: u8,
-+ scritches_required: bool,
-+}
-+
-+// Create a new arena to bump allocate into.
-+let bump = Bump::new();
-+
-+// Allocate values into the arena.
-+let scooter = bump.alloc(Doggo {
-+ cuteness: u64::max_value(),
-+ age: 8,
-+ scritches_required: true,
-+});
-+
-+// Exclusive, mutable references to the just-allocated value are returned.
-+assert!(scooter.scritches_required);
-+scooter.age += 1;
-+```
-+
-+## Collections
-+
-+When the `"collections"` cargo feature is enabled, a fork of some of the `std`
-+library's collections are available in the `collections` module. These
-+collection types are modified to allocate their space inside `bumpalo::Bump`
-+arenas.
-+
-+```rust
-+# #[cfg(feature = "collections")]
-+# {
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
-+}
-+# }
-+```
-+
-+Eventually [all `std` collection types will be parameterized by an
-+allocator](https://github.com/rust-lang/rust/issues/42774) and we can remove
-+this `collections` module and use the `std` versions.
-+
-+For unstable, nightly-only support for custom allocators in `std`, see the
-+`allocator_api` section below.
-+
-+## `bumpalo::boxed::Box`
-+
-+When the `"boxed"` cargo feature is enabled, a fork of `std::boxed::Box` library
-+is available in the `boxed` module. This `Box` type is modified to allocate its
-+space inside `bumpalo::Bump` arenas.
-+
-+**A `Box<T>` runs `T`'s drop implementation when the `Box<T>` is dropped.** You
-+can use this to work around the fact that `Bump` does not drop values allocated
-+in its space itself.
-+
-+```rust
-+# #[cfg(feature = "boxed")]
-+# {
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-+ }
-+}
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-+
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-+
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
-+# }
-+```
-+
-+## `#![no_std]` Support
-+
-+Bumpalo is a `no_std` crate. It depends only on the `alloc` and `core` crates.
-+
-+## Thread support
-+
-+The `Bump` is `!Sync`, which makes it hard to use in certain situations around threads ‒ for
-+example in `rayon`.
-+
-+The [`bumpalo-herd`](https://crates.io/crates/bumpalo-herd) crate provides a pool of `Bump`
-+allocators for use in such situations.
-+
-+## Nightly Rust `feature(allocator_api)` Support
-+
-+The unstable, nightly-only Rust `allocator_api` feature defines an `Allocator`
-+trait and exposes custom allocators for `std` types. Bumpalo has a matching
-+`allocator_api` cargo feature to enable implementing `Allocator` and using
-+`Bump` with `std` collections. Note that, as `feature(allocator_api)` is
-+unstable and only in nightly Rust, Bumpalo's matching `allocator_api` cargo
-+feature should be considered unstable, and will not follow the semver
-+conventions that the rest of the crate does.
-+
-+First, enable the `allocator_api` feature in your `Cargo.toml`:
-+
-+```toml
-+[dependencies]
-+bumpalo = { version = "3.4.0", features = ["allocator_api"] }
-+```
-+
-+Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-+
-+```rust
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+# }
-+```
-+
-+Finally, use `std` collections with `Bump`, so that their internal heap
-+allocations are made within the given bump arena:
-+
-+```
-+# #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+use bumpalo::Bump;
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `Vec` whose elements are allocated within the bump arena.
-+let mut v = Vec::new_in(&bump);
-+v.push(0);
-+v.push(1);
-+v.push(2);
-+# }
-+```
-+
-+### Minimum Supported Rust Version (MSRV)
-+
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-+
-+We reserve the right to increment the MSRV on minor releases, however we will strive
-+to only do it deliberately and for good reasons.
-+
-+ */
-+
- #![deny(missing_debug_implementations)]
- #![deny(missing_docs)]
- #![no_std]
-@@ -202,7 +420,7 @@ impl<E: Display> Display for AllocOrInit
- ///
- /// Even when optimizations are on, these functions do not **guarantee** that
- /// the value is constructed on the heap. To the best of our knowledge no such
--/// guarantee can be made in stable Rust as of 1.51.
-+/// guarantee can be made in stable Rust as of 1.44.
- ///
- /// ### Fallible Initialization: The `_try_with` Method Suffix
- ///
-diff -up firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json
---- firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"01efe9c9a75e5a305dac0e12676ed451f746049a825aa86acef0d8ee90742f71","Cargo.toml":"ea55c73cacac2dcc3bdcb2c657e057d9b73214e76f8654799236b13c853e97bd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"61d450a57f8699dfc1c39e3bb69236f7d10f31f4503b03aa8b2b37b2448b8b69","src/lib.rs":"4bcb45fe37cdca78ba0e403d9e531102c521ad42e9ffd2ecbb154b4509864978","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"50d6fbb00aa801cffefd2ecbbb43bba8686925658b3bf5e304b5af735f90bf08","Cargo.toml":"7ff90cd0fd3bc7449b8f55dea7de4d7d51f7c11948119512a274369733a94321","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"106c91d873d7c2681ca6264195737d7f2ea73f91cc74dd4c200f3fe9c5ea4907","src/lib.rs":"d2b1a7280c5cb8c1e946a5839862a1496749c445851f7ed196debf8386a4e646","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/Cargo.toml
---- firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -3,20 +3,23 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- authors = ["Stjepan Glavina <stjepang(a)gmail.com>"]
- description = "Prevent false sharing by padding and aligning to the length of a cache line"
--homepage = "https://github.com/smol-rs/cache-padded"
-+homepage = "https://github.com/stjepang/cache-padded"
-+documentation = "https://docs.rs/cache-padded"
-+readme = "README.md"
- keywords = ["cache", "padding", "lock-free", "atomic"]
- categories = ["concurrency", "no-std"]
- license = "Apache-2.0 OR MIT"
--repository = "https://github.com/smol-rs/cache-padded"
-+repository = "https://github.com/stjepang/cache-padded"
-diff -up firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md
---- firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,7 +1,3 @@
--# Version 1.2.0
--
--- Improve implementation of `CachePadded`.
--
- # Version 1.1.1
-
- - Forbid unsafe code.
-diff -up firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/README.md
---- firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,9 +1,9 @@
- # cache-padded
-
--[![Build](https://github.com/smol-rs/cache-padded/workflows/Build%20and%20test/badge.svg)](
--https://github.com/smol-rs/cache-padded/actions)
--[![License](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg)](
--https://github.com/smol-rs/cache-padded)
-+[![Build](https://github.com/stjepang/cache-padded/workflows/Build%20and%20test/badge.svg)](
-+https://github.com/stjepang/cache-padded/actions)
-+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
-+https://github.com/stjepang/cache-padded)
- [![Cargo](https://img.shields.io/crates/v/cache-padded.svg)](
- https://crates.io/crates/cache-padded)
- [![Documentation](https://docs.rs/cache-padded/badge.svg)](
-diff -up firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/src/lib.rs
---- firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/src/lib.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,7 @@
- //! Prevent false sharing by padding and aligning to the length of a cache line.
- //!
- //! In concurrent programming, sometimes it is desirable to make sure commonly accessed shared data
--//! is not all placed into the same cache line. Updating an atomic value invalidates the whole cache
-+//! is not all placed into the same cache line. Updating an atomic value invalides the whole cache
- //! line it belongs to, which makes the next access to the same cache line slower for other CPU
- //! cores. Use [`CachePadded`] to ensure updating one piece of data doesn't invalidate other cached
- //! data.
-@@ -10,9 +10,8 @@
- //!
- //! Cache lines are assumed to be N bytes long, depending on the architecture:
- //!
--//! * On x86-64, aarch64, and powerpc64, N = 128.
--//! * On arm, mips, mips64, and riscv64, N = 32.
--//! * On s390x, N = 256.
-+//! * On x86-64 and aarch64, N = 128.
-+//! * On all others, N = 64.
- //!
- //! Note that N is just a reasonable guess and is not guaranteed to match the actual cache line
- //! length of the machine the program is running on.
-@@ -68,63 +67,14 @@ use core::ops::{Deref, DerefMut};
- // - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-i...
- // - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73b...
- //
--// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache line size.
-+// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache lines.
- //
- // Sources:
- // - https://www.mono-project.com/news/2016/09/12/arm64-icache/
- //
--// powerpc64 has 128-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- ),
-- repr(align(128))
--)]
--// arm, mips, mips64, and riscv64 have 32-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- ),
-- repr(align(32))
--)]
--// s390x has 256-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(target_arch = "s390x", repr(align(256)))]
--// x86 and wasm have 64-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a90723...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--//
--// All others are assumed to have 64-byte cache line size.
-+#[cfg_attr(any(target_arch = "x86_64", target_arch = "aarch64"), repr(align(128)))]
- #[cfg_attr(
-- not(any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- target_arch = "s390x",
-- )),
-+ not(any(target_arch = "x86_64", target_arch = "aarch64")),
- repr(align(64))
- )]
- #[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -13,7 +13,7 @@ mod unbounded {
-
- #[bench]
- fn create(b: &mut Bencher) {
-- b.iter(unbounded::<i32>);
-+ b.iter(|| unbounded::<i32>());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json 2022-03-16 09:33:31.993159893 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"e70d1a5fa6697a8b24e193e3934975317df12279c167b90fcb9616291792197c","Cargo.lock":"0f4e59f28bdd52c4781d102fc7d1f16d1ea417aaec0a4846432444a4019b2537","Cargo.toml":"c8334f658b699a1a0e25d997d752a9493a627f9ddcb7aab739c7319ea583882f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"96cb1abd23cac3ef8a7174a802e94609926b555bb02c9658c78723d433f1dd92","examples/fibonacci.rs":"4e88fa40048cdc31e9c7bb60347d46f92543d7ddf39cab3b52bfe44affdb6a02","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"d02121258f08d56f1eb7997e19bcb9bacb6836cfa0abbba90a9e59d8a50ae5cf","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ff4d39639ddf16aaab582d4a5f3d10ef2c71afe1abbf4e60f3d9d2ddbd72c230","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"853c2ad068f912cfb49877bcd41e241f34b25026b709bf0629523f19952e3adc","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"012a53f56b86df22ce49866da95e5f457fb99a18a098f0f64779c6d1cdd7092f","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"66eb10a6cbdf8dd0869f2a7cac9992fdaee36c9e2a01d708d39d7c794572935b","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"591ee70bf62ccad5aa2fac7b92d444183b02790a79c024f016c78de2396d08a3","tests/after.rs":"0154a8e152880db17a20514ecdd49dabc361d3629858d119b9746b5e932c780c","tests/array.rs":"e5f25e8991863a9a86d61a66be646d04feae527f35b1697fd215b97af4383736","tests/golang.rs":"dc85669c9c4e902b1bb263d00f5cb6f9ecb6d42b19fe53425b55ce97c887da49","tests/iter.rs":"25dc02135bbae9d47a30f9047661648e66bdc134e40ba78bc2fbacbb8b3819bc","tests/list.rs":"de865ef097f3bcb35c1c814554e6108fed43b3dbb1533c8bbcf8688cceb6b6ab","tests/mpsc.rs":"401aa3c6923815058881ddce98070df68ebab283913c89c007436bb8af7ca0ea","tests/never.rs":"ee40c4fc4dd5af4983fae8de6927f52b81174d222c162f745b26c4a6c7108e4f","tests/ready.rs":"d349702f123925a0781b48d677e6dcf64fc5d1fc788a7bf1e151a3d57e81871c","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"d20259a45f387cbce80c2c876ae81ea3883f36ea01c5151c159d58c362f6ba07","tests/select_macro.rs":"d3af2dc98e0dd03dc4ffab464b8ccb2f8b7504e8bb830948a04c015b92f0b296","tests/thread_locals.rs":"a1ce59e2aff69161621c0cb215eb6ea238088c06a31a8507a74cf179fd5a4299","tests/tick.rs":"5f697bd14c48505d932e82065b5302ef668e1cc19cac18e8ac22e0c83c221c1d","tests/zero.rs":"afbd838001d4196daddf17133e60ccea31529cc48ee01e245ac0d6366d1e30b9"},"package":"e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"74ac49b84461217698d4430f81b1cdcba0595bc4e57216ffc52b8296ac44cd41","Cargo.lock":"7956079bcac40cc40c894f0260266365ecdb1c01c48636ae4c4080977603e7b8","Cargo.toml":"6a7acaffaa30dab2b5ea1f5ab86b20bc97370314ed03472288745b3b969786dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"f5720508d3458f2451271b9887f7557823304bd38288c928b0d6aa1f459865e5","examples/fibonacci.rs":"6a26ecd74c7493d2c93f4280c0804afc19adc612b77b3d9fea433119ff472a44","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"f9a00477b41823199e4af06bddeb0c6cfd22e272340eec1b98b333fc59ee6a1f","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ad24cabfc50dd5e6ae84aa46a0246da12da1f1a6fa19043244ad25136075c6ca","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"c125146771265058ac320226456b1e21667e93649531a3d20157f71cd715881d","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"1bda0c5483b04d53f36f9f4a6fe6f87b69f698068771e637e224c09400c6ce83","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"4eb4b1988c5dffff3e3d2138d14a1b86613bf62b78c45a5c70f65aaee92c11bb","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"9058cc441d467539c439ef88f0be1a187bf122d26fc116ce3e3a0265a693761f","tests/after.rs":"324c7d773f72bef62d150171f74ba7b7ac1b06f6030b3d4d2b1a35d211956b21","tests/array.rs":"574bff53aff0b0a8c365bf3f9ad77bb64675df9e6e0714be9c16eeeeac22e4d5","tests/golang.rs":"ec03806945fecd381cfce0634e2d776741423589c92e1bd4d8a431ac20f5d2d0","tests/iter.rs":"7563dc7fdf4c63e31dd74ee3fedecdd3aed490f7ef599b98f6f75f929cf79edb","tests/list.rs":"cc2971e69fd7f6a94b5463c9d4e9079df7955b37552e16dd66f4c6e65db60d96","tests/mpsc.rs":"0c4c6b056f5cec77ca19eca45f99b083632700a4b67133e88071a1d22a61d6fe","tests/never.rs":"665441a9fb004f7cd44047619637ebe6766cf2faf58e68e6481397bbfc682e11","tests/ready.rs":"eae3d7f16e817e63f3a6ceda062fece3de5e11c7a9631b32b02f23396a9d59c1","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"3603f450b23f5e0d1e4014a167a9b23ab149b5f418c8b89636f1c02c90501569","tests/select_macro.rs":"00dd7963f79b96abf30851fdab29e86c8424b502a8a7d34abf4bc1714f493ecf","tests/thread_locals.rs":"3611db5502e6af0a8d15187d09fd195381819795544208b946e9f99b04579a81","tests/tick.rs":"dc4a7d3c8dd888ce135fe8a8c67f5dc8b5ab0c3fa57a48459f96d51fa0f1e6d5","tests/zero.rs":"0ff0587cc74569bfe389e0c619217799a960a0dfc5e6354603c88e6eea1b79a1"},"package":"06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock 2022-03-16 09:33:31.993159893 +0100
-@@ -3,6 +3,12 @@
- version = 3
-
- [[package]]
-+name = "autocfg"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-+
-+[[package]]
- name = "cfg-if"
- version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10,7 +16,7 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- dependencies = [
- "cfg-if",
- "crossbeam-utils",
-@@ -21,19 +27,20 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
- dependencies = [
-+ "autocfg",
- "cfg-if",
- "lazy_static",
- ]
-
- [[package]]
- name = "getrandom"
--version = "0.2.3"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
- dependencies = [
- "cfg-if",
- "libc",
-@@ -42,9 +49,9 @@ dependencies = [
-
- [[package]]
- name = "hermit-abi"
--version = "0.1.19"
-+version = "0.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
- dependencies = [
- "libc",
- ]
-@@ -57,15 +64,15 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
-
- [[package]]
- name = "num_cpus"
--version = "1.13.1"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
- dependencies = [
- "hermit-abi",
- "libc",
-@@ -73,15 +80,15 @@ dependencies = [
-
- [[package]]
- name = "ppv-lite86"
--version = "0.2.16"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -91,9 +98,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -101,27 +108,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
- name = "signal-hook"
--version = "0.3.13"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
-+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
- dependencies = [
- "libc",
- "signal-hook-registry",
-@@ -129,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "signal-hook-registry"
--version = "1.4.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
- dependencies = [
- "libc",
- ]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml 2022-03-16 09:33:31.993159893 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
-+authors = ["The Crossbeam Project Developers"]
- description = "Multi-producer multi-consumer channels for message passing"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
-+documentation = "https://docs.rs/crossbeam-channel"
- keywords = ["channel", "mpmc", "select", "golang", "message"]
- categories = ["algorithms", "concurrency", "data-structures"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,3 @@
--# Version 0.5.2
--
--- Fix stacked borrows violations. (#763, #764)
--
- # Version 0.5.1
-
- - Fix memory leak in unbounded channel. (#669)
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@ fn fibonacci(sender: Sender<u64>) {
- while sender.send(x).is_ok() {
- let tmp = x;
- x = y;
-- y += tmp;
-+ y = tmp + y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -33,7 +33,11 @@ fn main() {
-
- // Prints the elapsed time.
- fn show(dur: Duration) {
-- println!("Elapsed: {}.{:03} sec", dur.as_secs(), dur.subsec_millis());
-+ println!(
-+ "Elapsed: {}.{:03} sec",
-+ dur.as_secs(),
-+ dur.subsec_nanos() / 1_000_000
-+ );
- }
-
- let start = Instant::now();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,8 +1,7 @@
- //! Thread-local context used in select.
-
- use std::cell::Cell;
--use std::ptr;
--use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
-+use std::sync::atomic::{AtomicUsize, Ordering};
- use std::sync::Arc;
- use std::thread::{self, Thread, ThreadId};
- use std::time::Instant;
-@@ -12,7 +11,6 @@ use crossbeam_utils::Backoff;
- use crate::select::Selected;
-
- /// Thread-local context used in select.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Clone)]
- pub struct Context {
- inner: Arc<Inner>,
-@@ -25,7 +23,7 @@ struct Inner {
- select: AtomicUsize,
-
- /// A slot into which another thread may store a pointer to its `Packet`.
-- packet: AtomicPtr<()>,
-+ packet: AtomicUsize,
-
- /// Thread handle.
- thread: Thread,
-@@ -47,7 +45,7 @@ impl Context {
- }
-
- let mut f = Some(f);
-- let mut f = |cx: &Context| -> R {
-+ let mut f = move |cx: &Context| -> R {
- let f = f.take().unwrap();
- f(cx)
- };
-@@ -71,7 +69,7 @@ impl Context {
- Context {
- inner: Arc::new(Inner {
- select: AtomicUsize::new(Selected::Waiting.into()),
-- packet: AtomicPtr::new(ptr::null_mut()),
-+ packet: AtomicUsize::new(0),
- thread: thread::current(),
- thread_id: thread::current().id(),
- }),
-@@ -84,7 +82,7 @@ impl Context {
- self.inner
- .select
- .store(Selected::Waiting.into(), Ordering::Release);
-- self.inner.packet.store(ptr::null_mut(), Ordering::Release);
-+ self.inner.packet.store(0, Ordering::Release);
- }
-
- /// Attempts to select an operation.
-@@ -114,19 +112,19 @@ impl Context {
- ///
- /// This method must be called after `try_select` succeeds and there is a packet to provide.
- #[inline]
-- pub fn store_packet(&self, packet: *mut ()) {
-- if !packet.is_null() {
-+ pub fn store_packet(&self, packet: usize) {
-+ if packet != 0 {
- self.inner.packet.store(packet, Ordering::Release);
- }
- }
-
- /// Waits until a packet is provided and returns it.
- #[inline]
-- pub fn wait_packet(&self) -> *mut () {
-+ pub fn wait_packet(&self) -> usize {
- let backoff = Backoff::new();
- loop {
- let packet = self.inner.packet.load(Ordering::Acquire);
-- if !packet.is_null() {
-+ if packet != 0 {
- return packet;
- }
- backoff.snooze();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@
-
- use std::cell::UnsafeCell;
- use std::marker::PhantomData;
--use std::mem::MaybeUninit;
-+use std::mem::{self, MaybeUninit};
- use std::ptr;
- use std::sync::atomic::{self, AtomicUsize, Ordering};
- use std::time::Instant;
-@@ -110,7 +110,7 @@ impl<T> Channel<T> {
- // Allocate a buffer of `cap` slots initialized
- // with stamps.
- let buffer = {
-- let boxed: Box<[Slot<T>]> = (0..cap)
-+ let mut boxed: Box<[Slot<T>]> = (0..cap)
- .map(|i| {
- // Set the stamp to `{ lap: 0, mark: 0, index: i }`.
- Slot {
-@@ -119,7 +119,9 @@ impl<T> Channel<T> {
- }
- })
- .collect();
-- Box::into_raw(boxed) as *mut Slot<T>
-+ let ptr = boxed.as_mut_ptr();
-+ mem::forget(boxed);
-+ ptr
- };
-
- Channel {
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -6,7 +6,6 @@ use std::cell::UnsafeCell;
- use std::marker::PhantomData;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::time::Instant;
--use std::{fmt, ptr};
-
- use crossbeam_utils::Backoff;
-
-@@ -17,19 +16,7 @@ use crate::utils::Spinlock;
- use crate::waker::Waker;
-
- /// A pointer to a packet.
--pub struct ZeroToken(*mut ());
--
--impl Default for ZeroToken {
-- fn default() -> Self {
-- Self(ptr::null_mut())
-- }
--}
--
--impl fmt::Debug for ZeroToken {
-- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-- fmt::Debug::fmt(&(self.0 as usize), f)
-- }
--}
-+pub(crate) type ZeroToken = usize;
-
- /// A slot for passing one message from a sender to a receiver.
- struct Packet<T> {
-@@ -130,10 +117,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -143,11 +130,11 @@ impl<T> Channel<T> {
- /// Writes a message into the packet.
- pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(msg);
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
- packet.msg.get().write(Some(msg));
- packet.ready.store(true, Ordering::Release);
- Ok(())
-@@ -159,10 +146,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -172,11 +159,11 @@ impl<T> Channel<T> {
- /// Reads a message from the packet.
- pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(());
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
-
- if packet.on_stack {
- // The message has been in the packet from the beginning, so there is no need to wait
-@@ -190,7 +177,7 @@ impl<T> Channel<T> {
- // heap-allocated packet.
- packet.wait_ready();
- let msg = packet.msg.get().replace(None).unwrap();
-- drop(Box::from_raw(token.zero.0 as *mut Packet<T>));
-+ drop(Box::from_raw(packet as *const Packet<T> as *mut Packet<T>));
- Ok(msg)
- }
- }
-@@ -202,7 +189,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -226,7 +213,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -241,10 +228,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a receiver wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::message_on_stack(msg);
-+ let packet = Packet::<T>::message_on_stack(msg);
- inner
- .senders
-- .register_with_packet(oper, &mut packet as *mut Packet<T> as *mut (), cx);
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.receivers.notify();
- drop(inner);
-
-@@ -279,7 +266,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
- } else if inner.is_disconnected {
-@@ -296,7 +283,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- return self.read(token).map_err(|_| RecvTimeoutError::Disconnected);
-@@ -310,12 +297,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a sender wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::empty_on_stack();
-- inner.receivers.register_with_packet(
-- oper,
-- &mut packet as *mut Packet<T> as *mut (),
-- cx,
-- );
-+ let packet = Packet::<T>::empty_on_stack();
-+ inner
-+ .receivers
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.senders.notify();
- drop(inner);
-
-@@ -400,7 +385,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- let mut inner = self.0.inner.lock();
- inner
- .receivers
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.senders.notify();
- inner.senders.can_select() || inner.is_disconnected
- }
-@@ -414,7 +399,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-@@ -450,7 +435,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- let mut inner = self.0.inner.lock();
- inner
- .senders
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.receivers.notify();
- inner.receivers.can_select() || inner.is_disconnected
- }
-@@ -464,7 +449,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -19,7 +19,6 @@ use crate::utils;
- /// `read` or `write`.
- ///
- /// Each field contains data associated with a specific channel flavor.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Default)]
- pub struct Token {
- pub at: flavors::at::AtToken,
-@@ -94,7 +93,6 @@ impl Into<usize> for Selected {
- ///
- /// This is a handle that assists select in executing an operation, registration, deciding on the
- /// appropriate deadline for blocking, etc.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- pub trait SelectHandle {
- /// Attempts to select an operation and returns `true` on success.
- fn try_select(&self, token: &mut Token) -> bool;
-@@ -444,7 +442,6 @@ fn run_ready(
- }
-
- /// Attempts to select one of the operations without blocking.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn try_select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -461,7 +458,6 @@ pub fn try_select<'a>(
- }
-
- /// Blocks until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -480,7 +476,6 @@ pub fn select<'a>(
- }
-
- /// Blocks for a limited time until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select_timeout<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,6 +1,5 @@
- //! Waking mechanism for threads blocked on channel operations.
-
--use std::ptr;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::thread::{self, ThreadId};
-
-@@ -14,7 +13,7 @@ pub(crate) struct Entry {
- pub(crate) oper: Operation,
-
- /// Optional packet.
-- pub(crate) packet: *mut (),
-+ pub(crate) packet: usize,
-
- /// Context associated with the thread owning this operation.
- pub(crate) cx: Context,
-@@ -45,12 +44,12 @@ impl Waker {
- /// Registers a select operation.
- #[inline]
- pub(crate) fn register(&mut self, oper: Operation, cx: &Context) {
-- self.register_with_packet(oper, ptr::null_mut(), cx);
-+ self.register_with_packet(oper, 0, cx);
- }
-
- /// Registers a select operation and a packet.
- #[inline]
-- pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: *mut (), cx: &Context) {
-+ pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
- self.selectors.push(Entry {
- oper,
- packet,
-@@ -77,26 +76,34 @@ impl Waker {
- /// Attempts to find another thread's entry, select the operation, and wake it up.
- #[inline]
- pub(crate) fn try_select(&mut self) -> Option<Entry> {
-- self.selectors
-- .iter()
-- .position(|selector| {
-+ let mut entry = None;
-+
-+ if !self.selectors.is_empty() {
-+ let thread_id = current_thread_id();
-+
-+ for i in 0..self.selectors.len() {
- // Does the entry belong to a different thread?
-- selector.cx.thread_id() != current_thread_id()
-- && selector // Try selecting this operation.
-- .cx
-- .try_select(Selected::Operation(selector.oper))
-- .is_ok()
-- && {
-+ if self.selectors[i].cx.thread_id() != thread_id {
-+ // Try selecting this operation.
-+ let sel = Selected::Operation(self.selectors[i].oper);
-+ let res = self.selectors[i].cx.try_select(sel);
-+
-+ if res.is_ok() {
- // Provide the packet.
-- selector.cx.store_packet(selector.packet);
-+ self.selectors[i].cx.store_packet(self.selectors[i].packet);
- // Wake the thread up.
-- selector.cx.unpark();
-- true
-+ self.selectors[i].cx.unpark();
-+
-+ // Remove the entry from the queue to keep it clean and improve
-+ // performance.
-+ entry = Some(self.selectors.remove(i));
-+ break;
- }
-- })
-- // Remove the entry from the queue to keep it clean and improve
-- // performance.
-- .map(|pos| self.selectors.remove(pos))
-+ }
-+ }
-+ }
-+
-+ entry
- }
-
- /// Returns `true` if there is an entry which can be selected by the current thread.
-@@ -118,7 +125,7 @@ impl Waker {
- pub(crate) fn watch(&mut self, oper: Operation, cx: &Context) {
- self.observers.push(Entry {
- oper,
-- packet: ptr::null_mut(),
-+ packet: 0,
- cx: cx.clone(),
- });
- }
-@@ -262,7 +269,7 @@ impl SyncWaker {
- impl Drop for SyncWaker {
- #[inline]
- fn drop(&mut self) {
-- debug_assert!(self.is_empty.load(Ordering::SeqCst));
-+ debug_assert_eq!(self.is_empty.load(Ordering::SeqCst), true);
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the after channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -58,20 +56,20 @@ fn len_empty_full() {
- let r = after(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -213,7 +211,7 @@ fn select() {
- break;
- }
- i => {
-- oper.recv(v[i]).unwrap();
-+ oper.recv(&v[i]).unwrap();
- hits.fetch_add(1, Ordering::SeqCst);
- }
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the array channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::any::Any;
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
-@@ -45,38 +43,38 @@ fn len_empty_full() {
- let (s, r) = bounded(2);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 2);
-- assert!(!s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 2);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -9,8 +9,6 @@
- //! - https://golang.org/LICENSE
- //! - https://golang.org/PATENTS
-
--#![allow(clippy::mutex_atomic, clippy::redundant_clone)]
--
- use std::alloc::{GlobalAlloc, Layout, System};
- use std::any::Any;
- use std::cell::Cell;
-@@ -178,7 +176,7 @@ unsafe impl GlobalAlloc for Counter {
- if !ret.is_null() {
- ALLOCATED.fetch_add(layout.size(), SeqCst);
- }
-- ret
-+ return ret;
- }
-
- unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-@@ -234,9 +232,6 @@ macro_rules! go {
- mod doubleselect {
- use super::*;
-
-- #[cfg(miri)]
-- const ITERATIONS: i32 = 100;
-- #[cfg(not(miri))]
- const ITERATIONS: i32 = 10_000;
-
- fn sender(n: i32, c1: Chan<i32>, c2: Chan<i32>, c3: Chan<i32>, c4: Chan<i32>) {
-@@ -696,11 +691,6 @@ mod select {
- mod select2 {
- use super::*;
-
-- #[cfg(miri)]
-- const N: i32 = 1000;
-- #[cfg(not(miri))]
-- const N: i32 = 100000;
--
- #[test]
- fn main() {
- fn sender(c: &Chan<i32>, n: i32) {
-@@ -712,7 +702,9 @@ mod select2 {
- fn receiver(c: &Chan<i32>, dummy: &Chan<i32>, n: i32) {
- for _ in 0..n {
- select! {
-- recv(c.rx()) -> _ => {}
-+ recv(c.rx()) -> _ => {
-+ ()
-+ }
- recv(dummy.rx()) -> _ => {
- panic!("dummy");
- }
-@@ -725,18 +717,15 @@ mod select2 {
-
- ALLOCATED.store(0, SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
- let alloc = ALLOCATED.load(SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
-- assert!(
-- !(ALLOCATED.load(SeqCst) > alloc
-- && (ALLOCATED.load(SeqCst) - alloc) > (N as usize + 10000))
-- )
-+ assert!(!(ALLOCATED.load(SeqCst) > alloc && (ALLOCATED.load(SeqCst) - alloc) > 110000))
- }
- }
-
-@@ -924,9 +913,6 @@ mod chan_test {
-
- #[test]
- fn test_chan() {
-- #[cfg(miri)]
-- const N: i32 = 20;
-- #[cfg(not(miri))]
- const N: i32 = 200;
-
- for cap in 0..N {
-@@ -1066,9 +1052,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_recv_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- for _ in 0..N {
-@@ -1090,9 +1073,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1126,9 +1106,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race2() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1165,11 +1142,6 @@ mod chan_test {
- // Ensure that send/recv on the same chan in select
- // does not crash nor deadlock.
-
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 1000;
--
- for &cap in &[0, 10] {
- let wg = WaitGroup::new();
- wg.add(2);
-@@ -1179,7 +1151,7 @@ mod chan_test {
- let p = p;
- go!(wg, p, c, {
- defer! { wg.done() }
-- for i in 0..N {
-+ for i in 0..1000 {
- if p == 0 || i % 2 == 0 {
- select! {
- send(c.tx(), p) -> _ => {}
-@@ -1208,11 +1180,6 @@ mod chan_test {
-
- #[test]
- fn test_select_stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let c = vec![
- make::<i32>(0),
- make::<i32>(0),
-@@ -1220,6 +1187,8 @@ mod chan_test {
- make::<i32>(3),
- ];
-
-+ const N: usize = 10000;
-+
- // There are 4 goroutines that send N values on each of the chans,
- // + 4 goroutines that receive N values on each of the chans,
- // + 1 goroutine that sends N values on each of the chans in a single select,
-@@ -1317,9 +1286,6 @@ mod chan_test {
-
- #[test]
- fn test_select_fairness() {
-- #[cfg(miri)]
-- const TRIALS: usize = 100;
-- #[cfg(not(miri))]
- const TRIALS: usize = 10000;
-
- let c1 = make::<u8>(TRIALS + 1);
-@@ -1403,9 +1369,6 @@ mod chan_test {
-
- #[test]
- fn test_pseudo_random_send() {
-- #[cfg(miri)]
-- const N: usize = 20;
-- #[cfg(not(miri))]
- const N: usize = 100;
-
- for cap in 0..N {
-@@ -1449,9 +1412,6 @@ mod chan_test {
- #[test]
- fn test_multi_consumer() {
- const NWORK: usize = 23;
-- #[cfg(miri)]
-- const NITER: usize = 100;
-- #[cfg(not(miri))]
- const NITER: usize = 271828;
-
- let pn = [2, 3, 7, 11, 13, 17, 19, 23, 27, 31];
-@@ -1550,9 +1510,6 @@ mod chan1 {
- use super::*;
-
- // sent messages
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
- // receiving "goroutines"
- const M: usize = 10;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -93,7 +93,7 @@ fn recv_into_iter_owned() {
-
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -106,5 +106,5 @@ fn recv_into_iter_borrowed() {
- let mut iter = (&r).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -41,29 +41,29 @@ fn len_empty_full() {
- let (s, r) = unbounded();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -239,9 +239,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = unbounded();
-@@ -264,9 +261,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -301,9 +295,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -319,9 +310,6 @@ fn stress_oneshot() {
-
- #[test]
- fn stress_iter() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (request_s, request_r) = unbounded();
-@@ -383,11 +371,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -401,7 +386,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..10_000);
- let additional = rng.gen_range(0..1000);
-
-@@ -436,9 +421,6 @@ fn drops() {
-
- #[test]
- fn linearizable() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -459,9 +441,6 @@ fn linearizable() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -484,9 +463,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = unbounded();
-@@ -520,9 +496,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -20,12 +20,6 @@
- //! - https://github.com/rust-lang/rust/blob/master/COPYRIGHT
- //! - https://www.rust-lang.org/en-US/legal.html
-
--#![allow(
-- clippy::drop_copy,
-- clippy::match_single_binding,
-- clippy::redundant_clone
--)]
--
- use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
- use std::sync::mpsc::{SendError, TrySendError};
- use std::thread::JoinHandle;
-@@ -182,7 +176,7 @@ macro_rules! select {
- ) => ({
- cc::crossbeam_channel_internal! {
- $(
-- $meth(($rx).inner) -> res => {
-+ recv(($rx).inner) -> res => {
- let $name = res.map_err(|_| ::std::sync::mpsc::RecvError);
- $code
- }
-@@ -320,18 +314,13 @@ mod channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
-- const COUNT: usize = 10000;
--
- let (tx, rx) = channel::<i32>();
- let t = thread::spawn(move || {
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().ok().unwrap();
-@@ -339,9 +328,6 @@ mod channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 500;
-- #[cfg(not(miri))]
- const AMT: u32 = 10000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = channel::<i32>();
-@@ -350,7 +336,10 @@ mod channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- });
-
- let mut ts = Vec::with_capacity(NTHREADS as usize);
-@@ -746,17 +735,12 @@ mod channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
- let (tx, rx) = channel();
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -896,7 +880,7 @@ mod channel_tests {
- };
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -908,7 +892,7 @@ mod channel_tests {
- let mut iter = (&rx).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -1095,18 +1079,13 @@ mod sync_channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..N {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().unwrap();
-@@ -1114,15 +1093,10 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_recv_timeout_two_threads() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
-
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-@@ -1139,15 +1113,12 @@ mod sync_channel_tests {
- }
- }
-
-- assert_eq!(recv_count, N);
-+ assert_eq!(recv_count, 10000);
- t.join().unwrap();
- }
-
- #[test]
- fn stress_recv_timeout_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1194,9 +1165,6 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1206,7 +1174,10 @@ mod sync_channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- dtx.send(()).unwrap();
- });
-
-@@ -1478,17 +1449,12 @@ mod sync_channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
-- let (tx, rx) = sync_channel(N);
-- for _ in 0..N {
-+ let (tx, rx) = sync_channel(10000);
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -1826,11 +1792,7 @@ mod select_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const AMT: i32 = 100;
-- #[cfg(not(miri))]
- const AMT: i32 = 10000;
--
- let (tx1, rx1) = channel::<i32>();
- let (tx2, rx2) = channel::<i32>();
- let (tx3, rx3) = channel::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -65,8 +65,8 @@ fn capacity() {
- fn len_empty_full() {
- let r = never::<i32>();
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel readiness using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -492,9 +490,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -532,9 +527,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -569,9 +561,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -677,9 +666,6 @@ fn send_recv_same_channel() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -736,9 +722,6 @@ fn channel_through_channel() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -784,9 +767,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s1, r1) = unbounded::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,6 @@
- //! Tests for the `select!` macro.
-
- #![forbid(unsafe_code)] // select! is safe.
--#![allow(clippy::drop_copy, clippy::match_single_binding)]
-
- use std::any::Any;
- use std::cell::Cell;
-@@ -284,7 +283,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -487,9 +485,6 @@ fn panic_receiver() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -523,9 +518,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -556,9 +548,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -692,9 +681,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -740,9 +726,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_default() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -787,9 +770,6 @@ fn linearizable_default() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -834,9 +814,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -861,9 +838,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -901,9 +875,6 @@ fn fairness2() {
-
- #[test]
- fn fairness_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -926,9 +897,6 @@ fn fairness_recv() {
-
- #[test]
- fn fairness_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, _r1) = bounded::<()>(COUNT);
-@@ -944,7 +912,6 @@ fn fairness_send() {
- assert!(hits.iter().all(|x| *x >= COUNT / 4));
- }
-
--#[allow(clippy::or_fun_call)] // This is intentional.
- #[test]
- fn references() {
- let (s, r) = unbounded::<i32>();
-@@ -991,7 +958,6 @@ fn case_blocks() {
- drop(s);
- }
-
--#[allow(clippy::redundant_closure_call)] // This is intentional.
- #[test]
- fn move_handles() {
- let (s, r) = unbounded::<i32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel selection using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -408,7 +406,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -693,9 +690,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -734,9 +728,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -772,9 +763,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -907,12 +895,12 @@ fn matching() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -933,12 +921,12 @@ fn matching_with_leftover() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -952,9 +940,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -1013,9 +998,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_try() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1068,9 +1050,6 @@ fn linearizable_try() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1123,9 +1102,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -1172,9 +1148,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -1239,8 +1212,8 @@ fn sync_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let sel = &sel;
-
- scope(|scope| {
-@@ -1249,8 +1222,8 @@ fn sync_and_clone() {
- let mut sel = sel.clone();
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1268,8 +1241,8 @@ fn send_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
-
- scope(|scope| {
- for i in 0..THREADS {
-@@ -1277,8 +1250,8 @@ fn send_and_clone() {
- scope.spawn(move |_| {
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1291,9 +1264,6 @@ fn send_and_clone() {
-
- #[test]
- fn reuse() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests that make sure accessing thread-locals while exiting the thread doesn't cause panics.
-
--#![cfg(not(miri))] // error: abnormal termination: the evaluated program aborted execution
--
- use std::thread;
- use std::time::Duration;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the tick channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -80,20 +78,20 @@ fn len_empty_full() {
- let r = tick(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -35,11 +35,11 @@ fn len_empty_full() {
- let (s, r) = bounded(0);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
-
- scope(|scope| {
- scope.spawn(|_| s.send(0).unwrap());
-@@ -48,11 +48,11 @@ fn len_empty_full() {
- .unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-@@ -187,9 +187,6 @@ fn send_timeout() {
-
- #[test]
- fn len() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
-
- let (s, r) = bounded(0);
-@@ -252,9 +249,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = bounded(0);
-@@ -277,9 +271,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -312,9 +303,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -328,7 +316,6 @@ fn stress_oneshot() {
- }
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn stress_iter() {
- const COUNT: usize = 1000;
-@@ -396,11 +383,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -414,7 +398,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..3_000);
-
- DROPS.store(0, Ordering::SeqCst);
-@@ -444,9 +428,6 @@ fn drops() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(0);
-@@ -478,9 +459,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = bounded::<()>(0);
-@@ -539,9 +517,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -8,7 +8,7 @@ use test::Bencher;
-
- #[bench]
- fn single_pin(b: &mut Bencher) {
-- b.iter(epoch::pin);
-+ b.iter(|| epoch::pin());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/build.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/build.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -4,19 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json 2022-03-16 09:33:31.995159961 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"40b65a13f12e97a24c838fe2254a3563a5fe00922053ef7256ed4752876614fa","Cargo.lock":"35b1db42b892c01e72ff1f99fc7767e5e47208d083203866337f6f2f7d0738eb","Cargo.toml":"eab75399db818408fd4f45a91919b08e050e56547014816683a269270e292055","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"80f9e65ba04a2ddec7a330172d0b0fbc698e20c221b3d8cdc70cc42e3b9099d1","build.rs":"c8684300062c73e96eae8877d03e145ee95e0cd99d4d933696caa582c08e2416","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic.rs":"631d3062e3c30d8e505fda3a7e2c68a88abf7617881035d6131c39cb8fdddce0","src/collector.rs":"7d636f3f96fafd033298d1c2ab126205438a46deb84895d8e28bea9eef67798a","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"1ee67bd3200d3891076aac8cfc9767abdddc194602f2084d11455484096005ea","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"f3f8131819b2a4ec4d1a6d392c734688324f3ae708bac6745e88f2930657eba1","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"262e0d8f343e97df9e2a738461e4255e339710e81c479e484f9efe517ae47135","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock 2022-03-16 09:33:31.995159961 +0100
-@@ -3,15 +3,6 @@
- version = 3
-
- [[package]]
--name = "ansi_term"
--version = "0.12.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
--dependencies = [
-- "winapi",
--]
--
--[[package]]
- name = "autocfg"
- version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -19,9 +10,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffe
-
- [[package]]
- name = "cc"
--version = "1.0.72"
-+version = "1.0.68"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
-
- [[package]]
- name = "cfg-if"
-@@ -31,13 +22,13 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "const_fn"
--version = "0.4.9"
-+version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- dependencies = [
- "cfg-if",
- "const_fn",
-@@ -51,9 +42,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if",
- "lazy_static",
-@@ -92,9 +83,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.95"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-
- [[package]]
- name = "log"
-@@ -107,76 +98,35 @@ dependencies = [
-
- [[package]]
- name = "loom"
--version = "0.5.4"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
-+checksum = "7aa5348dc45fa5f2419b6dd4ea20345e6b01b1fcc9d176a322eada1ac3f382ba"
- dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
-- "tracing",
-- "tracing-subscriber",
--]
--
--[[package]]
--name = "matchers"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
--dependencies = [
-- "regex-automata",
- ]
-
- [[package]]
- name = "memoffset"
--version = "0.6.5"
-+version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
- dependencies = [
- "autocfg",
- ]
-
- [[package]]
--name = "once_cell"
--version = "1.9.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
--
--[[package]]
--name = "pin-project-lite"
--version = "0.2.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
--
--[[package]]
- name = "ppv-lite86"
--version = "0.2.16"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
--
--[[package]]
--name = "proc-macro2"
--version = "1.0.36"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
--dependencies = [
-- "unicode-xid",
--]
--
--[[package]]
--name = "quote"
--version = "1.0.14"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
--dependencies = [
-- "proc-macro2",
--]
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -186,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -196,51 +146,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
--name = "regex"
--version = "1.5.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-automata"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-syntax"
--version = "0.6.25"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
--
--[[package]]
- name = "rustversion"
--version = "1.0.6"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-+checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
-
- [[package]]
- name = "scoped-tls"
-@@ -255,108 +181,6 @@ source = "registry+https://github.com/ru
- checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
- [[package]]
--name = "sharded-slab"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "smallvec"
--version = "1.7.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
--
--[[package]]
--name = "syn"
--version = "1.0.85"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "unicode-xid",
--]
--
--[[package]]
--name = "thread_local"
--version = "1.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
--dependencies = [
-- "once_cell",
--]
--
--[[package]]
--name = "tracing"
--version = "0.1.29"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
--dependencies = [
-- "cfg-if",
-- "pin-project-lite",
-- "tracing-attributes",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-attributes"
--version = "0.1.18"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn",
--]
--
--[[package]]
--name = "tracing-core"
--version = "0.1.21"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "tracing-log"
--version = "0.1.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
--dependencies = [
-- "lazy_static",
-- "log",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-subscriber"
--version = "0.3.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
--dependencies = [
-- "ansi_term",
-- "lazy_static",
-- "matchers",
-- "regex",
-- "sharded-slab",
-- "smallvec",
-- "thread_local",
-- "tracing",
-- "tracing-core",
-- "tracing-log",
--]
--
--[[package]]
--name = "unicode-xid"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
--
--[[package]]
- name = "wasi"
- version = "0.10.2+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml 2022-03-16 09:33:31.995159961 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Epoch-based garbage collection"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch"
-+documentation = "https://docs.rs/crossbeam-epoch"
- keywords = ["lock-free", "rcu", "atomic", "garbage"]
- categories = ["concurrency", "memory-management", "no-std"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md 2022-03-16 09:33:31.995159961 +0100
-@@ -1,16 +1,12 @@
--# Version 0.9.6
--
--- Add `Atomic::fetch_update`. (#706)
--
- # Version 0.9.5
-
--- Fix UB in `Pointable` impl of `[MaybeUninit<T>]`. (#694)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
--- Fix breakage with nightly feature due to rust-lang/rust#84510. (#692)
-+- Fix UB in `Pointable` impl of `[MaybeUninit<T>]` (#694)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-+- Fix breakage with nightly feature due to rust-lang/rust#84510 (#692)
-
- # Version 0.9.4
-
--- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation. (#690)
-+- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation (#690)
- - Bump `loom` dependency to version 0.5. (#686)
-
- # Version 0.9.3
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -562,65 +562,6 @@ impl<T: ?Sized + Pointable> Atomic<T> {
- })
- }
-
-- /// Fetches the pointer, and then applies a function to it that returns a new value.
-- /// Returns a `Result` of `Ok(previous_value)` if the function returned `Some`, else `Err(_)`.
-- ///
-- /// Note that the given function may be called multiple times if the value has been changed by
-- /// other threads in the meantime, as long as the function returns `Some(_)`, but the function
-- /// will have been applied only once to the stored value.
-- ///
-- /// `fetch_update` takes two [`Ordering`] arguments to describe the memory
-- /// ordering of this operation. The first describes the required ordering for
-- /// when the operation finally succeeds while the second describes the
-- /// required ordering for loads. These correspond to the success and failure
-- /// orderings of [`Atomic::compare_exchange`] respectively.
-- ///
-- /// Using [`Acquire`] as success ordering makes the store part of this
-- /// operation [`Relaxed`], and using [`Release`] makes the final successful
-- /// load [`Relaxed`]. The (failed) load ordering can only be [`SeqCst`],
-- /// [`Acquire`] or [`Relaxed`] and must be equivalent to or weaker than the
-- /// success ordering.
-- ///
-- /// [`Relaxed`]: Ordering::Relaxed
-- /// [`Acquire`]: Ordering::Acquire
-- /// [`Release`]: Ordering::Release
-- /// [`SeqCst`]: Ordering::SeqCst
-- ///
-- /// # Examples
-- ///
-- /// ```
-- /// use crossbeam_epoch::{self as epoch, Atomic};
-- /// use std::sync::atomic::Ordering::SeqCst;
-- ///
-- /// let a = Atomic::new(1234);
-- /// let guard = &epoch::pin();
-- ///
-- /// let res1 = a.fetch_update(SeqCst, SeqCst, guard, |x| Some(x.with_tag(1)));
-- /// assert!(res1.is_ok());
-- ///
-- /// let res2 = a.fetch_update(SeqCst, SeqCst, guard, |x| None);
-- /// assert!(res2.is_err());
-- /// ```
-- pub fn fetch_update<'g, F>(
-- &self,
-- set_order: Ordering,
-- fail_order: Ordering,
-- guard: &'g Guard,
-- mut func: F,
-- ) -> Result<Shared<'g, T>, Shared<'g, T>>
-- where
-- F: FnMut(Shared<'g, T>) -> Option<Shared<'g, T>>,
-- {
-- let mut prev = self.load(fail_order, guard);
-- while let Some(next) = func(prev) {
-- match self.compare_exchange_weak(prev, next, set_order, fail_order, guard) {
-- Ok(shared) => return Ok(shared),
-- Err(next_prev) => prev = next_prev.current,
-- }
-- }
-- Err(prev)
-- }
--
- /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
- /// value is the same as `current`. The tag is also taken into account, so two pointers to the
- /// same object, but with different tags, will not be considered equal.
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -178,18 +178,13 @@ mod tests {
-
- #[test]
- fn pin_holds_advance() {
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 500_000;
--
- let collector = Collector::new();
-
- thread::scope(|scope| {
- for _ in 0..NUM_THREADS {
- scope.spawn(|_| {
- let handle = collector.register();
-- for _ in 0..N {
-+ for _ in 0..500_000 {
- let guard = &handle.pin();
-
- let before = collector.global.epoch.load(Ordering::Relaxed);
-@@ -207,9 +202,6 @@ mod tests {
- #[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to `cfg(crossbeam_sanitize)` reduce `internal::MAX_OBJECTS`
- #[test]
- fn incremental() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -238,16 +230,12 @@ mod tests {
- let guard = &handle.pin();
- collector.global.collect(guard);
- }
-- assert!(DESTROYS.load(Ordering::Relaxed) == COUNT);
-+ assert!(DESTROYS.load(Ordering::Relaxed) == 100_000);
- }
-
- #[test]
- fn buffering() {
- const COUNT: usize = 10;
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
- let collector = Collector::new();
-@@ -264,7 +252,7 @@ mod tests {
- }
- }
-
-- for _ in 0..N {
-+ for _ in 0..100_000 {
- collector.global.collect(&handle.pin());
- }
- assert!(DESTROYS.load(Ordering::Relaxed) < COUNT);
-@@ -280,9 +268,6 @@ mod tests {
-
- #[test]
- fn count_drops() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -316,9 +301,6 @@ mod tests {
-
- #[test]
- fn count_destroy() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -385,9 +367,6 @@ mod tests {
-
- #[test]
- fn destroy_array() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -423,9 +402,6 @@ mod tests {
- #[test]
- fn stress() {
- const THREADS: usize = 8;
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -81,8 +81,6 @@ impl Deferred {
-
- #[cfg(all(test, not(crossbeam_loom)))]
- mod tests {
-- #![allow(clippy::drop_copy)]
--
- use super::Deferred;
- use std::cell::Cell;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -101,7 +101,7 @@ impl Bag {
-
- /// Seals the bag with the given epoch.
- fn seal(self, epoch: Epoch) -> SealedBag {
-- SealedBag { epoch, _bag: self }
-+ SealedBag { epoch, bag: self }
- }
- }
-
-@@ -216,7 +216,7 @@ fn no_op_func() {}
- #[derive(Default, Debug)]
- struct SealedBag {
- epoch: Epoch,
-- _bag: Bag,
-+ bag: Bag,
- }
-
- /// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.
-@@ -311,7 +311,7 @@ impl Global {
- // TODO(stjepang): `Local`s are stored in a linked list because linked lists are fairly
- // easy to implement in a lock-free manner. However, traversal can be slow due to cache
- // misses and data dependencies. We should experiment with other data structures as well.
-- for local in self.locals.iter(guard) {
-+ for local in self.locals.iter(&guard) {
- match local {
- Err(IterError::Stalled) => {
- // A concurrent thread stalled this iteration. That thread might also try to
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -259,9 +259,6 @@ mod test {
- }
- }
-
-- #[cfg(miri)]
-- const CONC_COUNT: i64 = 1000;
-- #[cfg(not(miri))]
- const CONC_COUNT: i64 = 1000000;
-
- #[test]
-@@ -425,8 +422,8 @@ mod test {
-
- let mut vl2 = vl.clone();
- let mut vr2 = vr.clone();
-- vl2.sort_unstable();
-- vr2.sort_unstable();
-+ vl2.sort();
-+ vr2.sort();
-
- assert_eq!(vl, vl2);
- assert_eq!(vr, vr2);
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/build.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/build.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -4,31 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic`
--// Assume the target does *not* support any atomic operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic_64`
--// Assume the target does *not* support AtomicU64/AtomicI64.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json 2022-03-16 09:33:31.996159993 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"097eb3484f4f13471dfe6879ce61450cc60d4453aecb924f38a8f0e4af593cdd","Cargo.toml":"2734493ab832f12a4f849c333d2dd11760c6ce614b88355da21118f77acdcd70","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"39cf39e855e52559c8f68880a02b3e2778ae2d8f089650af1b3e34a85898aed7","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic/atomic_cell.rs":"9d0785073f506b75c110270947f6a8367ead7faaf29c507d4ede37125310cff6","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"ba2e34ed1e27f0d0d4f1bb8a5feb4eb8131f756adb27a719de52c26ee7b86b9c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml 2022-03-16 09:33:31.996159993 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Utilities for concurrent programming"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
-+documentation = "https://docs.rs/crossbeam-utils"
- keywords = ["scoped", "thread", "atomic", "cache"]
- categories = ["algorithms", "concurrency", "data-structures", "no-std"]
- license = "MIT OR Apache-2.0"
-@@ -29,9 +31,6 @@ optional = true
- [dev-dependencies.rand]
- version = "0.8"
-
--[dev-dependencies.rustversion]
--version = "1"
--
- [features]
- default = ["std"]
- nightly = []
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md 2022-03-16 09:33:31.996159993 +0100
-@@ -1,12 +1,7 @@
--# Version 0.8.6
--
--- Re-add `AtomicCell<{i,u}64>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0 on targets that do not support `Atomic{I,U}64`. (#767)
--- Re-add `AtomicCell<{i,u}128>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0. (#767)
--
- # Version 0.8.5
-
--- Add `AtomicCell::fetch_update`. (#704)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
-+- Add `AtomicCell::fetch_update` (#704)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-
- # Version 0.8.4
-
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -295,7 +295,7 @@ impl<T: Copy + Eq> AtomicCell<T> {
- }
-
- macro_rules! impl_arithmetic {
-- ($t:ty, fallback, $example:tt) => {
-+ ($t:ty, $example:tt) => {
- impl AtomicCell<$t> {
- /// Increments the current value by `val` and returns the previous value.
- ///
-@@ -313,13 +313,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_add(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_add(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -344,13 +341,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_sub(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_sub(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -373,13 +367,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_and(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_and(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -402,13 +393,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_or(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_or(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -431,13 +419,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_xor(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_xor(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -556,15 +541,9 @@ impl_arithmetic!(i32, atomic::AtomicI32,
- impl_arithmetic!(u64, atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
- #[cfg(not(crossbeam_no_atomic_64))]
- impl_arithmetic!(i64, atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(u64, fallback, "let a = AtomicCell::new(7u64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(i64, fallback, "let a = AtomicCell::new(7i64);");
- // TODO: AtomicU128 is unstable
- // impl_arithmetic!(u128, atomic::AtomicU128, "let a = AtomicCell::new(7u128);");
- // impl_arithmetic!(i128, atomic::AtomicI128, "let a = AtomicCell::new(7i128);");
--impl_arithmetic!(u128, fallback, "let a = AtomicCell::new(7u128);");
--impl_arithmetic!(i128, fallback, "let a = AtomicCell::new(7i128);");
-
- impl_arithmetic!(
- usize,
-@@ -704,13 +683,105 @@ fn lock(addr: usize) -> &'static SeqLock
- // stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
- // In order to protect from such cases, we simply choose a large prime number for `LEN`.
- const LEN: usize = 97;
-- #[allow(clippy::declare_interior_mutable_const)]
-- const L: SeqLock = SeqLock::new();
-+
- static LOCKS: [SeqLock; LEN] = [
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L,
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
- ];
-
- // If the modulus is a constant number, the compiler will use crazy math to transform this into
-@@ -762,6 +833,7 @@ macro_rules! atomic {
- ($t:ty, $a:ident, $atomic_op:expr, $fallback_op:expr) => {
- loop {
- atomic!(@check, $t, AtomicUnit, $a, $atomic_op);
-+ atomic!(@check, $t, atomic::AtomicUsize, $a, $atomic_op);
-
- atomic!(@check, $t, atomic::AtomicU8, $a, $atomic_op);
- atomic!(@check, $t, atomic::AtomicU16, $a, $atomic_op);
-@@ -783,6 +855,7 @@ macro_rules! atomic {
- const fn atomic_is_lock_free<T>() -> bool {
- // HACK(taiki-e): This is equivalent to `atomic! { T, _a, true, false }`, but can be used in const fn even in Rust 1.36.
- let is_lock_free = can_transmute::<T, AtomicUnit>()
-+ | can_transmute::<T, atomic::AtomicUsize>()
- | can_transmute::<T, atomic::AtomicU8>()
- | can_transmute::<T, atomic::AtomicU16>()
- | can_transmute::<T, atomic::AtomicU32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -175,7 +175,6 @@ impl Parker {
- ///
- /// let p = Parker::new();
- /// let raw = Parker::into_raw(p);
-- /// # let _ = unsafe { Parker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Parker) -> *const () {
- Unparker::into_raw(this.unparker)
-@@ -259,7 +258,6 @@ impl Unparker {
- /// let p = Parker::new();
- /// let u = p.unparker().clone();
- /// let raw = Unparker::into_raw(u);
-- /// # let _ = unsafe { Unparker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Unparker) -> *const () {
- Arc::into_raw(this.inner) as *const ()
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -446,7 +446,7 @@ impl<'scope, 'env> ScopedThreadBuilder<'
- unsafe { mem::transmute(closure) };
-
- // Finally, spawn the closure.
-- self.builder.spawn(closure)?
-+ self.builder.spawn(move || closure())?
- };
-
- let thread = handle.thread().clone();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -264,22 +264,3 @@ fn const_atomic_cell_new() {
- CELL.store(1);
- assert_eq!(CELL.load(), 1);
- }
--
--// https://github.com/crossbeam-rs/crossbeam/issues/748
--#[cfg_attr(miri, ignore)] // TODO
--#[rustversion::since(1.37)] // #[repr(align(N))] requires Rust 1.37
--#[test]
--fn issue_748() {
-- #[allow(dead_code)]
-- #[repr(align(8))]
-- #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-- enum Test {
-- Field(u32),
-- FieldLess,
-- }
--
-- assert_eq!(mem::size_of::<Test>(), 8);
-- assert!(AtomicCell::<Test>::is_lock_free());
-- let x = AtomicCell::new(Test::FieldLess);
-- assert_eq!(x.load(), Test::FieldLess);
--}
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -21,9 +21,6 @@ fn smoke() {
- #[test]
- fn frob() {
- const N: u32 = 10;
-- #[cfg(miri)]
-- const M: usize = 100;
-- #[cfg(not(miri))]
- const M: usize = 1000;
-
- let r = Arc::new(ShardedLock::new(()));
diff --git a/firefox.spec b/firefox.spec
index 238bca8..23f2eb0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -216,7 +216,6 @@ Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
# Test patches
@@ -459,9 +458,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-%ifarch aarch64
-%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
-%endif
%patch71 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
# Test patches
commit 3b1730925b4ef954a27f291ab3eed5b0667bc067
Merge: 35a5afb f14b870
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:11 2022 +0200
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
commit 35a5afbafa9e3f85b82856171e9da0670e91d5ab
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:00 2022 +0200
Updated to 99.0
diff --git a/.gitignore b/.gitignore
index c32b695..85b9eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -501,3 +501,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-98.0-20220305.tar.xz
/firefox-98.0.2.source.tar.xz
/firefox-langpacks-98.0.2-20220331.tar.xz
+/firefox-99.0.source.tar.xz
+/firefox-langpacks-99.0-20220331.tar.xz
diff --git a/D139022.diff b/D139022.diff
deleted file mode 100644
index 9d18162..0000000
--- a/D139022.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/dom/animation/TimingParams.h b/dom/animation/TimingParams.h
---- a/dom/animation/TimingParams.h
-+++ b/dom/animation/TimingParams.h
-@@ -31,22 +31,19 @@
- struct TimingParams {
- constexpr TimingParams() = default;
-
-- constexpr TimingParams(float aDuration, float aDelay, float aIterationCount,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode)
-+ TimingParams(float aDuration, float aDelay, float aIterationCount,
-+ dom::PlaybackDirection aDirection, dom::FillMode aFillMode)
- : mIterations(aIterationCount), mDirection(aDirection), mFill(aFillMode) {
- mDuration.emplace(StickyTimeDuration::FromMilliseconds(aDuration));
- mDelay = TimeDuration::FromMilliseconds(aDelay);
- Update();
- }
-
-- constexpr TimingParams(const TimeDuration& aDuration,
-- const TimeDuration& aDelay,
-- const TimeDuration& aEndDelay, float aIterations,
-- float aIterationStart,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode,
-- Maybe<ComputedTimingFunction>&& aFunction)
-+ TimingParams(const TimeDuration& aDuration, const TimeDuration& aDelay,
-+ const TimeDuration& aEndDelay, float aIterations,
-+ float aIterationStart, dom::PlaybackDirection aDirection,
-+ dom::FillMode aFillMode,
-+ Maybe<ComputedTimingFunction>&& aFunction)
- : mDelay(aDelay),
- mEndDelay(aEndDelay),
- mIterations(aIterations),
-
diff --git a/D139078.diff b/D139078.diff
deleted file mode 100644
index 8198e1a..0000000
--- a/D139078.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
---- a/gfx/wr/swgl/src/glsl.h
-+++ b/gfx/wr/swgl/src/glsl.h
-@@ -2301,20 +2301,12 @@
- const vec2& operator[](int index) const { return data[index]; }
- mat2() = default;
-
-- IMPLICIT mat2(Float a) {
-- data[0] = vec2(a);
-- data[1] = vec2(a);
-- }
-+ IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
-
-- mat2(vec2 a, vec2 b) {
-- data[0] = a;
-- data[1] = b;
-- }
-+ constexpr mat2(vec2 a, vec2 b) : data{a, b} {}
- IMPLICIT mat2(const mat4& mat);
-- IMPLICIT constexpr mat2(mat2_scalar s) {
-- data[0] = vec2(s.data[0]);
-- data[1] = vec2(s.data[1]);
-- }
-+ IMPLICIT constexpr mat2(mat2_scalar s)
-+ : data{vec2(s.data[0]), vec2(s.data[1])} {}
-
- friend vec2 operator*(mat2 m, vec2 v) {
- vec2 u;
-@@ -2404,30 +2396,19 @@
- vec3& operator[](int index) { return data[index]; }
- const vec3& operator[](int index) const { return data[index]; }
- mat3() = default;
-- mat3(vec3 a, vec3 b, vec3 c) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- }
-+ constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
-
-- IMPLICIT constexpr mat3(mat3_scalar s) {
-- data[0] = vec3(s.data[0]);
-- data[1] = vec3(s.data[1]);
-- data[2] = vec3(s.data[2]);
-- }
-- constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2,
-- mat3_scalar s3) {
-- data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]);
-- data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]);
-- data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]);
-- }
-+ IMPLICIT constexpr mat3(mat3_scalar s)
-+ : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {}
-+
-+ constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3)
-+ : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]),
-+ vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]),
-+ vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {}
-
- constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6,
-- Float d7, Float d8, Float d9) {
-- data[0] = vec3(d1, d2, d3);
-- data[1] = vec3(d4, d5, d6);
-- data[2] = vec3(d7, d8, d9);
-- }
-+ Float d7, Float d8, Float d9)
-+ : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {}
-
- IMPLICIT mat3(const mat4& mat);
-
-@@ -2597,19 +2578,11 @@
- vec4 data[4];
-
- mat4() = default;
-- IMPLICIT constexpr mat4(mat4_scalar s) {
-- data[0] = vec4(s.data[0]);
-- data[1] = vec4(s.data[1]);
-- data[2] = vec4(s.data[2]);
-- data[3] = vec4(s.data[3]);
-- }
-+ IMPLICIT constexpr mat4(mat4_scalar s)
-+ : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
-+ vec4(s.data[3])} {}
-
-- mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- data[3] = d;
-- }
-+ constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {}
-
- vec4& operator[](int index) { return data[index]; }
- const vec4& operator[](int index) const { return data[index]; }
-
diff --git a/D139088.diff b/D139088.diff
deleted file mode 100644
index 91e9967..0000000
--- a/D139088.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
---- a/gfx/wr/swgl/src/gl.cc
-+++ b/gfx/wr/swgl/src/gl.cc
-@@ -82,7 +82,7 @@
-
- #define FALLTHROUGH [[fallthrough]]
-
--#ifdef MOZILLA_CLIENT
-+#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
- # define IMPLICIT __attribute__((annotate("moz_implicit")))
- #else
- # define IMPLICIT
-
diff --git a/D139696.diff b/D139696.diff
deleted file mode 100644
index 432a9c6..0000000
--- a/D139696.diff
+++ /dev/null
@@ -1,13808 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1 b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-@@ -0,0 +1,504 @@
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 2.1, February 1999
-+
-+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+[This is the first released version of the Lesser GPL. It also counts
-+ as the successor of the GNU Library Public License, version 2, hence
-+ the version number 2.1.]
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+Licenses are intended to guarantee your freedom to share and change
-+free software--to make sure the software is free for all its users.
-+
-+ This license, the Lesser General Public License, applies to some
-+specially designated software packages--typically libraries--of the
-+Free Software Foundation and other authors who decide to use it. You
-+can use it too, but we suggest you first think carefully about whether
-+this license or the ordinary General Public License is the better
-+strategy to use in any particular case, based on the explanations below.
-+
-+ When we speak of free software, we are referring to freedom of use,
-+not price. Our General Public Licenses are designed to make sure that
-+you have the freedom to distribute copies of free software (and charge
-+for this service if you wish); that you receive source code or can get
-+it if you want it; that you can change the software and use pieces of
-+it in new free programs; and that you are informed that you can do
-+these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+distributors to deny you these rights or to ask you to surrender these
-+rights. These restrictions translate to certain responsibilities for
-+you if you distribute copies of the library or if you modify it.
-+
-+ For example, if you distribute copies of the library, whether gratis
-+or for a fee, you must give the recipients all the rights that we gave
-+you. You must make sure that they, too, receive or can get the source
-+code. If you link other code with the library, you must provide
-+complete object files to the recipients, so that they can relink them
-+with the library after making changes to the library and recompiling
-+it. And you must show them these terms so they know their rights.
-+
-+ We protect your rights with a two-step method: (1) we copyright the
-+library, and (2) we offer you this license, which gives you legal
-+permission to copy, distribute and/or modify the library.
-+
-+ To protect each distributor, we want to make it very clear that
-+there is no warranty for the free library. Also, if the library is
-+modified by someone else and passed on, the recipients should know
-+that what they have is not the original version, so that the original
-+author's reputation will not be affected by problems that might be
-+introduced by others.
-+
-+ Finally, software patents pose a constant threat to the existence of
-+any free program. We wish to make sure that a company cannot
-+effectively restrict the users of a free program by obtaining a
-+restrictive license from a patent holder. Therefore, we insist that
-+any patent license obtained for a version of the library must be
-+consistent with the full freedom of use specified in this license.
-+
-+ Most GNU software, including some libraries, is covered by the
-+ordinary GNU General Public License. This license, the GNU Lesser
-+General Public License, applies to certain designated libraries, and
-+is quite different from the ordinary General Public License. We use
-+this license for certain libraries in order to permit linking those
-+libraries into non-free programs.
-+
-+ When a program is linked with a library, whether statically or using
-+a shared library, the combination of the two is legally speaking a
-+combined work, a derivative of the original library. The ordinary
-+General Public License therefore permits such linking only if the
-+entire combination fits its criteria of freedom. The Lesser General
-+Public License permits more lax criteria for linking other code with
-+the library.
-+
-+ We call this license the "Lesser" General Public License because it
-+does Less to protect the user's freedom than the ordinary General
-+Public License. It also provides other free software developers Less
-+of an advantage over competing non-free programs. These disadvantages
-+are the reason we use the ordinary General Public License for many
-+libraries. However, the Lesser license provides advantages in certain
-+special circumstances.
-+
-+ For example, on rare occasions, there may be a special need to
-+encourage the widest possible use of a certain library, so that it becomes
-+a de-facto standard. To achieve this, non-free programs must be
-+allowed to use the library. A more frequent case is that a free
-+library does the same job as widely used non-free libraries. In this
-+case, there is little to gain by limiting the free library to free
-+software only, so we use the Lesser General Public License.
-+
-+ In other cases, permission to use a particular library in non-free
-+programs enables a greater number of people to use a large body of
-+free software. For example, permission to use the GNU C Library in
-+non-free programs enables many more people to use the whole GNU
-+operating system, as well as its variant, the GNU/Linux operating
-+system.
-+
-+ Although the Lesser General Public License is Less protective of the
-+users' freedom, it does ensure that the user of a program that is
-+linked with the Library has the freedom and the wherewithal to run
-+that program using a modified version of the Library.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow. Pay close attention to the difference between a
-+"work based on the library" and a "work that uses the library". The
-+former contains code derived from the library, whereas the latter must
-+be combined with the library in order to run.
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License Agreement applies to any software library or other
-+program which contains a notice placed by the copyright holder or
-+other authorized party saying it may be distributed under the terms of
-+this Lesser General Public License (also called "this License").
-+Each licensee is addressed as "you".
-+
-+ A "library" means a collection of software functions and/or data
-+prepared so as to be conveniently linked with application programs
-+(which use some of those functions and data) to form executables.
-+
-+ The "Library", below, refers to any such software library or work
-+which has been distributed under these terms. A "work based on the
-+Library" means either the Library or any derivative work under
-+copyright law: that is to say, a work containing the Library or a
-+portion of it, either verbatim or with modifications and/or translated
-+straightforwardly into another language. (Hereinafter, translation is
-+included without limitation in the term "modification".)
-+
-+ "Source code" for a work means the preferred form of the work for
-+making modifications to it. For a library, complete source code means
-+all the source code for all modules it contains, plus any associated
-+interface definition files, plus the scripts used to control compilation
-+and installation of the library.
-+
-+ Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running a program using the Library is not restricted, and output from
-+such a program is covered only if its contents constitute a work based
-+on the Library (independent of the use of the Library in a tool for
-+writing it). Whether that is true depends on what the Library does
-+and what the program that uses the Library does.
-+
-+ 1. You may copy and distribute verbatim copies of the Library's
-+complete source code as you receive it, in any medium, provided that
-+you conspicuously and appropriately publish on each copy an
-+appropriate copyright notice and disclaimer of warranty; keep intact
-+all the notices that refer to this License and to the absence of any
-+warranty; and distribute a copy of this License along with the
-+Library.
-+
-+ You may charge a fee for the physical act of transferring a copy,
-+and you may at your option offer warranty protection in exchange for a
-+fee.
-+
-+ 2. You may modify your copy or copies of the Library or any portion
-+of it, thus forming a work based on the Library, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) The modified work must itself be a software library.
-+
-+ b) You must cause the files modified to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ c) You must cause the whole of the work to be licensed at no
-+ charge to all third parties under the terms of this License.
-+
-+ d) If a facility in the modified Library refers to a function or a
-+ table of data to be supplied by an application program that uses
-+ the facility, other than as an argument passed when the facility
-+ is invoked, then you must make a good faith effort to ensure that,
-+ in the event an application does not supply such function or
-+ table, the facility still operates, and performs whatever part of
-+ its purpose remains meaningful.
-+
-+ (For example, a function in a library to compute square roots has
-+ a purpose that is entirely well-defined independent of the
-+ application. Therefore, Subsection 2d requires that any
-+ application-supplied function or table used by this function must
-+ be optional: if the application does not supply it, the square
-+ root function must still compute square roots.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Library,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Library, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote
-+it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Library.
-+
-+In addition, mere aggregation of another work not based on the Library
-+with the Library (or with a work based on the Library) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may opt to apply the terms of the ordinary GNU General Public
-+License instead of this License to a given copy of the Library. To do
-+this, you must alter all the notices that refer to this License, so
-+that they refer to the ordinary GNU General Public License, version 2,
-+instead of to this License. (If a newer version than version 2 of the
-+ordinary GNU General Public License has appeared, then you can specify
-+that version instead if you wish.) Do not make any other change in
-+these notices.
-+
-+ Once this change is made in a given copy, it is irreversible for
-+that copy, so the ordinary GNU General Public License applies to all
-+subsequent copies and derivative works made from that copy.
-+
-+ This option is useful when you wish to copy part of the code of
-+the Library into a program that is not a library.
-+
-+ 4. You may copy and distribute the Library (or a portion or
-+derivative of it, under Section 2) in object code or executable form
-+under the terms of Sections 1 and 2 above provided that you accompany
-+it with the complete corresponding machine-readable source code, which
-+must be distributed under the terms of Sections 1 and 2 above on a
-+medium customarily used for software interchange.
-+
-+ If distribution of object code is made by offering access to copy
-+from a designated place, then offering equivalent access to copy the
-+source code from the same place satisfies the requirement to
-+distribute the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 5. A program that contains no derivative of any portion of the
-+Library, but is designed to work with the Library by being compiled or
-+linked with it, is called a "work that uses the Library". Such a
-+work, in isolation, is not a derivative work of the Library, and
-+therefore falls outside the scope of this License.
-+
-+ However, linking a "work that uses the Library" with the Library
-+creates an executable that is a derivative of the Library (because it
-+contains portions of the Library), rather than a "work that uses the
-+library". The executable is therefore covered by this License.
-+Section 6 states terms for distribution of such executables.
-+
-+ When a "work that uses the Library" uses material from a header file
-+that is part of the Library, the object code for the work may be a
-+derivative work of the Library even though the source code is not.
-+Whether this is true is especially significant if the work can be
-+linked without the Library, or if the work is itself a library. The
-+threshold for this to be true is not precisely defined by law.
-+
-+ If such an object file uses only numerical parameters, data
-+structure layouts and accessors, and small macros and small inline
-+functions (ten lines or less in length), then the use of the object
-+file is unrestricted, regardless of whether it is legally a derivative
-+work. (Executables containing this object code plus portions of the
-+Library will still fall under Section 6.)
-+
-+ Otherwise, if the work is a derivative of the Library, you may
-+distribute the object code for the work under the terms of Section 6.
-+Any executables containing that work also fall under Section 6,
-+whether or not they are linked directly with the Library itself.
-+
-+ 6. As an exception to the Sections above, you may also combine or
-+link a "work that uses the Library" with the Library to produce a
-+work containing portions of the Library, and distribute that work
-+under terms of your choice, provided that the terms permit
-+modification of the work for the customer's own use and reverse
-+engineering for debugging such modifications.
-+
-+ You must give prominent notice with each copy of the work that the
-+Library is used in it and that the Library and its use are covered by
-+this License. You must supply a copy of this License. If the work
-+during execution displays copyright notices, you must include the
-+copyright notice for the Library among them, as well as a reference
-+directing the user to the copy of this License. Also, you must do one
-+of these things:
-+
-+ a) Accompany the work with the complete corresponding
-+ machine-readable source code for the Library including whatever
-+ changes were used in the work (which must be distributed under
-+ Sections 1 and 2 above); and, if the work is an executable linked
-+ with the Library, with the complete machine-readable "work that
-+ uses the Library", as object code and/or source code, so that the
-+ user can modify the Library and then relink to produce a modified
-+ executable containing the modified Library. (It is understood
-+ that the user who changes the contents of definitions files in the
-+ Library will not necessarily be able to recompile the application
-+ to use the modified definitions.)
-+
-+ b) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (1) uses at run time a
-+ copy of the library already present on the user's computer system,
-+ rather than copying library functions into the executable, and (2)
-+ will operate properly with a modified version of the library, if
-+ the user installs one, as long as the modified version is
-+ interface-compatible with the version that the work was made with.
-+
-+ c) Accompany the work with a written offer, valid for at
-+ least three years, to give the same user the materials
-+ specified in Subsection 6a, above, for a charge no more
-+ than the cost of performing this distribution.
-+
-+ d) If distribution of the work is made by offering access to copy
-+ from a designated place, offer equivalent access to copy the above
-+ specified materials from the same place.
-+
-+ e) Verify that the user has already received a copy of these
-+ materials or that you have already sent this user a copy.
-+
-+ For an executable, the required form of the "work that uses the
-+Library" must include any data and utility programs needed for
-+reproducing the executable from it. However, as a special exception,
-+the materials to be distributed need not include anything that is
-+normally distributed (in either source or binary form) with the major
-+components (compiler, kernel, and so on) of the operating system on
-+which the executable runs, unless that component itself accompanies
-+the executable.
-+
-+ It may happen that this requirement contradicts the license
-+restrictions of other proprietary libraries that do not normally
-+accompany the operating system. Such a contradiction means you cannot
-+use both them and the Library together in an executable that you
-+distribute.
-+
-+ 7. You may place library facilities that are a work based on the
-+Library side-by-side in a single library together with other library
-+facilities not covered by this License, and distribute such a combined
-+library, provided that the separate distribution of the work based on
-+the Library and of the other library facilities is otherwise
-+permitted, and provided that you do these two things:
-+
-+ a) Accompany the combined library with a copy of the same work
-+ based on the Library, uncombined with any other library
-+ facilities. This must be distributed under the terms of the
-+ Sections above.
-+
-+ b) Give prominent notice with the combined library of the fact
-+ that part of it is a work based on the Library, and explaining
-+ where to find the accompanying uncombined form of the same work.
-+
-+ 8. You may not copy, modify, sublicense, link with, or distribute
-+the Library except as expressly provided under this License. Any
-+attempt otherwise to copy, modify, sublicense, link with, or
-+distribute the Library is void, and will automatically terminate your
-+rights under this License. However, parties who have received copies,
-+or rights, from you under this License will not have their licenses
-+terminated so long as such parties remain in full compliance.
-+
-+ 9. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Library or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Library (or any work based on the
-+Library), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Library or works based on it.
-+
-+ 10. Each time you redistribute the Library (or any work based on the
-+Library), the recipient automatically receives a license from the
-+original licensor to copy, distribute, link with or modify the Library
-+subject to these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties with
-+this License.
-+
-+ 11. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Library at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Library by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Library.
-+
-+If any portion of this section is held invalid or unenforceable under any
-+particular circumstance, the balance of the section is intended to apply,
-+and the section as a whole is intended to apply in other circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 12. If the distribution and/or use of the Library is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Library under this License may add
-+an explicit geographical distribution limitation excluding those countries,
-+so that distribution is permitted only in or among countries not thus
-+excluded. In such case, this License incorporates the limitation as if
-+written in the body of this License.
-+
-+ 13. The Free Software Foundation may publish revised and/or new
-+versions of the Lesser General Public License from time to time.
-+Such new versions will be similar in spirit to the present version,
-+but may differ in detail to address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Library
-+specifies a version number of this License which applies to it and
-+"any later version", you have the option of following the terms and
-+conditions either of that version or of any later version published by
-+the Free Software Foundation. If the Library does not specify a
-+license version number, you may choose any version ever published by
-+the Free Software Foundation.
-+
-+ 14. If you wish to incorporate parts of the Library into other free
-+programs whose distribution conditions are incompatible with these,
-+write to the author to ask for permission. For software which is
-+copyrighted by the Free Software Foundation, write to the Free
-+Software Foundation; we sometimes make exceptions for this. Our
-+decision will be guided by the two goals of preserving the free status
-+of all derivatives of our free software and of promoting the sharing
-+and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Libraries
-+
-+ If you develop a new library, and you want it to be of the greatest
-+possible use to the public, we recommend making it free software that
-+everyone can redistribute and change. You can do so by permitting
-+redistribution under these terms (or, alternatively, under the terms of the
-+ordinary General Public License).
-+
-+ To apply these terms, attach the following notices to the library. It is
-+safest to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least the
-+"copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the library's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the library, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
-+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1990
-+ Ty Coon, President of Vice
-+
-+That's all there is to it!
-+
-+
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-@@ -0,0 +1,3204 @@
-+/*
-+ * copyright (c) 2001 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVCODEC_H
-+#define AVCODEC_AVCODEC_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec external API header
-+ */
-+
-+#include "libavutil/samplefmt.h"
-+#include "libavutil/attributes.h"
-+#include "libavutil/avutil.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/frame.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec.h"
-+#include "codec_desc.h"
-+#include "codec_par.h"
-+#include "codec_id.h"
-+#include "defs.h"
-+#include "packet.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup libavc libavcodec
-+ * Encoding/Decoding Library
-+ *
-+ * @{
-+ *
-+ * @defgroup lavc_decoding Decoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_encoding Encoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_codec Codecs
-+ * @{
-+ * @defgroup lavc_codec_native Native Codecs
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_wrappers External library wrappers
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
-+ * @{
-+ * @}
-+ * @}
-+ * @defgroup lavc_internal Internal
-+ * @{
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @ingroup libavc
-+ * @defgroup lavc_encdec send/receive encoding and decoding API overview
-+ * @{
-+ *
-+ * The avcodec_send_packet()/avcodec_receive_frame()/avcodec_send_frame()/
-+ * avcodec_receive_packet() functions provide an encode/decode API, which
-+ * decouples input and output.
-+ *
-+ * The API is very similar for encoding/decoding and audio/video, and works as
-+ * follows:
-+ * - Set up and open the AVCodecContext as usual.
-+ * - Send valid input:
-+ * - For decoding, call avcodec_send_packet() to give the decoder raw
-+ * compressed data in an AVPacket.
-+ * - For encoding, call avcodec_send_frame() to give the encoder an AVFrame
-+ * containing uncompressed audio or video.
-+ *
-+ * In both cases, it is recommended that AVPackets and AVFrames are
-+ * refcounted, or libavcodec might have to copy the input data. (libavformat
-+ * always returns refcounted AVPackets, and av_frame_get_buffer() allocates
-+ * refcounted AVFrames.)
-+ * - Receive output in a loop. Periodically call one of the avcodec_receive_*()
-+ * functions and process their output:
-+ * - For decoding, call avcodec_receive_frame(). On success, it will return
-+ * an AVFrame containing uncompressed audio or video data.
-+ * - For encoding, call avcodec_receive_packet(). On success, it will return
-+ * an AVPacket with a compressed frame.
-+ *
-+ * Repeat this call until it returns AVERROR(EAGAIN) or an error. The
-+ * AVERROR(EAGAIN) return value means that new input data is required to
-+ * return new output. In this case, continue with sending input. For each
-+ * input frame/packet, the codec will typically return 1 output frame/packet,
-+ * but it can also be 0 or more than 1.
-+ *
-+ * At the beginning of decoding or encoding, the codec might accept multiple
-+ * input frames/packets without returning a frame, until its internal buffers
-+ * are filled. This situation is handled transparently if you follow the steps
-+ * outlined above.
-+ *
-+ * In theory, sending input can result in EAGAIN - this should happen only if
-+ * not all output was received. You can use this to structure alternative decode
-+ * or encode loops other than the one suggested above. For example, you could
-+ * try sending new input on each iteration, and try to receive output if that
-+ * returns EAGAIN.
-+ *
-+ * End of stream situations. These require "flushing" (aka draining) the codec,
-+ * as the codec might buffer multiple frames or packets internally for
-+ * performance or out of necessity (consider B-frames).
-+ * This is handled as follows:
-+ * - Instead of valid input, send NULL to the avcodec_send_packet() (decoding)
-+ * or avcodec_send_frame() (encoding) functions. This will enter draining
-+ * mode.
-+ * - Call avcodec_receive_frame() (decoding) or avcodec_receive_packet()
-+ * (encoding) in a loop until AVERROR_EOF is returned. The functions will
-+ * not return AVERROR(EAGAIN), unless you forgot to enter draining mode.
-+ * - Before decoding can be resumed again, the codec has to be reset with
-+ * avcodec_flush_buffers().
-+ *
-+ * Using the API as outlined above is highly recommended. But it is also
-+ * possible to call functions outside of this rigid schema. For example, you can
-+ * call avcodec_send_packet() repeatedly without calling
-+ * avcodec_receive_frame(). In this case, avcodec_send_packet() will succeed
-+ * until the codec's internal buffer has been filled up (which is typically of
-+ * size 1 per output frame, after initial input), and then reject input with
-+ * AVERROR(EAGAIN). Once it starts rejecting input, you have no choice but to
-+ * read at least some output.
-+ *
-+ * Not all codecs will follow a rigid and predictable dataflow; the only
-+ * guarantee is that an AVERROR(EAGAIN) return value on a send/receive call on
-+ * one end implies that a receive/send call on the other end will succeed, or
-+ * at least will not fail with AVERROR(EAGAIN). In general, no codec will
-+ * permit unlimited buffering of input or output.
-+ *
-+ * A codec is not allowed to return AVERROR(EAGAIN) for both sending and
-+ * receiving. This would be an invalid state, which could put the codec user
-+ * into an endless loop. The API has no concept of time either: it cannot happen
-+ * that trying to do avcodec_send_packet() results in AVERROR(EAGAIN), but a
-+ * repeated call 1 second later accepts the packet (with no other receive/flush
-+ * API calls involved). The API is a strict state machine, and the passage of
-+ * time is not supposed to influence it. Some timing-dependent behavior might
-+ * still be deemed acceptable in certain cases. But it must never result in both
-+ * send/receive returning EAGAIN at the same time at any point. It must also
-+ * absolutely be avoided that the current state is "unstable" and can
-+ * "flip-flop" between the send/receive APIs allowing progress. For example,
-+ * it's not allowed that the codec randomly decides that it actually wants to
-+ * consume a packet now instead of returning a frame, after it just returned
-+ * AVERROR(EAGAIN) on an avcodec_send_packet() call.
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_core Core functions/structures.
-+ * @ingroup libavc
-+ *
-+ * Basic definitions, functions for querying libavcodec capabilities,
-+ * allocating core structures, etc.
-+ * @{
-+ */
-+
-+/**
-+ * @ingroup lavc_encoding
-+ * minimum encoding buffer size
-+ * Used to avoid some checks during header writing.
-+ */
-+#define AV_INPUT_BUFFER_MIN_SIZE 16384
-+
-+/**
-+ * @ingroup lavc_encoding
-+ */
-+typedef struct RcOverride {
-+ int start_frame;
-+ int end_frame;
-+ int qscale; // If this is 0 then quality_factor will be used instead.
-+ float quality_factor;
-+} RcOverride;
-+
-+/* encoding support
-+ These flags can be passed in AVCodecContext.flags before initialization.
-+ Note: Not everything is supported yet.
-+*/
-+
-+/**
-+ * Allow decoders to produce frames with data planes that are not aligned
-+ * to CPU requirements (e.g. due to cropping).
-+ */
-+#define AV_CODEC_FLAG_UNALIGNED (1 << 0)
-+/**
-+ * Use fixed qscale.
-+ */
-+#define AV_CODEC_FLAG_QSCALE (1 << 1)
-+/**
-+ * 4 MV per MB allowed / advanced prediction for H.263.
-+ */
-+#define AV_CODEC_FLAG_4MV (1 << 2)
-+/**
-+ * Output even those frames that might be corrupted.
-+ */
-+#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3)
-+/**
-+ * Use qpel MC.
-+ */
-+#define AV_CODEC_FLAG_QPEL (1 << 4)
-+/**
-+ * Don't output frames whose parameters differ from first
-+ * decoded frame in stream.
-+ */
-+#define AV_CODEC_FLAG_DROPCHANGED (1 << 5)
-+/**
-+ * Use internal 2pass ratecontrol in first pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS1 (1 << 9)
-+/**
-+ * Use internal 2pass ratecontrol in second pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS2 (1 << 10)
-+/**
-+ * loop filter.
-+ */
-+#define AV_CODEC_FLAG_LOOP_FILTER (1 << 11)
-+/**
-+ * Only decode/encode grayscale.
-+ */
-+#define AV_CODEC_FLAG_GRAY (1 << 13)
-+/**
-+ * error[?] variables will be set during encoding.
-+ */
-+#define AV_CODEC_FLAG_PSNR (1 << 15)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * Input bitstream might be truncated at a random location
-+ * instead of only at frame boundaries.
-+ *
-+ * @deprecated use codec parsers for packetizing input
-+ */
-+# define AV_CODEC_FLAG_TRUNCATED (1 << 16)
-+#endif
-+/**
-+ * Use interlaced DCT.
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_DCT (1 << 18)
-+/**
-+ * Force low delay.
-+ */
-+#define AV_CODEC_FLAG_LOW_DELAY (1 << 19)
-+/**
-+ * Place global headers in extradata instead of every keyframe.
-+ */
-+#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
-+/**
-+ * Use only bitexact stuff (except (I)DCT).
-+ */
-+#define AV_CODEC_FLAG_BITEXACT (1 << 23)
-+/* Fx : Flag for H.263+ extra options */
-+/**
-+ * H.263 advanced intra coding / MPEG-4 AC prediction
-+ */
-+#define AV_CODEC_FLAG_AC_PRED (1 << 24)
-+/**
-+ * interlaced motion estimation
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_ME (1 << 29)
-+#define AV_CODEC_FLAG_CLOSED_GOP (1U << 31)
-+
-+/**
-+ * Allow non spec compliant speedup tricks.
-+ */
-+#define AV_CODEC_FLAG2_FAST (1 << 0)
-+/**
-+ * Skip bitstream encoding.
-+ */
-+#define AV_CODEC_FLAG2_NO_OUTPUT (1 << 2)
-+/**
-+ * Place global headers at every keyframe instead of in extradata.
-+ */
-+#define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3)
-+
-+/**
-+ * timecode is in drop frame format. DEPRECATED!!!!
-+ */
-+#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13)
-+
-+/**
-+ * Input bitstream might be truncated at a packet boundaries
-+ * instead of only at frame boundaries.
-+ */
-+#define AV_CODEC_FLAG2_CHUNKS (1 << 15)
-+/**
-+ * Discard cropping information from SPS.
-+ */
-+#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16)
-+
-+/**
-+ * Show all frames before the first keyframe
-+ */
-+#define AV_CODEC_FLAG2_SHOW_ALL (1 << 22)
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_FLAG2_EXPORT_MVS (1 << 28)
-+/**
-+ * Do not skip samples and export skip information as frame side data
-+ */
-+#define AV_CODEC_FLAG2_SKIP_MANUAL (1 << 29)
-+/**
-+ * Do not reset ASS ReadOrder field on flush (subtitles decoding)
-+ */
-+#define AV_CODEC_FLAG2_RO_FLUSH_NOOP (1 << 30)
-+
-+/* Unsupported options :
-+ * Syntax Arithmetic coding (SAC)
-+ * Reference Picture Selection
-+ * Independent Segment Decoding */
-+/* /Fx */
-+/* codec capabilities */
-+
-+/* Exported side data.
-+ These flags can be passed in AVCodecContext.export_side_data before
-+ initialization.
-+*/
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_MVS (1 << 0)
-+/**
-+ * Export encoder Producer Reference Time through packet side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_PRFT (1 << 1)
-+/**
-+ * Decoding only.
-+ * Export the AVVideoEncParams structure through frame side data.
-+ */
-+#define AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS (1 << 2)
-+/**
-+ * Decoding only.
-+ * Do not apply film grain, export it instead.
-+ */
-+#define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)
-+
-+/**
-+ * The decoder will keep a reference to the frame and may reuse it later.
-+ */
-+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-+
-+/**
-+ * The encoder will keep a reference to the packet and may reuse it later.
-+ */
-+#define AV_GET_ENCODE_BUFFER_FLAG_REF (1 << 0)
-+
-+struct AVCodecInternal;
-+
-+/**
-+ * main external API structure.
-+ * New fields can be added to the end with minor version bumps.
-+ * Removal, reordering and changes to existing fields require a major
-+ * version bump.
-+ * You can use AVOptions (av_opt* / av_set/get*()) to access these fields from
-+ * user applications. The name string for AVOptions options matches the
-+ * associated command line parameter name and can be found in
-+ * libavcodec/options_table.h The AVOption/command line parameter names differ
-+ * in some cases from the C structure field names for historic reasons or
-+ * brevity. sizeof(AVCodecContext) must not be used outside libav*.
-+ */
-+typedef struct AVCodecContext {
-+ /**
-+ * information on struct for av_log
-+ * - set by avcodec_alloc_context3
-+ */
-+ const AVClass* av_class;
-+ int log_level_offset;
-+
-+ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-+ const struct AVCodec* codec;
-+ enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
-+
-+ /**
-+ * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-+ * This is used to work around some encoder bugs.
-+ * A demuxer should set this to what is stored in the field used to identify
-+ * the codec. If there are multiple such fields in a container then the
-+ * demuxer should choose the one which maximizes the information about the
-+ * used codec. If the codec tag field in a container is larger than 32 bits
-+ * then the demuxer should remap the longer ID to 32 bits with a table or
-+ * other structure. Alternatively a new extra_codec_tag + size could be added
-+ * but for this a clear advantage must be demonstrated first.
-+ * - encoding: Set by user, if not then the default based on codec_id will be
-+ * used.
-+ * - decoding: Set by user, will be converted to uppercase by libavcodec
-+ * during init.
-+ */
-+ unsigned int codec_tag;
-+
-+ void* priv_data;
-+
-+ /**
-+ * Private context used for internal data.
-+ *
-+ * Unlike priv_data, this is not codec-specific. It is used in general
-+ * libavcodec functions.
-+ */
-+ struct AVCodecInternal* internal;
-+
-+ /**
-+ * Private data of the user, can be used to carry app specific stuff.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ void* opaque;
-+
-+ /**
-+ * the average bitrate
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: Set by user, may be overwritten by libavcodec
-+ * if this info is available in the stream
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * number of bits the bitstream is allowed to diverge from the reference.
-+ * the reference can be CBR (for CBR pass1) or VBR (for pass2)
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: unused
-+ */
-+ int bit_rate_tolerance;
-+
-+ /**
-+ * Global quality for codecs which cannot change it per frame.
-+ * This should be proportional to MPEG-1/2/4 qscale.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int global_quality;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int compression_level;
-+#define FF_COMPRESSION_DEFAULT -1
-+
-+ /**
-+ * AV_CODEC_FLAG_*.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags;
-+
-+ /**
-+ * AV_CODEC_FLAG2_*
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags2;
-+
-+ /**
-+ * some codecs need / can use extradata like Huffman tables.
-+ * MJPEG: Huffman tables
-+ * rv10: additional flags
-+ * MPEG-4: global headers (they can be in the bitstream or here)
-+ * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
-+ * than extradata_size to avoid problems if it is read with the bitstream
-+ * reader. The bytewise contents of extradata must not depend on the
-+ * architecture or CPU endianness. Must be allocated with the av_malloc()
-+ * family of functions.
-+ * - encoding: Set/allocated/freed by libavcodec.
-+ * - decoding: Set/allocated/freed by user.
-+ */
-+ uint8_t* extradata;
-+ int extradata_size;
-+
-+ /**
-+ * This is the fundamental unit of time (in seconds) in terms
-+ * of which frame timestamps are represented. For fixed-fps content,
-+ * timebase should be 1/framerate and timestamp increments should be
-+ * identically 1.
-+ * This often, but not always is the inverse of the frame rate or field rate
-+ * for video. 1/time_base is not the average frame rate if the frame rate is
-+ * not constant.
-+ *
-+ * Like containers, elementary streams also can store timestamps, 1/time_base
-+ * is the unit in which these timestamps are specified.
-+ * As example of such codec time base see ISO/IEC 14496-2:2001(E)
-+ * vop_time_increment_resolution and fixed_vop_rate
-+ * (fixed_vop_rate == 0 implies that it is different from the framerate)
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: the use of this field for decoding is deprecated.
-+ * Use framerate instead.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * For some codecs, the time base is closer to the field rate than the frame
-+ * rate. Most notably, H.264 and MPEG-2 specify time_base as half of frame
-+ * duration if no telecine is used ...
-+ *
-+ * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it
-+ * to 2.
-+ */
-+ int ticks_per_frame;
-+
-+ /**
-+ * Codec delay.
-+ *
-+ * Encoding: Number of frames delay there will be from the encoder input to
-+ * the decoder output. (we assume the decoder matches the spec)
-+ * Decoding: Number of frames delay in addition to what a standard decoder
-+ * as specified in the spec would produce.
-+ *
-+ * Video:
-+ * Number of frames the decoded output will be delayed relative to the
-+ * encoded input.
-+ *
-+ * Audio:
-+ * For encoding, this field is unused (see initial_padding).
-+ *
-+ * For decoding, this is the number of samples the decoder needs to
-+ * output before the decoder's output is valid. When seeking, you should
-+ * start decoding this many samples prior to your desired seek point.
-+ *
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int delay;
-+
-+ /* video only */
-+ /**
-+ * picture width / height.
-+ *
-+ * @note Those fields may not match the values of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: May be set by the user before opening the decoder if known e.g.
-+ * from the container. Some decoders will require the dimensions
-+ * to be set by the caller. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int width, height;
-+
-+ /**
-+ * Bitstream width / height, may be different from width/height e.g. when
-+ * the decoded frame is cropped before being output or lowres is enabled.
-+ *
-+ * @note Those field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: unused
-+ * - decoding: May be set by the user before opening the decoder if known
-+ * e.g. from the container. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int coded_width, coded_height;
-+
-+ /**
-+ * the number of pictures in a group of pictures, or 0 for intra_only
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int gop_size;
-+
-+ /**
-+ * Pixel format, see AV_PIX_FMT_xxx.
-+ * May be set by the demuxer if known from headers.
-+ * May be overridden by the decoder if it knows better.
-+ *
-+ * @note This field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: Set by user if known, overridden by libavcodec while
-+ * parsing the data.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * If non NULL, 'draw_horiz_band' is called by the libavcodec
-+ * decoder to draw a horizontal band. It improves cache usage. Not
-+ * all codecs can do that. You must check the codec capabilities
-+ * beforehand.
-+ * When multithreading is used, it may be called from multiple threads
-+ * at the same time; threads might draw different parts of the same AVFrame,
-+ * or multiple AVFrames, and there is no guarantee that slices will be drawn
-+ * in order.
-+ * The function is also used by hardware acceleration APIs.
-+ * It is called at least once during frame decoding to pass
-+ * the data needed for hardware render.
-+ * In that mode instead of pixel data, AVFrame points to
-+ * a structure specific to the acceleration API. The application
-+ * reads the structure and can change some fields to indicate progress
-+ * or mark state.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ * @param height the height of the slice
-+ * @param y the y position of the slice
-+ * @param type 1->top field, 2->bottom field, 3->frame
-+ * @param offset offset into the AVFrame.data from which the slice should be
-+ * read
-+ */
-+ void (*draw_horiz_band)(struct AVCodecContext* s, const AVFrame* src,
-+ int offset[AV_NUM_DATA_POINTERS], int y, int type,
-+ int height);
-+
-+ /**
-+ * Callback to negotiate the pixel format. Decoding only, may be set by the
-+ * caller before avcodec_open2().
-+ *
-+ * Called by some decoders to select the pixel format that will be used for
-+ * the output frames. This is mainly used to set up hardware acceleration,
-+ * then the provided format list contains the corresponding hwaccel pixel
-+ * formats alongside the "software" one. The software pixel format may also
-+ * be retrieved from \ref sw_pix_fmt.
-+ *
-+ * This callback will be called when the coded frame properties (such as
-+ * resolution, pixel format, etc.) change and more than one output format is
-+ * supported for those new properties. If a hardware pixel format is chosen
-+ * and initialization for it fails, the callback may be called again
-+ * immediately.
-+ *
-+ * This callback may be called from different threads if the decoder is
-+ * multi-threaded, but not from more than one thread simultaneously.
-+ *
-+ * @param fmt list of formats which may be used in the current
-+ * configuration, terminated by AV_PIX_FMT_NONE.
-+ * @warning Behavior is undefined if the callback returns a value other
-+ * than one of the formats in fmt or AV_PIX_FMT_NONE.
-+ * @return the chosen format or AV_PIX_FMT_NONE
-+ */
-+ enum AVPixelFormat (*get_format)(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+ /**
-+ * maximum number of B-frames between non-B-frames
-+ * Note: The output will be delayed by max_b_frames+1 relative to the input.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_b_frames;
-+
-+ /**
-+ * qscale factor between IP and B-frames
-+ * If > 0 then the last P-frame quantizer will be used (q=
-+ * lastp_q*factor+offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_factor;
-+
-+ /**
-+ * qscale offset between IP and B-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_offset;
-+
-+ /**
-+ * Size of the frame reordering buffer in the decoder.
-+ * For MPEG-2 it is 1 IPB or 0 low delay IP.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int has_b_frames;
-+
-+ /**
-+ * qscale factor between P- and I-frames
-+ * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor +
-+ * offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_factor;
-+
-+ /**
-+ * qscale offset between P and I-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_offset;
-+
-+ /**
-+ * luminance masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float lumi_masking;
-+
-+ /**
-+ * temporary complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float temporal_cplx_masking;
-+
-+ /**
-+ * spatial complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float spatial_cplx_masking;
-+
-+ /**
-+ * p block masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float p_masking;
-+
-+ /**
-+ * darkness masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float dark_masking;
-+
-+ /**
-+ * slice count
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user (or 0).
-+ */
-+ int slice_count;
-+
-+ /**
-+ * slice offsets in the frame in bytes
-+ * - encoding: Set/allocated by libavcodec.
-+ * - decoding: Set/allocated by user (or NULL).
-+ */
-+ int* slice_offset;
-+
-+ /**
-+ * sample aspect ratio (0 if unknown)
-+ * That is the width of a pixel divided by the height of the pixel.
-+ * Numerator and denominator must be relatively prime and smaller than 256 for
-+ * some video standards.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_cmp;
-+ /**
-+ * subpixel motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_sub_cmp;
-+ /**
-+ * macroblock comparison function (not supported yet)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_cmp;
-+ /**
-+ * interlaced DCT comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int ildct_cmp;
-+#define FF_CMP_SAD 0
-+#define FF_CMP_SSE 1
-+#define FF_CMP_SATD 2
-+#define FF_CMP_DCT 3
-+#define FF_CMP_PSNR 4
-+#define FF_CMP_BIT 5
-+#define FF_CMP_RD 6
-+#define FF_CMP_ZERO 7
-+#define FF_CMP_VSAD 8
-+#define FF_CMP_VSSE 9
-+#define FF_CMP_NSSE 10
-+#define FF_CMP_W53 11
-+#define FF_CMP_W97 12
-+#define FF_CMP_DCTMAX 13
-+#define FF_CMP_DCT264 14
-+#define FF_CMP_MEDIAN_SAD 15
-+#define FF_CMP_CHROMA 256
-+
-+ /**
-+ * ME diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dia_size;
-+
-+ /**
-+ * amount of previous MV predictors (2a+1 x 2a+1 square)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int last_predictor_count;
-+
-+ /**
-+ * motion estimation prepass comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_pre_cmp;
-+
-+ /**
-+ * ME prepass diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int pre_dia_size;
-+
-+ /**
-+ * subpel ME quality
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_subpel_quality;
-+
-+ /**
-+ * maximum motion estimation search range in subpel units
-+ * If 0 then no limit.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_range;
-+
-+ /**
-+ * slice flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int slice_flags;
-+#define SLICE_FLAG_CODED_ORDER \
-+ 0x0001 ///< draw_horiz_band() is called in coded order instead of display
-+#define SLICE_FLAG_ALLOW_FIELD \
-+ 0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
-+#define SLICE_FLAG_ALLOW_PLANE \
-+ 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-+
-+ /**
-+ * macroblock decision mode
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_decision;
-+#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp
-+#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits
-+#define FF_MB_DECISION_RD 2 ///< rate distortion
-+
-+ /**
-+ * custom intra quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* intra_matrix;
-+
-+ /**
-+ * custom inter quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* inter_matrix;
-+
-+ /**
-+ * precision of the intra DC coefficient - 8
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec
-+ */
-+ int intra_dc_precision;
-+
-+ /**
-+ * Number of macroblock rows at the top which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_top;
-+
-+ /**
-+ * Number of macroblock rows at the bottom which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_bottom;
-+
-+ /**
-+ * minimum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmin;
-+
-+ /**
-+ * maximum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmax;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int bidir_refine;
-+
-+ /**
-+ * minimum GOP size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int keyint_min;
-+
-+ /**
-+ * number of reference frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by lavc.
-+ */
-+ int refs;
-+
-+ /**
-+ * Note: Value depends upon the compare function used for fullpel ME.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mv0_threshold;
-+
-+ /**
-+ * Chromaticity coordinates of the source primaries.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorPrimaries color_primaries;
-+
-+ /**
-+ * Color Transfer Characteristic.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ /**
-+ * This defines the location of chroma samples.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVChromaLocation chroma_sample_location;
-+
-+ /**
-+ * Number of slices.
-+ * Indicates number of picture subdivisions. Used for parallelized
-+ * decoding.
-+ * - encoding: Set by user
-+ * - decoding: unused
-+ */
-+ int slices;
-+
-+ /** Field order
-+ * - encoding: set by libavcodec
-+ * - decoding: Set by user.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /* audio only */
-+ int sample_rate; ///< samples per second
-+ int channels; ///< number of audio channels
-+
-+ /**
-+ * audio sample format
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVSampleFormat sample_fmt; ///< sample format
-+
-+ /* The following data should not be initialized. */
-+ /**
-+ * Number of samples per channel in an audio frame.
-+ *
-+ * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-+ * except the last must contain exactly frame_size samples per channel.
-+ * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then
-+ * the frame size is not restricted.
-+ * - decoding: may be set by some decoders to indicate constant frame size
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Frame counter, set by libavcodec.
-+ *
-+ * - decoding: total number of frames returned from the decoder so far.
-+ * - encoding: total number of frames passed to the encoder so far.
-+ *
-+ * @note the counter is not incremented if encoding/decoding resulted in
-+ * an error.
-+ */
-+ int frame_number;
-+
-+ /**
-+ * number of bytes per packet if constant and known or 0
-+ * Used by some WAV based audio codecs.
-+ */
-+ int block_align;
-+
-+ /**
-+ * Audio cutoff bandwidth (0 means "automatic")
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int cutoff;
-+
-+ /**
-+ * Audio channel layout.
-+ * - encoding: set by user.
-+ * - decoding: set by user, may be overwritten by libavcodec.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * Request decoder to use this channel layout if it can (0 for default)
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ uint64_t request_channel_layout;
-+
-+ /**
-+ * Type of service that the audio stream conveys.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVAudioServiceType audio_service_type;
-+
-+ /**
-+ * desired sample format
-+ * - encoding: Not used.
-+ * - decoding: Set by user.
-+ * Decoder will decode to this format if it can.
-+ */
-+ enum AVSampleFormat request_sample_fmt;
-+
-+ /**
-+ * This callback is called at the beginning of each frame to get data
-+ * buffer(s) for it. There may be one contiguous buffer for all the data or
-+ * there may be a buffer per each data plane or anything in between. What
-+ * this means is, you may set however many entries in buf[] you feel
-+ * necessary. Each buffer must be reference-counted using the AVBuffer API
-+ * (see description of buf[] below).
-+ *
-+ * The following fields will be set in the frame before this callback is
-+ * called:
-+ * - format
-+ * - width, height (video only)
-+ * - sample_rate, channel_layout, nb_samples (audio only)
-+ * Their values may differ from the corresponding values in
-+ * AVCodecContext. This callback must use the frame values, not the codec
-+ * context values, to calculate the required buffer size.
-+ *
-+ * This callback must fill the following fields in the frame:
-+ * - data[]
-+ * - linesize[]
-+ * - extended_data:
-+ * * if the data is planar audio with more than 8 channels, then this
-+ * callback must allocate and fill extended_data to contain all pointers
-+ * to all data planes. data[] must hold as many pointers as it can.
-+ * extended_data must be allocated with av_malloc() and will be freed in
-+ * av_frame_unref().
-+ * * otherwise extended_data must point to data
-+ * - buf[] must contain one or more pointers to AVBufferRef structures. Each
-+ * of the frame's data and extended_data pointers must be contained in these.
-+ * That is, one AVBufferRef for each allocated chunk of memory, not
-+ * necessarily one AVBufferRef per data[] entry. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
-+ * this callback and filled with the extra buffers if there are more
-+ * buffers than buf[] can hold. extended_buf will be freed in
-+ * av_frame_unref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
-+ * avcodec_default_get_buffer2() instead of providing buffers allocated by
-+ * some other means.
-+ *
-+ * Each data plane must be aligned to the maximum required by the target
-+ * CPU.
-+ *
-+ * @see avcodec_default_get_buffer2()
-+ *
-+ * Video:
-+ *
-+ * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
-+ * (read and/or written to if it is writable) later by libavcodec.
-+ *
-+ * avcodec_align_dimensions2() should be used to find the required width and
-+ * height, as they normally need to be rounded up to the next multiple of 16.
-+ *
-+ * Some decoders do not support linesizes changing between frames.
-+ *
-+ * If frame multithreading is used, this callback may be called from a
-+ * different thread, but not from more than one at once. Does not need to be
-+ * reentrant.
-+ *
-+ * @see avcodec_align_dimensions2()
-+ *
-+ * Audio:
-+ *
-+ * Decoders request a buffer of a particular size by setting
-+ * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
-+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
-+ * to a smaller value in the output frame.
-+ *
-+ * As a convenience, av_samples_get_buffer_size() and
-+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
-+ * functions to find the required data size and to fill data pointers and
-+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-+ * since all planes must be the same size.
-+ *
-+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-+ *
-+ * - encoding: unused
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*get_buffer2)(struct AVCodecContext* s, AVFrame* frame, int flags);
-+
-+ /* - encoding parameters */
-+ float qcompress; ///< amount of qscale change between easy & hard scenes
-+ ///< (0.0-1.0)
-+ float qblur; ///< amount of qscale smoothing over time (0.0-1.0)
-+
-+ /**
-+ * minimum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmin;
-+
-+ /**
-+ * maximum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmax;
-+
-+ /**
-+ * maximum quantizer difference between frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_qdiff;
-+
-+ /**
-+ * decoder bitstream buffer size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_buffer_size;
-+
-+ /**
-+ * ratecontrol override, see RcOverride
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ int rc_override_count;
-+ RcOverride* rc_override;
-+
-+ /**
-+ * maximum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: Set by user, may be overwritten by libavcodec.
-+ */
-+ int64_t rc_max_rate;
-+
-+ /**
-+ * minimum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int64_t rc_min_rate;
-+
-+ /**
-+ * Ratecontrol attempt to use, at maximum, <value> of what can be used without
-+ * an underflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_max_available_vbv_use;
-+
-+ /**
-+ * Ratecontrol attempt to use, at least, <value> times the amount needed to
-+ * prevent a vbv overflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_min_vbv_overflow_use;
-+
-+ /**
-+ * Number of bits which should be loaded into the rc buffer before decoding
-+ * starts.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_initial_buffer_occupancy;
-+
-+ /**
-+ * trellis RD quantization
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int trellis;
-+
-+ /**
-+ * pass1 encoding statistics output buffer
-+ * - encoding: Set by libavcodec.
-+ * - decoding: unused
-+ */
-+ char* stats_out;
-+
-+ /**
-+ * pass2 encoding statistics input buffer
-+ * Concatenated stuff from stats_out of pass1 should be placed here.
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ char* stats_in;
-+
-+ /**
-+ * Work around bugs in encoders which sometimes cannot be detected
-+ * automatically.
-+ * - encoding: Set by user
-+ * - decoding: Set by user
-+ */
-+ int workaround_bugs;
-+#define FF_BUG_AUTODETECT 1 ///< autodetection
-+#define FF_BUG_XVID_ILACE 4
-+#define FF_BUG_UMP4 8
-+#define FF_BUG_NO_PADDING 16
-+#define FF_BUG_AMV 32
-+#define FF_BUG_QPEL_CHROMA 64
-+#define FF_BUG_STD_QPEL 128
-+#define FF_BUG_QPEL_CHROMA2 256
-+#define FF_BUG_DIRECT_BLOCKSIZE 512
-+#define FF_BUG_EDGE 1024
-+#define FF_BUG_HPEL_CHROMA 2048
-+#define FF_BUG_DC_CLIP 4096
-+#define FF_BUG_MS \
-+ 8192 ///< Work around various bugs in Microsoft's broken decoders.
-+#define FF_BUG_TRUNCATED 16384
-+#define FF_BUG_IEDGE 32768
-+
-+ /**
-+ * strictly follow the standard (MPEG-4, ...).
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ * Setting this to STRICT or higher means the encoder and decoder will
-+ * generally do stupid things, whereas setting it to unofficial or lower
-+ * will mean the encoder might produce output that is not supported by all
-+ * spec-compliant decoders. Decoders don't differentiate between normal,
-+ * unofficial and experimental (that is, they always try to decode things
-+ * when they can) unless they are explicitly asked to behave stupidly
-+ * (=strictly conform to the specs)
-+ */
-+ int strict_std_compliance;
-+#define FF_COMPLIANCE_VERY_STRICT \
-+ 2 ///< Strictly conform to an older more strict version of the spec or
-+ ///< reference software.
-+#define FF_COMPLIANCE_STRICT \
-+ 1 ///< Strictly conform to all the things in the spec no matter what
-+ ///< consequences.
-+#define FF_COMPLIANCE_NORMAL 0
-+#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions
-+#define FF_COMPLIANCE_EXPERIMENTAL \
-+ -2 ///< Allow nonstandardized experimental things.
-+
-+ /**
-+ * error concealment flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int error_concealment;
-+#define FF_EC_GUESS_MVS 1
-+#define FF_EC_DEBLOCK 2
-+#define FF_EC_FAVOR_INTER 256
-+
-+ /**
-+ * debug
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int debug;
-+#define FF_DEBUG_PICT_INFO 1
-+#define FF_DEBUG_RC 2
-+#define FF_DEBUG_BITSTREAM 4
-+#define FF_DEBUG_MB_TYPE 8
-+#define FF_DEBUG_QP 16
-+#define FF_DEBUG_DCT_COEFF 0x00000040
-+#define FF_DEBUG_SKIP 0x00000080
-+#define FF_DEBUG_STARTCODE 0x00000100
-+#define FF_DEBUG_ER 0x00000400
-+#define FF_DEBUG_MMCO 0x00000800
-+#define FF_DEBUG_BUGS 0x00001000
-+#define FF_DEBUG_BUFFERS 0x00008000
-+#define FF_DEBUG_THREADS 0x00010000
-+#define FF_DEBUG_GREEN_MD 0x00800000
-+#define FF_DEBUG_NOMC 0x01000000
-+
-+ /**
-+ * Error recognition; may misdetect some more or less valid parts as errors.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int err_recognition;
-+
-+/**
-+ * Verify checksums embedded in the bitstream (could be of either encoded or
-+ * decoded data, depending on the codec) and print an error message on mismatch.
-+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
-+ * decoder returning an error.
-+ */
-+#define AV_EF_CRCCHECK (1 << 0)
-+#define AV_EF_BITSTREAM (1 << 1) ///< detect bitstream specification deviations
-+#define AV_EF_BUFFER (1 << 2) ///< detect improper bitstream length
-+#define AV_EF_EXPLODE (1 << 3) ///< abort decoding on minor error detection
-+
-+#define AV_EF_IGNORE_ERR (1 << 15) ///< ignore errors and continue
-+#define AV_EF_CAREFUL \
-+ (1 << 16) ///< consider things that violate the spec, are fast to calculate
-+ ///< and have not been seen in the wild as errors
-+#define AV_EF_COMPLIANT \
-+ (1 << 17) ///< consider all spec non compliances as errors
-+#define AV_EF_AGGRESSIVE \
-+ (1 << 18) ///< consider things that a sane encoder should not do as an error
-+
-+ /**
-+ * opaque 64-bit number (generally a PTS) that will be reordered and
-+ * output in AVFrame.reordered_opaque
-+ * - encoding: Set by libavcodec to the reordered_opaque of the input
-+ * frame corresponding to the last returned packet. Only
-+ * supported by encoders with the
-+ * AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
-+ * - decoding: Set by user.
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Hardware accelerator in use
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec
-+ */
-+ const struct AVHWAccel* hwaccel;
-+
-+ /**
-+ * Hardware accelerator context.
-+ * For some hardware accelerators, a global context needs to be
-+ * provided by the user. In that case, this holds display-dependent
-+ * data FFmpeg cannot instantiate itself. Please refer to the
-+ * FFmpeg HW accelerator documentation to know how to fill this.
-+ * - encoding: unused
-+ * - decoding: Set by user
-+ */
-+ void* hwaccel_context;
-+
-+ /**
-+ * error
-+ * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
-+ * - decoding: unused
-+ */
-+ uint64_t error[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * DCT algorithm, see FF_DCT_* below
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dct_algo;
-+#define FF_DCT_AUTO 0
-+#define FF_DCT_FASTINT 1
-+#define FF_DCT_INT 2
-+#define FF_DCT_MMX 3
-+#define FF_DCT_ALTIVEC 5
-+#define FF_DCT_FAAN 6
-+
-+ /**
-+ * IDCT algorithm, see FF_IDCT_* below.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int idct_algo;
-+#define FF_IDCT_AUTO 0
-+#define FF_IDCT_INT 1
-+#define FF_IDCT_SIMPLE 2
-+#define FF_IDCT_SIMPLEMMX 3
-+#define FF_IDCT_ARM 7
-+#define FF_IDCT_ALTIVEC 8
-+#define FF_IDCT_SIMPLEARM 10
-+#define FF_IDCT_XVID 14
-+#define FF_IDCT_SIMPLEARMV5TE 16
-+#define FF_IDCT_SIMPLEARMV6 17
-+#define FF_IDCT_FAAN 20
-+#define FF_IDCT_SIMPLENEON 22
-+#define FF_IDCT_NONE \
-+ 24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
-+#define FF_IDCT_SIMPLEAUTO 128
-+
-+ /**
-+ * bits per sample/pixel from the demuxer (needed for huffyuv).
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user.
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * Bits per sample/pixel of internal libavcodec pixel/sample format.
-+ * - encoding: set by user.
-+ * - decoding: set by libavcodec.
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int lowres;
-+
-+ /**
-+ * thread count
-+ * is used to decide how many independent tasks should be passed to execute()
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int thread_count;
-+
-+ /**
-+ * Which multithreading methods to use.
-+ * Use of FF_THREAD_FRAME will increase decoding delay by one frame per
-+ * thread, so clients which cannot provide future frames should not use it.
-+ *
-+ * - encoding: Set by user, otherwise the default is used.
-+ * - decoding: Set by user, otherwise the default is used.
-+ */
-+ int thread_type;
-+#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
-+#define FF_THREAD_SLICE \
-+ 2 ///< Decode more than one part of a single frame at once
-+
-+ /**
-+ * Which multithreading methods are in use by the codec.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int active_thread_type;
-+
-+#if FF_API_THREAD_SAFE_CALLBACKS
-+ /**
-+ * Set by the client if its custom get_buffer() callback can be called
-+ * synchronously from another thread, which allows faster multithreaded
-+ * decoding. draw_horiz_band() will be called from other threads regardless of
-+ * this setting. Ignored if the default get_buffer() is used.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ *
-+ * @deprecated the custom get_buffer2() callback should always be
-+ * thread-safe. Thread-unsafe get_buffer2() implementations will be
-+ * invalid starting with LIBAVCODEC_VERSION_MAJOR=60; in other words,
-+ * libavcodec will behave as if this field was always set to 1.
-+ * Callers that want to be forward compatible with future libavcodec
-+ * versions should wrap access to this field in
-+ * #if LIBAVCODEC_VERSION_MAJOR < 60
-+ */
-+ attribute_deprecated int thread_safe_callbacks;
-+#endif
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * @param count the number of things to execute
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg), void* arg2,
-+ int* ret, int count, int size);
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * Also see avcodec_thread_init and e.g. the --enable-pthread configure
-+ * option.
-+ * @param c context passed also to func
-+ * @param count the number of things to execute
-+ * @param arg2 argument passed unchanged to func
-+ * @param ret return values of executed functions, must have space for "count"
-+ * values. May be NULL.
-+ * @param func function that will be called count times, with jobnr from 0 to
-+ * count-1. threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS
-+ * and so that no two instances of func executing at the same time will have
-+ * the same threadnr.
-+ * @return always 0 currently, but code should handle a future improvement
-+ * where when any call to func returns < 0 no further calls to func may be
-+ * done and < 0 is returned.
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute2)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg, int jobnr,
-+ int threadnr),
-+ void* arg2, int* ret, int count);
-+
-+ /**
-+ * noise vs. sse weight for the nsse comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int nsse_weight;
-+
-+ /**
-+ * profile
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int profile;
-+#define FF_PROFILE_UNKNOWN -99
-+#define FF_PROFILE_RESERVED -100
-+
-+#define FF_PROFILE_AAC_MAIN 0
-+#define FF_PROFILE_AAC_LOW 1
-+#define FF_PROFILE_AAC_SSR 2
-+#define FF_PROFILE_AAC_LTP 3
-+#define FF_PROFILE_AAC_HE 4
-+#define FF_PROFILE_AAC_HE_V2 28
-+#define FF_PROFILE_AAC_LD 22
-+#define FF_PROFILE_AAC_ELD 38
-+#define FF_PROFILE_MPEG2_AAC_LOW 128
-+#define FF_PROFILE_MPEG2_AAC_HE 131
-+
-+#define FF_PROFILE_DNXHD 0
-+#define FF_PROFILE_DNXHR_LB 1
-+#define FF_PROFILE_DNXHR_SQ 2
-+#define FF_PROFILE_DNXHR_HQ 3
-+#define FF_PROFILE_DNXHR_HQX 4
-+#define FF_PROFILE_DNXHR_444 5
-+
-+#define FF_PROFILE_DTS 20
-+#define FF_PROFILE_DTS_ES 30
-+#define FF_PROFILE_DTS_96_24 40
-+#define FF_PROFILE_DTS_HD_HRA 50
-+#define FF_PROFILE_DTS_HD_MA 60
-+#define FF_PROFILE_DTS_EXPRESS 70
-+
-+#define FF_PROFILE_MPEG2_422 0
-+#define FF_PROFILE_MPEG2_HIGH 1
-+#define FF_PROFILE_MPEG2_SS 2
-+#define FF_PROFILE_MPEG2_SNR_SCALABLE 3
-+#define FF_PROFILE_MPEG2_MAIN 4
-+#define FF_PROFILE_MPEG2_SIMPLE 5
-+
-+#define FF_PROFILE_H264_CONSTRAINED (1 << 9) // 8+1; constraint_set1_flag
-+#define FF_PROFILE_H264_INTRA (1 << 11) // 8+3; constraint_set3_flag
-+
-+#define FF_PROFILE_H264_BASELINE 66
-+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66 | FF_PROFILE_H264_CONSTRAINED)
-+#define FF_PROFILE_H264_MAIN 77
-+#define FF_PROFILE_H264_EXTENDED 88
-+#define FF_PROFILE_H264_HIGH 100
-+#define FF_PROFILE_H264_HIGH_10 110
-+#define FF_PROFILE_H264_HIGH_10_INTRA (110 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
-+#define FF_PROFILE_H264_HIGH_422 122
-+#define FF_PROFILE_H264_HIGH_422_INTRA (122 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_STEREO_HIGH 128
-+#define FF_PROFILE_H264_HIGH_444 144
-+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
-+#define FF_PROFILE_H264_HIGH_444_INTRA (244 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_CAVLC_444 44
-+
-+#define FF_PROFILE_VC1_SIMPLE 0
-+#define FF_PROFILE_VC1_MAIN 1
-+#define FF_PROFILE_VC1_COMPLEX 2
-+#define FF_PROFILE_VC1_ADVANCED 3
-+
-+#define FF_PROFILE_MPEG4_SIMPLE 0
-+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1
-+#define FF_PROFILE_MPEG4_CORE 2
-+#define FF_PROFILE_MPEG4_MAIN 3
-+#define FF_PROFILE_MPEG4_N_BIT 4
-+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5
-+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6
-+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7
-+#define FF_PROFILE_MPEG4_HYBRID 8
-+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9
-+#define FF_PROFILE_MPEG4_CORE_SCALABLE 10
-+#define FF_PROFILE_MPEG4_ADVANCED_CODING 11
-+#define FF_PROFILE_MPEG4_ADVANCED_CORE 12
-+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
-+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
-+
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 1
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 2
-+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 32768
-+#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
-+#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
-+
-+#define FF_PROFILE_VP9_0 0
-+#define FF_PROFILE_VP9_1 1
-+#define FF_PROFILE_VP9_2 2
-+#define FF_PROFILE_VP9_3 3
-+
-+#define FF_PROFILE_HEVC_MAIN 1
-+#define FF_PROFILE_HEVC_MAIN_10 2
-+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
-+#define FF_PROFILE_HEVC_REXT 4
-+
-+#define FF_PROFILE_VVC_MAIN_10 1
-+#define FF_PROFILE_VVC_MAIN_10_444 33
-+
-+#define FF_PROFILE_AV1_MAIN 0
-+#define FF_PROFILE_AV1_HIGH 1
-+#define FF_PROFILE_AV1_PROFESSIONAL 2
-+
-+#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT 0xc0
-+#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
-+#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT 0xc2
-+#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS 0xc3
-+#define FF_PROFILE_MJPEG_JPEG_LS 0xf7
-+
-+#define FF_PROFILE_SBC_MSBC 1
-+
-+#define FF_PROFILE_PRORES_PROXY 0
-+#define FF_PROFILE_PRORES_LT 1
-+#define FF_PROFILE_PRORES_STANDARD 2
-+#define FF_PROFILE_PRORES_HQ 3
-+#define FF_PROFILE_PRORES_4444 4
-+#define FF_PROFILE_PRORES_XQ 5
-+
-+#define FF_PROFILE_ARIB_PROFILE_A 0
-+#define FF_PROFILE_ARIB_PROFILE_C 1
-+
-+#define FF_PROFILE_KLVA_SYNC 0
-+#define FF_PROFILE_KLVA_ASYNC 1
-+
-+ /**
-+ * level
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int level;
-+#define FF_LEVEL_UNKNOWN -99
-+
-+ /**
-+ * Skip loop filtering for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_loop_filter;
-+
-+ /**
-+ * Skip IDCT/dequantization for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_idct;
-+
-+ /**
-+ * Skip decoding for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_frame;
-+
-+ /**
-+ * Header containing style information for text subtitles.
-+ * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-+ * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-+ * the Format line following. It shouldn't include any Dialogue line.
-+ * - encoding: Set/allocated/freed by user (before avcodec_open2())
-+ * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-+ */
-+ uint8_t* subtitle_header;
-+ int subtitle_header_size;
-+
-+ /**
-+ * Audio only. The number of "priming" samples (padding) inserted by the
-+ * encoder at the beginning of the audio. I.e. this number of leading
-+ * decoded samples must be discarded by the caller to get the original audio
-+ * without leading padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: Set by libavcodec. The timestamps on the output packets are
-+ * adjusted by the encoder so that they always refer to the
-+ * first sample of the data actually contained in the packet,
-+ * including any added padding. E.g. if the timebase is
-+ * 1/samplerate and the timestamp of the first input sample is
-+ * 0, the timestamp of the first output packet will be
-+ * -initial_padding.
-+ */
-+ int initial_padding;
-+
-+ /**
-+ * - decoding: For codecs that store a framerate value in the compressed
-+ * bitstream, the decoder may export it here. { 0, 1} when
-+ * unknown.
-+ * - encoding: May be used to signal the framerate of CFR content to an
-+ * encoder.
-+ */
-+ AVRational framerate;
-+
-+ /**
-+ * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx.
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec before calling get_format()
-+ */
-+ enum AVPixelFormat sw_pix_fmt;
-+
-+ /**
-+ * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
-+ * - encoding unused.
-+ * - decoding set by user.
-+ */
-+ AVRational pkt_timebase;
-+
-+ /**
-+ * AVCodecDescriptor
-+ * - encoding: unused.
-+ * - decoding: set by libavcodec.
-+ */
-+ const AVCodecDescriptor* codec_descriptor;
-+
-+ /**
-+ * Current statistics for PTS correction.
-+ * - decoding: maintained and used by libavcodec, not intended to be used by
-+ * user apps
-+ * - encoding: unused
-+ */
-+ int64_t
-+ pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
-+ int64_t
-+ pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
-+ int64_t pts_correction_last_pts; /// PTS of the last frame
-+ int64_t pts_correction_last_dts; /// DTS of the last frame
-+
-+ /**
-+ * Character encoding of the input subtitles file.
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ char* sub_charenc;
-+
-+ /**
-+ * Subtitles character encoding mode. Formats or codecs might be adjusting
-+ * this setting (if they are doing the conversion themselves for instance).
-+ * - decoding: set by libavcodec
-+ * - encoding: unused
-+ */
-+ int sub_charenc_mode;
-+#define FF_SUB_CHARENC_MODE_DO_NOTHING \
-+ -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8,
-+ ///< or the codec is bitmap for instance)
-+#define FF_SUB_CHARENC_MODE_AUTOMATIC \
-+ 0 ///< libavcodec will select the mode itself
-+#define FF_SUB_CHARENC_MODE_PRE_DECODER \
-+ 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the
-+ ///< decoder, requires iconv
-+#define FF_SUB_CHARENC_MODE_IGNORE \
-+ 2 ///< neither convert the subtitles, nor check them for valid UTF-8
-+
-+ /**
-+ * Skip processing alpha if supported by codec.
-+ * Note that if the format uses pre-multiplied alpha (common with VP6,
-+ * and recommended due to better video quality/compression)
-+ * the image will look as if alpha-blended onto a black background.
-+ * However for formats that do not use pre-multiplied alpha
-+ * there might be serious artefacts (though e.g. libswscale currently
-+ * assumes pre-multiplied alpha anyway).
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int skip_alpha;
-+
-+ /**
-+ * Number of samples to skip after a discontinuity
-+ * - decoding: unused
-+ * - encoding: set by libavcodec
-+ */
-+ int seek_preroll;
-+
-+#if FF_API_DEBUG_MV
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int debug_mv;
-+# define FF_DEBUG_VIS_MV_P_FOR \
-+ 0x00000001 // visualize forward predicted MVs of P frames
-+# define FF_DEBUG_VIS_MV_B_FOR \
-+ 0x00000002 // visualize forward predicted MVs of B frames
-+# define FF_DEBUG_VIS_MV_B_BACK \
-+ 0x00000004 // visualize backward predicted MVs of B frames
-+#endif
-+
-+ /**
-+ * custom intra quantization matrix
-+ * - encoding: Set by user, can be NULL.
-+ * - decoding: unused.
-+ */
-+ uint16_t* chroma_intra_matrix;
-+
-+ /**
-+ * dump format separator.
-+ * can be ", " or "\n " or anything else
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ uint8_t* dump_separator;
-+
-+ /**
-+ * ',' separated list of allowed decoders.
-+ * If NULL then all are allowed
-+ * - encoding: unused
-+ * - decoding: set by user
-+ */
-+ char* codec_whitelist;
-+
-+ /**
-+ * Properties of the stream that gets decoded
-+ * - encoding: unused
-+ * - decoding: set by libavcodec
-+ */
-+ unsigned properties;
-+#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001
-+#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
-+#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004
-+
-+ /**
-+ * Additional data associated with the entire coded stream.
-+ *
-+ * - decoding: unused
-+ * - encoding: may be set by libavcodec after avcodec_open2().
-+ */
-+ AVPacketSideData* coded_side_data;
-+ int nb_coded_side_data;
-+
-+ /**
-+ * A reference to the AVHWFramesContext describing the input (for encoding)
-+ * or output (decoding) frames. The reference is set by the caller and
-+ * afterwards owned (and freed) by libavcodec - it should never be read by
-+ * the caller after being set.
-+ *
-+ * - decoding: This field should be set by the caller from the get_format()
-+ * callback. The previous reference (if any) will always be
-+ * unreffed by libavcodec before the get_format() call.
-+ *
-+ * If the default get_buffer2() is used with a hwaccel pixel
-+ * format, then this AVHWFramesContext will be used for
-+ * allocating the frame buffers.
-+ *
-+ * - encoding: For hardware encoders configured to use a hwaccel pixel
-+ * format, this field should be set by the caller to a reference
-+ * to the AVHWFramesContext describing input frames.
-+ * AVHWFramesContext.format must be equal to
-+ * AVCodecContext.pix_fmt.
-+ *
-+ * This field should be set before avcodec_open2() is called.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+#if FF_API_SUB_TEXT_FORMAT
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int sub_text_format;
-+# define FF_SUB_TEXT_FMT_ASS 0
-+#endif
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: unused
-+ */
-+ int trailing_padding;
-+
-+ /**
-+ * The number of pixels per image to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_pixels;
-+
-+ /**
-+ * A reference to the AVHWDeviceContext describing the device which will
-+ * be used by a hardware encoder/decoder. The reference is set by the
-+ * caller and afterwards owned (and freed) by libavcodec.
-+ *
-+ * This should be used if either the codec device does not require
-+ * hardware frames or any that are used are to be allocated internally by
-+ * libavcodec. If the user wishes to supply any of the frames used as
-+ * encoder input or decoder output then hw_frames_ctx should be used
-+ * instead. When hw_frames_ctx is set in get_format() for a decoder, this
-+ * field will be ignored while decoding the associated stream segment, but
-+ * may again be used on a following one after another get_format() call.
-+ *
-+ * For both encoders and decoders this field should be set before
-+ * avcodec_open2() is called and must not be written to thereafter.
-+ *
-+ * Note that some decoders may require this field to be set initially in
-+ * order to support hw_frames_ctx at all - in that case, all frames
-+ * contexts used must be created on the same device.
-+ */
-+ AVBufferRef* hw_device_ctx;
-+
-+ /**
-+ * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated
-+ * decoding (if active).
-+ * - encoding: unused
-+ * - decoding: Set by user (either before avcodec_open2(), or in the
-+ * AVCodecContext.get_format callback)
-+ */
-+ int hwaccel_flags;
-+
-+ /**
-+ * Video decoding only. Certain video codecs support cropping, meaning that
-+ * only a sub-rectangle of the decoded frame is intended for display. This
-+ * option controls how cropping is handled by libavcodec.
-+ *
-+ * When set to 1 (the default), libavcodec will apply cropping internally.
-+ * I.e. it will modify the output frame width/height fields and offset the
-+ * data pointers (only by as much as possible while preserving alignment, or
-+ * by the full amount if the AV_CODEC_FLAG_UNALIGNED flag is set) so that
-+ * the frames output by the decoder refer only to the cropped area. The
-+ * crop_* fields of the output frames will be zero.
-+ *
-+ * When set to 0, the width/height fields of the output frames will be set
-+ * to the coded dimensions and the crop_* fields will describe the cropping
-+ * rectangle. Applying the cropping is left to the caller.
-+ *
-+ * @warning When hardware acceleration with opaque output frames is used,
-+ * libavcodec is unable to apply cropping from the top/left border.
-+ *
-+ * @note when this option is set to zero, the width/height fields of the
-+ * AVCodecContext and output AVFrames have different meanings. The codec
-+ * context fields store display dimensions (with the coded dimensions in
-+ * coded_width/height), while the frame fields store the coded dimensions
-+ * (with the display dimensions being determined by the crop_* fields).
-+ */
-+ int apply_cropping;
-+
-+ /*
-+ * Video decoding only. Sets the number of extra hardware frames which
-+ * the decoder will allocate for use by the caller. This must be set
-+ * before avcodec_open2() is called.
-+ *
-+ * Some hardware decoders require all frames that they will use for
-+ * output to be defined in advance before decoding starts. For such
-+ * decoders, the hardware frame pool must therefore be of a fixed size.
-+ * The extra frames set here are on top of any number that the decoder
-+ * needs internally in order to operate normally (for example, frames
-+ * used as reference pictures).
-+ */
-+ int extra_hw_frames;
-+
-+ /**
-+ * The percentage of damaged samples to discard a frame.
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int discard_damaged_percentage;
-+
-+ /**
-+ * The number of samples per frame to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_samples;
-+
-+ /**
-+ * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of
-+ * metadata exported in frame, packet, or coded stream side data by
-+ * decoders and encoders.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int export_side_data;
-+
-+ /**
-+ * This callback is called at the beginning of each packet to get a data
-+ * buffer for it.
-+ *
-+ * The following field will be set in the packet before this callback is
-+ * called:
-+ * - size
-+ * This callback must use the above value to calculate the required buffer
-+ * size, which must padded by at least AV_INPUT_BUFFER_PADDING_SIZE bytes.
-+ *
-+ * In some specific cases, the encoder may not use the entire buffer allocated
-+ * by this callback. This will be reflected in the size value in the packet
-+ * once returned by avcodec_receive_packet().
-+ *
-+ * This callback must fill the following fields in the packet:
-+ * - data: alignment requirements for AVPacket apply, if any. Some
-+ * architectures and encoders may benefit from having aligned data.
-+ * - buf: must contain a pointer to an AVBufferRef structure. The packet's
-+ * data pointer must be contained in it. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_encode_buffer() must call
-+ * avcodec_default_get_encode_buffer() instead of providing a buffer allocated
-+ * by some other means.
-+ *
-+ * The flags field may contain a combination of AV_GET_ENCODE_BUFFER_FLAG_
-+ * flags. They may be used for example to hint what use the buffer may get
-+ * after being created. Implementations of this callback may ignore flags they
-+ * don't understand. If AV_GET_ENCODE_BUFFER_FLAG_REF is set in flags then the
-+ * packet may be reused (read and/or written to if it is writable) later by
-+ * libavcodec.
-+ *
-+ * This callback must be thread-safe, as when frame threading is used, it may
-+ * be called from multiple threads simultaneously.
-+ *
-+ * @see avcodec_default_get_encode_buffer()
-+ *
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: unused
-+ */
-+ int (*get_encode_buffer)(struct AVCodecContext* s, AVPacket* pkt, int flags);
-+} AVCodecContext;
-+
-+struct MpegEncContext;
-+
-+/**
-+ * @defgroup lavc_hwaccel AVHWAccel
-+ *
-+ * @note Nothing in this structure should be accessed by the user. At some
-+ * point in future it will not be externally visible at all.
-+ *
-+ * @{
-+ */
-+typedef struct AVHWAccel {
-+ /**
-+ * Name of the hardware accelerated codec.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ */
-+ const char* name;
-+
-+ /**
-+ * Type of codec implemented by the hardware accelerator.
-+ *
-+ * See AVMEDIA_TYPE_xxx
-+ */
-+ enum AVMediaType type;
-+
-+ /**
-+ * Codec implemented by the hardware accelerator.
-+ *
-+ * See AV_CODEC_ID_xxx
-+ */
-+ enum AVCodecID id;
-+
-+ /**
-+ * Supported pixel format.
-+ *
-+ * Only hardware accelerated formats are supported here.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * Hardware accelerated codec capabilities.
-+ * see AV_HWACCEL_CODEC_CAP_*
-+ */
-+ int capabilities;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ /**
-+ * Allocate a custom buffer
-+ */
-+ int (*alloc_frame)(AVCodecContext* avctx, AVFrame* frame);
-+
-+ /**
-+ * Called at the beginning of each frame or field picture.
-+ *
-+ * Meaningful frame information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ *
-+ * Note that buf can be NULL along with buf_size set to 0.
-+ * Otherwise, this means the whole frame is available at this point.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the frame data buffer base
-+ * @param buf_size the size of the frame in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*start_frame)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for parameter data (SPS/PPS/VPS etc).
-+ *
-+ * Useful for hardware decoders which keep persistent state about the
-+ * video parameters, and need to receive any changes to update that state.
-+ *
-+ * @param avctx the codec context
-+ * @param type the nal unit type
-+ * @param buf the nal unit data buffer
-+ * @param buf_size the size of the nal unit in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_params)(AVCodecContext* avctx, int type, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for each slice.
-+ *
-+ * Meaningful slice information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ * The only exception is XvMC, that works on MB level.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the slice data buffer base
-+ * @param buf_size the size of the slice in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_slice)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Called at the end of each frame or field picture.
-+ *
-+ * The whole picture is parsed at this point and can now be sent
-+ * to the hardware accelerator. This function is mandatory.
-+ *
-+ * @param avctx the codec context
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*end_frame)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of per-frame hardware accelerator private data.
-+ *
-+ * Private data is allocated with av_mallocz() before
-+ * AVCodecContext.get_buffer() and deallocated after
-+ * AVCodecContext.release_buffer().
-+ */
-+ int frame_priv_data_size;
-+
-+ /**
-+ * Called for every Macroblock in a slice.
-+ *
-+ * XvMC uses it to replace the ff_mpv_reconstruct_mb().
-+ * Instead of decoding to raw picture, MB parameters are
-+ * stored in an array provided by the video driver.
-+ *
-+ * @param s the mpeg context
-+ */
-+ void (*decode_mb)(struct MpegEncContext* s);
-+
-+ /**
-+ * Initialize the hwaccel private data.
-+ *
-+ * This will be called from ff_get_format(), after hwaccel and
-+ * hwaccel_context are set and the hwaccel private data in AVCodecInternal
-+ * is allocated.
-+ */
-+ int (*init)(AVCodecContext* avctx);
-+
-+ /**
-+ * Uninitialize the hwaccel private data.
-+ *
-+ * This will be called from get_format() or avcodec_close(), after hwaccel
-+ * and hwaccel_context are already uninitialized.
-+ */
-+ int (*uninit)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of the private data to allocate in
-+ * AVCodecInternal.hwaccel_priv_data.
-+ */
-+ int priv_data_size;
-+
-+ /**
-+ * Internal hwaccel capabilities.
-+ */
-+ int caps_internal;
-+
-+ /**
-+ * Fill the given hw_frames context with current codec parameters. Called
-+ * from get_format. Refer to avcodec_get_hw_frames_parameters() for
-+ * details.
-+ *
-+ * This CAN be called before AVHWAccel.init is called, and you must assume
-+ * that avctx->hwaccel_priv_data is invalid.
-+ */
-+ int (*frame_params)(AVCodecContext* avctx, AVBufferRef* hw_frames_ctx);
-+} AVHWAccel;
-+
-+/**
-+ * HWAccel is experimental and is thus avoided in favor of non experimental
-+ * codecs
-+ */
-+#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
-+
-+/**
-+ * Hardware acceleration should be used for decoding even if the codec level
-+ * used is unknown or higher than the maximum supported level reported by the
-+ * hardware driver.
-+ *
-+ * It's generally a good idea to pass this flag unless you have a specific
-+ * reason not to, as hardware tends to under-report supported levels.
-+ */
-+#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
-+
-+/**
-+ * Hardware acceleration can output YUV pixel formats with a different chroma
-+ * sampling than 4:2:0 and/or other than 8 bits per component.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
-+
-+/**
-+ * Hardware acceleration should still be attempted for decoding when the
-+ * codec profile does not match the reported capabilities of the hardware.
-+ *
-+ * For example, this can be used to try to decode baseline profile H.264
-+ * streams in hardware - it will often succeed, because many streams marked
-+ * as baseline profile actually conform to constrained baseline profile.
-+ *
-+ * @warning If the stream is actually not supported then the behaviour is
-+ * undefined, and may include returning entirely incorrect output
-+ * while indicating success.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
-+
-+/**
-+ * @}
-+ */
-+
-+enum AVSubtitleType {
-+ SUBTITLE_NONE,
-+
-+ SUBTITLE_BITMAP, ///< A bitmap, pict will be set
-+
-+ /**
-+ * Plain text, the text field must be set by the decoder and is
-+ * authoritative. ass and pict fields may contain approximations.
-+ */
-+ SUBTITLE_TEXT,
-+
-+ /**
-+ * Formatted text, the ass field must be set by the decoder and is
-+ * authoritative. pict and text fields may contain approximations.
-+ */
-+ SUBTITLE_ASS,
-+};
-+
-+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-+
-+typedef struct AVSubtitleRect {
-+ int x; ///< top left corner of pict, undefined when pict is not set
-+ int y; ///< top left corner of pict, undefined when pict is not set
-+ int w; ///< width of pict, undefined when pict is not set
-+ int h; ///< height of pict, undefined when pict is not set
-+ int nb_colors; ///< number of colors in pict, undefined when pict is not set
-+
-+ /**
-+ * data+linesize for the bitmap of this subtitle.
-+ * Can be set for text/ass as well once they are rendered.
-+ */
-+ uint8_t* data[4];
-+ int linesize[4];
-+
-+ enum AVSubtitleType type;
-+
-+ char* text; ///< 0 terminated plain UTF-8 text
-+
-+ /**
-+ * 0 terminated ASS/SSA compatible event line.
-+ * The presentation of this is unaffected by the other values in this
-+ * struct.
-+ */
-+ char* ass;
-+
-+ int flags;
-+} AVSubtitleRect;
-+
-+typedef struct AVSubtitle {
-+ uint16_t format; /* 0 = graphics */
-+ uint32_t start_display_time; /* relative to packet pts, in ms */
-+ uint32_t end_display_time; /* relative to packet pts, in ms */
-+ unsigned num_rects;
-+ AVSubtitleRect** rects;
-+ int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
-+} AVSubtitle;
-+
-+/**
-+ * Return the LIBAVCODEC_VERSION_INT constant.
-+ */
-+unsigned avcodec_version(void);
-+
-+/**
-+ * Return the libavcodec build-time configuration.
-+ */
-+const char* avcodec_configuration(void);
-+
-+/**
-+ * Return the libavcodec license.
-+ */
-+const char* avcodec_license(void);
-+
-+/**
-+ * Allocate an AVCodecContext and set its fields to default values. The
-+ * resulting struct should be freed with avcodec_free_context().
-+ *
-+ * @param codec if non-NULL, allocate private data and initialize defaults
-+ * for the given codec. It is illegal to then call avcodec_open2()
-+ * with a different codec.
-+ * If NULL, then the codec-specific defaults won't be initialized,
-+ * which may result in suboptimal default settings (this is
-+ * important mainly for encoders, e.g. libx264).
-+ *
-+ * @return An AVCodecContext filled with default values or NULL on failure.
-+ */
-+AVCodecContext* avcodec_alloc_context3(const AVCodec* codec);
-+
-+/**
-+ * Free the codec context and everything associated with it and write NULL to
-+ * the provided pointer.
-+ */
-+void avcodec_free_context(AVCodecContext** avctx);
-+
-+/**
-+ * Get the AVClass for AVCodecContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_class(void);
-+
-+#if FF_API_GET_FRAME_CLASS
-+/**
-+ * @deprecated This function should not be used.
-+ */
-+attribute_deprecated const AVClass* avcodec_get_frame_class(void);
-+#endif
-+
-+/**
-+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_subtitle_rect_class(void);
-+
-+/**
-+ * Fill the parameters struct based on the values from the supplied codec
-+ * context. Any allocated fields in par are freed and replaced with duplicates
-+ * of the corresponding fields in codec.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure
-+ */
-+int avcodec_parameters_from_context(AVCodecParameters* par,
-+ const AVCodecContext* codec);
-+
-+/**
-+ * Fill the codec context based on the values from the supplied codec
-+ * parameters. Any allocated fields in codec that have a corresponding field in
-+ * par are freed and replaced with duplicates of the corresponding field in par.
-+ * Fields in codec that do not have a counterpart in par are not touched.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_to_context(AVCodecContext* codec,
-+ const AVCodecParameters* par);
-+
-+/**
-+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
-+ * function the context has to be allocated with avcodec_alloc_context3().
-+ *
-+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
-+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
-+ * retrieving a codec.
-+ *
-+ * @warning This function is not thread safe!
-+ *
-+ * @note Always call this function before using decoding routines (such as
-+ * @ref avcodec_receive_frame()).
-+ *
-+ * @code
-+ * av_dict_set(&opts, "b", "2.5M", 0);
-+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
-+ * if (!codec)
-+ * exit(1);
-+ *
-+ * context = avcodec_alloc_context3(codec);
-+ *
-+ * if (avcodec_open2(context, codec, opts) < 0)
-+ * exit(1);
-+ * @endcode
-+ *
-+ * @param avctx The context to initialize.
-+ * @param codec The codec to open this context for. If a non-NULL codec has been
-+ * previously passed to avcodec_alloc_context3() or
-+ * for this context, then this parameter MUST be either NULL or
-+ * equal to the previously passed codec.
-+ * @param options A dictionary filled with AVCodecContext and codec-private
-+ * options. On return this object will be filled with options that were not
-+ * found.
-+ *
-+ * @return zero on success, a negative value on error
-+ * @see avcodec_alloc_context3(), avcodec_find_decoder(),
-+ * avcodec_find_encoder(), av_dict_set(), av_opt_find().
-+ */
-+int avcodec_open2(AVCodecContext* avctx, const AVCodec* codec,
-+ AVDictionary** options);
-+
-+/**
-+ * Close a given AVCodecContext and free all the data associated with it
-+ * (but not the AVCodecContext itself).
-+ *
-+ * Calling this function on an AVCodecContext that hasn't been opened will free
-+ * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
-+ * codec. Subsequent calls will do nothing.
-+ *
-+ * @note Do not use this function. Use avcodec_free_context() to destroy a
-+ * codec context (either open or closed). Opening and closing a codec context
-+ * multiple times is not supported anymore -- use multiple codec contexts
-+ * instead.
-+ */
-+int avcodec_close(AVCodecContext* avctx);
-+
-+/**
-+ * Free all allocated data in the given subtitle struct.
-+ *
-+ * @param sub AVSubtitle to free.
-+ */
-+void avsubtitle_free(AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_decoding
-+ * @{
-+ */
-+
-+/**
-+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
-+ * it can be called by custom get_buffer2() implementations for decoders without
-+ * AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_buffer2(AVCodecContext* s, AVFrame* frame, int flags);
-+
-+/**
-+ * The default callback for AVCodecContext.get_encode_buffer(). It is made
-+ * public so it can be called by custom get_encode_buffer() implementations for
-+ * encoders without AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_encode_buffer(AVCodecContext* s, AVPacket* pkt,
-+ int flags);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you do not use any horizontal
-+ * padding.
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions(AVCodecContext* s, int* width, int* height);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you also ensure that all
-+ * line sizes are a multiple of the respective linesize_align[i].
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions2(AVCodecContext* s, int* width, int* height,
-+ int linesize_align[AV_NUM_DATA_POINTERS]);
-+
-+/**
-+ * Converts AVChromaLocation to swscale x/y chroma position.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+int avcodec_enum_to_chroma_pos(int* xpos, int* ypos, enum AVChromaLocation pos);
-+
-+/**
-+ * Converts swscale x/y chroma position to AVChromaLocation.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-+
-+/**
-+ * Decode a subtitle message.
-+ * Return a negative value on error, otherwise return the number of bytes used.
-+ * If no subtitle could be decompressed, got_sub_ptr is zero.
-+ * Otherwise, the subtitle is stored in *sub.
-+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
-+ * simplicity, because the performance difference is expected to be negligible
-+ * and reusing a get_buffer written for video codecs would probably perform
-+ * badly due to a potentially very different allocation pattern.
-+ *
-+ * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between
-+ * input and output. This means that for some packets they will not immediately
-+ * produce decoded output and need to be flushed at the end of decoding to get
-+ * all the decoded data. Flushing is done by calling this function with packets
-+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
-+ * returning subtitles. It is safe to flush even those decoders that are not
-+ * marked with AV_CODEC_CAP_DELAY, then no subtitles will be returned.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx the codec context
-+ * @param[out] sub The preallocated AVSubtitle in which the decoded subtitle
-+ * will be stored, must be freed with avsubtitle_free if *got_sub_ptr is set.
-+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed,
-+ * otherwise, it is nonzero.
-+ * @param[in] avpkt The input AVPacket containing the input buffer.
-+ */
-+int avcodec_decode_subtitle2(AVCodecContext* avctx, AVSubtitle* sub,
-+ int* got_sub_ptr, AVPacket* avpkt);
-+
-+/**
-+ * Supply raw packet data as input to a decoder.
-+ *
-+ * Internally, this call will copy relevant AVCodecContext fields, which can
-+ * influence decoding per-packet, and apply them when the packet is actually
-+ * decoded. (For example AVCodecContext.skip_frame, which might direct the
-+ * decoder to drop the frame contained by the packet sent with this function.)
-+ *
-+ * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE
-+ * larger than the actual read bytes because some optimized bitstream
-+ * readers read 32 or 64 bits at once and could read over the end.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx codec context
-+ * @param[in] avpkt The input AVPacket. Usually, this will be a single video
-+ * frame, or several complete audio frames.
-+ * Ownership of the packet remains with the caller, and the
-+ * decoder will not write to the packet. The decoder may create
-+ * a reference to the packet data (or copy it if the packet is
-+ * not reference-counted).
-+ * Unlike with older APIs, the packet is always fully consumed,
-+ * and if it contains multiple frames (e.g. some audio codecs),
-+ * will require you to call avcodec_receive_frame() multiple
-+ * times afterwards before you can send a new packet.
-+ * It can be NULL (or an AVPacket with data set to NULL and
-+ * size set to 0); in this case, it is considered a flush
-+ * packet, which signals the end of the stream. Sending the
-+ * first flush packet will return success. Subsequent ones are
-+ * unnecessary and will return AVERROR_EOF. If the decoder
-+ * still has frames buffered, it will return them after sending
-+ * a flush packet.
-+ *
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_frame() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the decoder has been flushed, and no new packets can
-+ * be sent to it (also returned if more than 1 flush
-+ * packet is sent)
-+ * AVERROR(EINVAL): codec not opened, it is an encoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate decoding errors
-+ */
-+int avcodec_send_packet(AVCodecContext* avctx, const AVPacket* avpkt);
-+
-+/**
-+ * Return decoded output data from a decoder.
-+ *
-+ * @param avctx codec context
-+ * @param frame This will be set to a reference-counted video or audio
-+ * frame (depending on the decoder type) allocated by the
-+ * decoder. Note that the function will always call
-+ * av_frame_unref(frame) before doing anything else.
-+ *
-+ * @return
-+ * 0: success, a frame was returned
-+ * AVERROR(EAGAIN): output is not available in this state - user must try
-+ * to send new input
-+ * AVERROR_EOF: the decoder has been fully flushed, and there will be
-+ * no more output frames
-+ * AVERROR(EINVAL): codec not opened, or it is an encoder
-+ * AVERROR_INPUT_CHANGED: current decoded frame has changed parameters
-+ * with respect to first decoded frame. Applicable
-+ * when flag AV_CODEC_FLAG_DROPCHANGED is set.
-+ * other negative values: legitimate decoding errors
-+ */
-+int avcodec_receive_frame(AVCodecContext* avctx, AVFrame* frame);
-+
-+/**
-+ * Supply a raw video or audio frame to the encoder. Use
-+ * avcodec_receive_packet() to retrieve buffered output packets.
-+ *
-+ * @param avctx codec context
-+ * @param[in] frame AVFrame containing the raw audio or video frame to be
-+ * encoded. Ownership of the frame remains with the caller, and the encoder will
-+ * not write to the frame. The encoder may create a reference to the frame data
-+ * (or copy it if the frame is not reference-counted). It can be NULL, in which
-+ * case it is considered a flush packet. This signals the end of the stream. If
-+ * the encoder still has packets buffered, it will return them after this call.
-+ * Once flushing mode has been entered, additional flush packets are ignored,
-+ * and sending frames will return AVERROR_EOF.
-+ *
-+ * For audio:
-+ * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
-+ * can have any number of samples.
-+ * If it is not set, frame->nb_samples must be equal to
-+ * avctx->frame_size for all frames except the last.
-+ * The final frame may be smaller than avctx->frame_size.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_packet() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the encoder has been flushed, and no new frames can
-+ * be sent to it
-+ * AVERROR(EINVAL): codec not opened, it is a decoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_send_frame(AVCodecContext* avctx, const AVFrame* frame);
-+
-+/**
-+ * Read encoded data from the encoder.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt This will be set to a reference-counted packet allocated by the
-+ * encoder. Note that the function will always call
-+ * av_packet_unref(avpkt) before doing anything else.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): output is not available in the current state - user
-+ * must try to send input
-+ * AVERROR_EOF: the encoder has been fully flushed, and there will be
-+ * no more output packets
-+ * AVERROR(EINVAL): codec not opened, or it is a decoder
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_receive_packet(AVCodecContext* avctx, AVPacket* avpkt);
-+
-+/**
-+ * Create and return a AVHWFramesContext with values adequate for hardware
-+ * decoding. This is meant to get called from the get_format callback, and is
-+ * a helper for preparing a AVHWFramesContext for AVCodecContext.hw_frames_ctx.
-+ * This API is for decoding with certain hardware acceleration modes/APIs only.
-+ *
-+ * The returned AVHWFramesContext is not initialized. The caller must do this
-+ * with av_hwframe_ctx_init().
-+ *
-+ * Calling this function is not a requirement, but makes it simpler to avoid
-+ * codec or hardware API specific details when manually allocating frames.
-+ *
-+ * Alternatively to this, an API user can set AVCodecContext.hw_device_ctx,
-+ * which sets up AVCodecContext.hw_frames_ctx fully automatically, and makes
-+ * it unnecessary to call this function or having to care about
-+ * AVHWFramesContext initialization at all.
-+ *
-+ * There are a number of requirements for calling this function:
-+ *
-+ * - It must be called from get_format with the same avctx parameter that was
-+ * passed to get_format. Calling it outside of get_format is not allowed, and
-+ * can trigger undefined behavior.
-+ * - The function is not always supported (see description of return values).
-+ * Even if this function returns successfully, hwaccel initialization could
-+ * fail later. (The degree to which implementations check whether the stream
-+ * is actually supported varies. Some do this check only after the user's
-+ * get_format callback returns.)
-+ * - The hw_pix_fmt must be one of the choices suggested by get_format. If the
-+ * user decides to use a AVHWFramesContext prepared with this API function,
-+ * the user must return the same hw_pix_fmt from get_format.
-+ * - The device_ref passed to this function must support the given hw_pix_fmt.
-+ * - After calling this API function, it is the user's responsibility to
-+ * initialize the AVHWFramesContext (returned by the out_frames_ref
-+ * parameter), and to set AVCodecContext.hw_frames_ctx to it. If done, this must
-+ * be done before returning from get_format (this is implied by the normal
-+ * AVCodecContext.hw_frames_ctx API rules).
-+ * - The AVHWFramesContext parameters may change every time time get_format is
-+ * called. Also, AVCodecContext.hw_frames_ctx is reset before get_format. So
-+ * you are inherently required to go through this process again on every
-+ * get_format call.
-+ * - It is perfectly possible to call this function without actually using
-+ * the resulting AVHWFramesContext. One use-case might be trying to reuse a
-+ * previously initialized AVHWFramesContext, and calling this API function
-+ * only to test whether the required frame parameters have changed.
-+ * - Fields that use dynamically allocated values of any kind must not be set
-+ * by the user unless setting them is explicitly allowed by the documentation.
-+ * If the user sets AVHWFramesContext.free and AVHWFramesContext.user_opaque,
-+ * the new free callback must call the potentially set previous free callback.
-+ * This API call may set any dynamically allocated fields, including the free
-+ * callback.
-+ *
-+ * The function will set at least the following fields on AVHWFramesContext
-+ * (potentially more, depending on hwaccel API):
-+ *
-+ * - All fields set by av_hwframe_ctx_alloc().
-+ * - Set the format field to hw_pix_fmt.
-+ * - Set the sw_format field to the most suited and most versatile format. (An
-+ * implication is that this will prefer generic formats over opaque formats
-+ * with arbitrary restrictions, if possible.)
-+ * - Set the width/height fields to the coded frame size, rounded up to the
-+ * API-specific minimum alignment.
-+ * - Only _if_ the hwaccel requires a pre-allocated pool: set the
-+ * initial_pool_size field to the number of maximum reference surfaces possible
-+ * with the codec, plus 1 surface for the user to work (meaning the user can
-+ * safely reference at most 1 decoded surface at a time), plus additional
-+ * buffering introduced by frame threading. If the hwaccel does not require
-+ * pre-allocation, the field is left to 0, and the decoder will allocate new
-+ * surfaces on demand during decoding.
-+ * - Possibly AVHWFramesContext.hwctx fields, depending on the underlying
-+ * hardware API.
-+ *
-+ * Essentially, out_frames_ref returns the same as av_hwframe_ctx_alloc(), but
-+ * with basic frame parameters set.
-+ *
-+ * The function is stateless, and does not change the AVCodecContext or the
-+ * device_ref AVHWDeviceContext.
-+ *
-+ * @param avctx The context which is currently calling get_format, and which
-+ * implicitly contains all state needed for filling the returned
-+ * AVHWFramesContext properly.
-+ * @param device_ref A reference to the AVHWDeviceContext describing the device
-+ * which will be used by the hardware decoder.
-+ * @param hw_pix_fmt The hwaccel format you are going to return from get_format.
-+ * @param out_frames_ref On success, set to a reference to an _uninitialized_
-+ * AVHWFramesContext, created from the given device_ref.
-+ * Fields will be set to values required for decoding.
-+ * Not changed if an error is returned.
-+ * @return zero on success, a negative value on error. The following error codes
-+ * have special semantics:
-+ * AVERROR(ENOENT): the decoder does not support this functionality. Setup
-+ * is always manual, or it is a decoder which does not
-+ * support setting AVCodecContext.hw_frames_ctx at all,
-+ * or it is a software format.
-+ * AVERROR(EINVAL): it is known that hardware decoding is not supported for
-+ * this configuration, or the device_ref is not supported
-+ * for the hwaccel referenced by hw_pix_fmt.
-+ */
-+int avcodec_get_hw_frames_parameters(AVCodecContext* avctx,
-+ AVBufferRef* device_ref,
-+ enum AVPixelFormat hw_pix_fmt,
-+ AVBufferRef** out_frames_ref);
-+
-+/**
-+ * @defgroup lavc_parsing Frame parsing
-+ * @{
-+ */
-+
-+enum AVPictureStructure {
-+ AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
-+ AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
-+ AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
-+ AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
-+};
-+
-+typedef struct AVCodecParserContext {
-+ void* priv_data;
-+ const struct AVCodecParser* parser;
-+ int64_t frame_offset; /* offset of the current frame */
-+ int64_t cur_offset; /* current offset
-+ (incremented by each av_parser_parse()) */
-+ int64_t next_frame_offset; /* offset of the next frame */
-+ /* video info */
-+ int pict_type; /* XXX: Put it back in AVCodecContext. */
-+ /**
-+ * This field is used for proper frame duration computation in lavf.
-+ * It signals, how much longer the frame duration of the current frame
-+ * is compared to normal frame duration.
-+ *
-+ * frame_duration = (1 + repeat_pict) * time_base
-+ *
-+ * It is used by codecs like H.264 to display telecined material.
-+ */
-+ int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-+ int64_t pts; /* pts of the current frame */
-+ int64_t dts; /* dts of the current frame */
-+
-+ /* private data */
-+ int64_t last_pts;
-+ int64_t last_dts;
-+ int fetch_timestamp;
-+
-+#define AV_PARSER_PTS_NB 4
-+ int cur_frame_start_index;
-+ int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-+
-+ int flags;
-+#define PARSER_FLAG_COMPLETE_FRAMES 0x0001
-+#define PARSER_FLAG_ONCE 0x0002
-+/// Set if the parser has a valid file offset
-+#define PARSER_FLAG_FETCHED_OFFSET 0x0004
-+#define PARSER_FLAG_USE_CODEC_TS 0x1000
-+
-+ int64_t offset; ///< byte offset from starting packet start
-+ int64_t cur_frame_end[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Set by parser to 1 for key frames and 0 for non-key frames.
-+ * It is initialized to -1, so if the parser doesn't set this flag,
-+ * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-+ * will be used.
-+ */
-+ int key_frame;
-+
-+ // Timestamp generation support:
-+ /**
-+ * Synchronization point for start of timestamp generation.
-+ *
-+ * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-+ * (default).
-+ *
-+ * For example, this corresponds to presence of H.264 buffering period
-+ * SEI message.
-+ */
-+ int dts_sync_point;
-+
-+ /**
-+ * Offset of the current timestamp against last timestamp sync point in
-+ * units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain a valid timestamp offset.
-+ *
-+ * Note that the timestamp of sync point has usually a nonzero
-+ * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-+ * the next frame after timestamp sync point will be usually 1.
-+ *
-+ * For example, this corresponds to H.264 cpb_removal_delay.
-+ */
-+ int dts_ref_dts_delta;
-+
-+ /**
-+ * Presentation delay of current frame in units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain valid non-negative timestamp delta (presentation time of a frame
-+ * must not lie in the past).
-+ *
-+ * This delay represents the difference between decoding and presentation
-+ * time of the frame.
-+ *
-+ * For example, this corresponds to H.264 dpb_output_delay.
-+ */
-+ int pts_dts_delta;
-+
-+ /**
-+ * Position of the packet in file.
-+ *
-+ * Analogous to cur_frame_pts/dts
-+ */
-+ int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Byte position of currently parsed frame in stream.
-+ */
-+ int64_t pos;
-+
-+ /**
-+ * Previous frame byte position.
-+ */
-+ int64_t last_pos;
-+
-+ /**
-+ * Duration of the current frame.
-+ * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-+ * For all other types, this is in units of AVCodecContext.time_base.
-+ */
-+ int duration;
-+
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Indicate whether a picture is coded as a frame, top field or bottom field.
-+ *
-+ * For example, H.264 field_pic_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
-+ * equal to 1 and bottom_field_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_TOP_FIELD.
-+ */
-+ enum AVPictureStructure picture_structure;
-+
-+ /**
-+ * Picture number incremented in presentation or output order.
-+ * This field may be reinitialized at the first picture of a new sequence.
-+ *
-+ * For example, this corresponds to H.264 PicOrderCnt.
-+ */
-+ int output_picture_number;
-+
-+ /**
-+ * Dimensions of the decoded video intended for presentation.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Dimensions of the coded video.
-+ */
-+ int coded_width;
-+ int coded_height;
-+
-+ /**
-+ * The format of the coded data, corresponds to enum AVPixelFormat for video
-+ * and for enum AVSampleFormat for audio.
-+ *
-+ * Note that a decoder can have considerable freedom in how exactly it
-+ * decodes the data, so the format reported here might be different from the
-+ * one returned by a decoder.
-+ */
-+ int format;
-+} AVCodecParserContext;
-+
-+typedef struct AVCodecParser {
-+ int codec_ids[7]; /* several codec IDs are permitted */
-+ int priv_data_size;
-+ int (*parser_init)(AVCodecParserContext* s);
-+ /* This callback never returns an error, a negative value means that
-+ * the frame start was in a previous packet. */
-+ int (*parser_parse)(AVCodecParserContext* s, AVCodecContext* avctx,
-+ const uint8_t** poutbuf, int* poutbuf_size,
-+ const uint8_t* buf, int buf_size);
-+ void (*parser_close)(AVCodecParserContext* s);
-+ int (*split)(AVCodecContext* avctx, const uint8_t* buf, int buf_size);
-+} AVCodecParser;
-+
-+/**
-+ * Iterate over all registered codec parsers.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec parser or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodecParser* av_parser_iterate(void** opaque);
-+
-+AVCodecParserContext* av_parser_init(int codec_id);
-+
-+/**
-+ * Parse a packet.
-+ *
-+ * @param s parser context.
-+ * @param avctx codec context.
-+ * @param poutbuf set to pointer to parsed buffer or NULL if not yet
-+ finished.
-+ * @param poutbuf_size set to size of parsed buffer or zero if not yet
-+ finished.
-+ * @param buf input buffer.
-+ * @param buf_size buffer size in bytes without the padding. I.e. the full
-+ buffer size is assumed to be buf_size + AV_INPUT_BUFFER_PADDING_SIZE. To signal
-+ EOF, this should be 0 (so that the last frame can be output).
-+ * @param pts input presentation timestamp.
-+ * @param dts input decoding timestamp.
-+ * @param pos input byte position in stream.
-+ * @return the number of bytes of the input bitstream used.
-+ *
-+ * Example:
-+ * @code
-+ * while(in_len){
-+ * len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
-+ * in_data, in_len,
-+ * pts, dts, pos);
-+ * in_data += len;
-+ * in_len -= len;
-+ *
-+ * if(size)
-+ * decode_frame(data, size);
-+ * }
-+ * @endcode
-+ */
-+int av_parser_parse2(AVCodecParserContext* s, AVCodecContext* avctx,
-+ uint8_t** poutbuf, int* poutbuf_size, const uint8_t* buf,
-+ int buf_size, int64_t pts, int64_t dts, int64_t pos);
-+
-+void av_parser_close(AVCodecParserContext* s);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_encoding
-+ * @{
-+ */
-+
-+int avcodec_encode_subtitle(AVCodecContext* avctx, uint8_t* buf, int buf_size,
-+ const AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_misc Utility functions
-+ * @ingroup libavc
-+ *
-+ * Miscellaneous utility functions related to both encoding and decoding
-+ * (or neither).
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup lavc_misc_pixfmt Pixel formats
-+ *
-+ * Functions for working with pixel formats.
-+ * @{
-+ */
-+
-+/**
-+ * Return a value representing the fourCC code associated to the
-+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
-+ * found.
-+ */
-+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-+
-+/**
-+ * Find the best pixel format to convert to given a certain source pixel
-+ * format. When converting from one pixel format to another, information loss
-+ * may occur. For example, when converting from RGB24 to GRAY, the color
-+ * information will be lost. Similarly, other losses occur when converting from
-+ * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches
-+ * which of the given pixel formats should be used to suffer the least amount of
-+ * loss. The pixel formats from which it chooses one, are determined by the
-+ * pix_fmt_list parameter.
-+ *
-+ *
-+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to
-+ * choose from
-+ * @param[in] src_pix_fmt source pixel format
-+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
-+ * @param[out] loss_ptr Combination of flags informing you what kind of losses
-+ * will occur.
-+ * @return The best pixel format to convert to or -1 if none was found.
-+ */
-+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(
-+ const enum AVPixelFormat* pix_fmt_list, enum AVPixelFormat src_pix_fmt,
-+ int has_alpha, int* loss_ptr);
-+
-+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+/**
-+ * @}
-+ */
-+
-+void avcodec_string(char* buf, int buf_size, AVCodecContext* enc, int encode);
-+
-+int avcodec_default_execute(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2),
-+ void* arg, int* ret, int count, int size);
-+int avcodec_default_execute2(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2, int,
-+ int),
-+ void* arg, int* ret, int count);
-+// FIXME func typedef
-+
-+/**
-+ * Fill AVFrame audio data and linesize pointers.
-+ *
-+ * The buffer buf must be a preallocated buffer with a size big enough
-+ * to contain the specified samples amount. The filled AVFrame data
-+ * pointers will point to this buffer.
-+ *
-+ * AVFrame extended_data channel pointers are allocated if necessary for
-+ * planar audio.
-+ *
-+ * @param frame the AVFrame
-+ * frame->nb_samples must be set prior to calling the
-+ * function. This function fills in frame->data,
-+ * frame->extended_data, frame->linesize[0].
-+ * @param nb_channels channel count
-+ * @param sample_fmt sample format
-+ * @param buf buffer to use for frame data
-+ * @param buf_size size of buffer
-+ * @param align plane size sample alignment (0 = default)
-+ * @return >=0 on success, negative error code on failure
-+ * @todo return the size in bytes required to store the samples in
-+ * case of success, at the next libavutil bump
-+ */
-+int avcodec_fill_audio_frame(AVFrame* frame, int nb_channels,
-+ enum AVSampleFormat sample_fmt, const uint8_t* buf,
-+ int buf_size, int align);
-+
-+/**
-+ * Reset the internal codec state / flush internal buffers. Should be called
-+ * e.g. when seeking or when switching to a different stream.
-+ *
-+ * @note for decoders, this function just releases any references the decoder
-+ * might keep internally, but the caller's references remain valid.
-+ *
-+ * @note for encoders, this function will only do something if the encoder
-+ * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
-+ * will drain any remaining packets, and can then be re-used for a different
-+ * stream (as opposed to sending a null frame which will leave the encoder
-+ * in a permanent EOF state after draining). This can be desirable if the
-+ * cost of tearing down and replacing the encoder instance is high.
-+ */
-+void avcodec_flush_buffers(AVCodecContext* avctx);
-+
-+/**
-+ * Return audio frame duration.
-+ *
-+ * @param avctx codec context
-+ * @param frame_bytes size of the frame, or 0 if unknown
-+ * @return frame duration, in samples, if known. 0 if not able to
-+ * determine.
-+ */
-+int av_get_audio_frame_duration(AVCodecContext* avctx, int frame_bytes);
-+
-+/* memory */
-+
-+/**
-+ * Same behaviour av_fast_malloc but the buffer has additional
-+ * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
-+ *
-+ * In addition the whole buffer will initially and after resizes
-+ * be 0-initialized so that no uninitialized data will ever appear.
-+ */
-+void av_fast_padded_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Same behaviour av_fast_padded_malloc except that buffer will always
-+ * be 0-initialized after call.
-+ */
-+void av_fast_padded_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
-+ * with no corresponding avcodec_close()), 0 otherwise.
-+ */
-+int avcodec_is_open(AVCodecContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVCODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-@@ -0,0 +1,119 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVFFT_H
-+#define AVCODEC_AVFFT_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_fft
-+ * FFT functions
-+ */
-+
-+/**
-+ * @defgroup lavc_fft FFT functions
-+ * @ingroup lavc_misc
-+ *
-+ * @{
-+ */
-+
-+typedef float FFTSample;
-+
-+typedef struct FFTComplex {
-+ FFTSample re, im;
-+} FFTComplex;
-+
-+typedef struct FFTContext FFTContext;
-+
-+/**
-+ * Set up a complex FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param inverse if 0 perform the forward transform, if 1 perform the
-+ * inverse
-+ */
-+FFTContext* av_fft_init(int nbits, int inverse);
-+
-+/**
-+ * Do the permutation needed BEFORE calling ff_fft_calc().
-+ */
-+void av_fft_permute(FFTContext* s, FFTComplex* z);
-+
-+/**
-+ * Do a complex FFT with the parameters defined in av_fft_init(). The
-+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
-+ */
-+void av_fft_calc(FFTContext* s, FFTComplex* z);
-+
-+void av_fft_end(FFTContext* s);
-+
-+FFTContext* av_mdct_init(int nbits, int inverse, double scale);
-+void av_imdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_imdct_half(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_end(FFTContext* s);
-+
-+/* Real Discrete Fourier Transform */
-+
-+enum RDFTransformType {
-+ DFT_R2C,
-+ IDFT_C2R,
-+ IDFT_R2C,
-+ DFT_C2R,
-+};
-+
-+typedef struct RDFTContext RDFTContext;
-+
-+/**
-+ * Set up a real FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param trans the type of transform
-+ */
-+RDFTContext* av_rdft_init(int nbits, enum RDFTransformType trans);
-+void av_rdft_calc(RDFTContext* s, FFTSample* data);
-+void av_rdft_end(RDFTContext* s);
-+
-+/* Discrete Cosine Transform */
-+
-+typedef struct DCTContext DCTContext;
-+
-+enum DCTTransformType {
-+ DCT_II = 0,
-+ DCT_III,
-+ DCT_I,
-+ DST_I,
-+};
-+
-+/**
-+ * Set up DCT.
-+ *
-+ * @param nbits size of the input array:
-+ * (1 << nbits) for DCT-II, DCT-III and DST-I
-+ * (1 << nbits) + 1 for DCT-I
-+ * @param type the type of transform
-+ *
-+ * @note the first element of the input of DST-I is ignored
-+ */
-+DCTContext* av_dct_init(int nbits, enum DCTTransformType type);
-+void av_dct_calc(DCTContext* s, FFTSample* data);
-+void av_dct_end(DCTContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVFFT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-@@ -0,0 +1,320 @@
-+/*
-+ * Bitstream filters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_BSF_H
-+#define AVCODEC_BSF_H
-+
-+#include "libavutil/dict.h"
-+#include "libavutil/log.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec_id.h"
-+#include "codec_par.h"
-+#include "packet.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * The bitstream filter state.
-+ *
-+ * This struct must be allocated with av_bsf_alloc() and freed with
-+ * av_bsf_free().
-+ *
-+ * The fields in the struct will only be changed (by the caller or by the
-+ * filter) as described in their documentation, and are to be considered
-+ * immutable otherwise.
-+ */
-+typedef struct AVBSFContext {
-+ /**
-+ * A class for logging and AVOptions
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * The bitstream filter this context is an instance of.
-+ */
-+ const struct AVBitStreamFilter* filter;
-+
-+ /**
-+ * Opaque filter-specific private data. If filter->priv_class is non-NULL,
-+ * this is an AVOptions-enabled struct.
-+ */
-+ void* priv_data;
-+
-+ /**
-+ * Parameters of the input stream. This field is allocated in
-+ * av_bsf_alloc(), it needs to be filled by the caller before
-+ * av_bsf_init().
-+ */
-+ AVCodecParameters* par_in;
-+
-+ /**
-+ * Parameters of the output stream. This field is allocated in
-+ * av_bsf_alloc(), it is set by the filter in av_bsf_init().
-+ */
-+ AVCodecParameters* par_out;
-+
-+ /**
-+ * The timebase used for the timestamps of the input packets. Set by the
-+ * caller before av_bsf_init().
-+ */
-+ AVRational time_base_in;
-+
-+ /**
-+ * The timebase used for the timestamps of the output packets. Set by the
-+ * filter in av_bsf_init().
-+ */
-+ AVRational time_base_out;
-+} AVBSFContext;
-+
-+typedef struct AVBitStreamFilter {
-+ const char* name;
-+
-+ /**
-+ * A list of codec ids supported by the filter, terminated by
-+ * AV_CODEC_ID_NONE.
-+ * May be NULL, in that case the bitstream filter works with any codec id.
-+ */
-+ const enum AVCodecID* codec_ids;
-+
-+ /**
-+ * A class for the private data, used to declare bitstream filter private
-+ * AVOptions. This field is NULL for bitstream filters that do not declare
-+ * any options.
-+ *
-+ * If this field is non-NULL, the first member of the filter private data
-+ * must be a pointer to AVClass, which will be set by libavcodec generic
-+ * code to this class.
-+ */
-+ const AVClass* priv_class;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ int priv_data_size;
-+ int (*init)(AVBSFContext* ctx);
-+ int (*filter)(AVBSFContext* ctx, AVPacket* pkt);
-+ void (*close)(AVBSFContext* ctx);
-+ void (*flush)(AVBSFContext* ctx);
-+} AVBitStreamFilter;
-+
-+/**
-+ * @return a bitstream filter with the specified name or NULL if no such
-+ * bitstream filter exists.
-+ */
-+const AVBitStreamFilter* av_bsf_get_by_name(const char* name);
-+
-+/**
-+ * Iterate over all registered bitstream filters.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered bitstream filter or NULL when the iteration is
-+ * finished
-+ */
-+const AVBitStreamFilter* av_bsf_iterate(void** opaque);
-+
-+/**
-+ * Allocate a context for a given bitstream filter. The caller must fill in the
-+ * context parameters as described in the documentation and then call
-+ * av_bsf_init() before sending any data to the filter.
-+ *
-+ * @param filter the filter for which to allocate an instance.
-+ * @param ctx a pointer into which the pointer to the newly-allocated context
-+ * will be written. It must be freed with av_bsf_free() after the
-+ * filtering is done.
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_bsf_alloc(const AVBitStreamFilter* filter, AVBSFContext** ctx);
-+
-+/**
-+ * Prepare the filter for use, after all the parameters and options have been
-+ * set.
-+ */
-+int av_bsf_init(AVBSFContext* ctx);
-+
-+/**
-+ * Submit a packet for filtering.
-+ *
-+ * After sending each packet, the filter must be completely drained by calling
-+ * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or
-+ * AVERROR_EOF.
-+ *
-+ * @param pkt the packet to filter. The bitstream filter will take ownership of
-+ * the packet and reset the contents of pkt. pkt is not touched if an error
-+ * occurs. If pkt is empty (i.e. NULL, or pkt->data is NULL and
-+ * pkt->side_data_elems zero), it signals the end of the stream (i.e. no more
-+ * non-empty packets will be sent; sending more empty packets does nothing) and
-+ * will cause the filter to output any packets it may have buffered internally.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if packets need to be retrieved from
-+ * the filter (using av_bsf_receive_packet()) before new input can be consumed.
-+ * Another negative AVERROR value if an error occurs.
-+ */
-+int av_bsf_send_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Retrieve a filtered packet.
-+ *
-+ * @param[out] pkt this struct will be filled with the contents of the filtered
-+ * packet. It is owned by the caller and must be freed using
-+ * av_packet_unref() when it is no longer needed.
-+ * This parameter should be "clean" (i.e. freshly allocated
-+ * with av_packet_alloc() or unreffed with av_packet_unref())
-+ * when this function is called. If this function returns
-+ * successfully, the contents of pkt will be completely
-+ * overwritten by the returned data. On failure, pkt is not
-+ * touched.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if more packets need to be sent to the
-+ * filter (using av_bsf_send_packet()) to get more output. AVERROR_EOF if there
-+ * will be no further output from the filter. Another negative AVERROR value if
-+ * an error occurs.
-+ *
-+ * @note one input packet may result in several output packets, so after sending
-+ * a packet with av_bsf_send_packet(), this function needs to be called
-+ * repeatedly until it stops returning 0. It is also possible for a filter to
-+ * output fewer packets than were sent to it, so this function may return
-+ * AVERROR(EAGAIN) immediately after a successful av_bsf_send_packet() call.
-+ */
-+int av_bsf_receive_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Reset the internal bitstream filter state. Should be called e.g. when
-+ * seeking.
-+ */
-+void av_bsf_flush(AVBSFContext* ctx);
-+
-+/**
-+ * Free a bitstream filter context and everything associated with it; write NULL
-+ * into the supplied pointer.
-+ */
-+void av_bsf_free(AVBSFContext** ctx);
-+
-+/**
-+ * Get the AVClass for AVBSFContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* av_bsf_get_class(void);
-+
-+/**
-+ * Structure for chain/list of bitstream filters.
-+ * Empty list can be allocated by av_bsf_list_alloc().
-+ */
-+typedef struct AVBSFList AVBSFList;
-+
-+/**
-+ * Allocate empty list of bitstream filters.
-+ * The list must be later freed by av_bsf_list_free()
-+ * or finalized by av_bsf_list_finalize().
-+ *
-+ * @return Pointer to @ref AVBSFList on success, NULL in case of failure
-+ */
-+AVBSFList* av_bsf_list_alloc(void);
-+
-+/**
-+ * Free list of bitstream filters.
-+ *
-+ * @param lst Pointer to pointer returned by av_bsf_list_alloc()
-+ */
-+void av_bsf_list_free(AVBSFList** lst);
-+
-+/**
-+ * Append bitstream filter to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf Filter context to be appended
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append(AVBSFList* lst, AVBSFContext* bsf);
-+
-+/**
-+ * Construct new bitstream filter context given it's name and options
-+ * and append it to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf_name Name of the bitstream filter
-+ * @param options Options for the bitstream filter, can be set to NULL
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append2(AVBSFList* lst, const char* bsf_name,
-+ AVDictionary** options);
-+/**
-+ * Finalize list of bitstream filters.
-+ *
-+ * This function will transform @ref AVBSFList to single @ref AVBSFContext,
-+ * so the whole chain of bitstream filters can be treated as single filter
-+ * freshly allocated by av_bsf_alloc().
-+ * If the call is successful, @ref AVBSFList structure is freed and lst
-+ * will be set to NULL. In case of failure, caller is responsible for
-+ * freeing the structure by av_bsf_list_free()
-+ *
-+ * @param lst Filter list structure to be transformed
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_finalize(AVBSFList** lst, AVBSFContext** bsf);
-+
-+/**
-+ * Parse string describing list of bitstream filters and create single
-+ * @ref AVBSFContext describing the whole chain of bitstream filters.
-+ * Resulting @ref AVBSFContext can be treated as any other @ref AVBSFContext
-+ * freshly allocated by av_bsf_alloc().
-+ *
-+ * @param str String describing chain of bitstream filters in format
-+ * `bsf1[=opt1=val1:opt2=val2][,bsf2]`
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_parse_str(const char* str, AVBSFContext** bsf);
-+
-+/**
-+ * Get null/pass-through bitstream filter.
-+ *
-+ * @param[out] bsf Pointer to be set to new instance of pass-through bitstream
-+ * filter
-+ *
-+ * @return
-+ */
-+int av_bsf_get_null_filter(AVBSFContext** bsf);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_BSF_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-@@ -0,0 +1,513 @@
-+/*
-+ * AVCodec public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_H
-+#define AVCODEC_CODEC_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/hwcontext.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/samplefmt.h"
-+
-+#include "libavcodec/codec_id.h"
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Decoder can use draw_horiz_band callback.
-+ */
-+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
-+/**
-+ * Codec uses get_buffer() or get_encode_buffer() for allocating buffers and
-+ * supports custom allocators.
-+ * If not set, it might not use get_buffer() or get_encode_buffer() at all, or
-+ * use operations that assume the buffer was allocated by
-+ * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
-+ */
-+#define AV_CODEC_CAP_DR1 (1 << 1)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * @deprecated Use parsers to always send proper frames.
-+ */
-+# define AV_CODEC_CAP_TRUNCATED (1 << 3)
-+#endif
-+/**
-+ * Encoder or decoder requires flushing with NULL input at the end in order to
-+ * give the complete and correct output.
-+ *
-+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
-+ * with NULL data. The user can still send NULL data to the public encode
-+ * or decode function, but libavcodec will not pass it along to the codec
-+ * unless this flag is set.
-+ *
-+ * Decoders:
-+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
-+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
-+ * returns frames.
-+ *
-+ * Encoders:
-+ * The encoder needs to be fed with NULL data at the end of encoding until the
-+ * encoder no longer returns data.
-+ *
-+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
-+ * flag also means that the encoder must set the pts and duration for
-+ * each output packet. If this flag is not set, the pts and duration will
-+ * be determined by libavcodec from the input frame.
-+ */
-+#define AV_CODEC_CAP_DELAY (1 << 5)
-+/**
-+ * Codec can be fed a final frame with a smaller size.
-+ * This can be used to prevent truncation of the last audio samples.
-+ */
-+#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6)
-+
-+/**
-+ * Codec can output multiple frames per AVPacket
-+ * Normally demuxers return one frame at a time, demuxers which do not do
-+ * are connected to a parser to split what they return into proper frames.
-+ * This flag is reserved to the very rare category of codecs which have a
-+ * bitstream that cannot be split into frames without timeconsuming
-+ * operations like full decoding. Demuxers carrying such bitstreams thus
-+ * may return multiple frames in a packet. This has many disadvantages like
-+ * prohibiting stream copy in many cases thus it should only be considered
-+ * as a last resort.
-+ */
-+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
-+/**
-+ * Codec is experimental and is thus avoided in favor of non experimental
-+ * encoders
-+ */
-+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
-+/**
-+ * Codec should fill in channel configuration and samplerate instead of
-+ * container
-+ */
-+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
-+/**
-+ * Codec supports frame-level multithreading.
-+ */
-+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
-+/**
-+ * Codec supports slice-based (or partition-based) multithreading.
-+ */
-+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
-+/**
-+ * Codec supports changed parameters at any point.
-+ */
-+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
-+/**
-+ * Codec supports multithreading through a method other than slice- or
-+ * frame-level multithreading. Typically this marks wrappers around
-+ * multithreading-capable external libraries.
-+ */
-+#define AV_CODEC_CAP_OTHER_THREADS (1 << 15)
-+#if FF_API_AUTO_THREADS
-+# define AV_CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_OTHER_THREADS
-+#endif
-+/**
-+ * Audio encoder supports receiving a different number of samples in each call.
-+ */
-+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-+/**
-+ * Decoder is not a preferred choice for probing.
-+ * This indicates that the decoder is not a good choice for probing.
-+ * It could for example be an expensive to spin up hardware decoder,
-+ * or it could simply not provide a lot of useful information about
-+ * the stream.
-+ * A decoder marked with this flag should only be used as last resort
-+ * choice for probing.
-+ */
-+#define AV_CODEC_CAP_AVOID_PROBING (1 << 17)
-+
-+#if FF_API_UNUSED_CODEC_CAPS
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_INTRA_ONLY 0x40000000
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_LOSSLESS 0x80000000
-+#endif
-+
-+/**
-+ * Codec is backed by a hardware implementation. Typically used to
-+ * identify a non-hwaccel hardware decoder. For information about hwaccels, use
-+ * avcodec_get_hw_config() instead.
-+ */
-+#define AV_CODEC_CAP_HARDWARE (1 << 18)
-+
-+/**
-+ * Codec is potentially backed by a hardware implementation, but not
-+ * necessarily. This is used instead of AV_CODEC_CAP_HARDWARE, if the
-+ * implementation provides some sort of internal fallback.
-+ */
-+#define AV_CODEC_CAP_HYBRID (1 << 19)
-+
-+/**
-+ * This codec takes the reordered_opaque field from input AVFrames
-+ * and returns it in the corresponding field in AVCodecContext after
-+ * encoding.
-+ */
-+#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
-+
-+/**
-+ * This encoder can be flushed using avcodec_flush_buffers(). If this flag is
-+ * not set, the encoder must be closed and reopened to ensure that no frames
-+ * remain pending.
-+ */
-+#define AV_CODEC_CAP_ENCODER_FLUSH (1 << 21)
-+
-+/**
-+ * AVProfile.
-+ */
-+typedef struct AVProfile {
-+ int profile;
-+ const char* name; ///< short name for the profile
-+} AVProfile;
-+
-+typedef struct AVCodecDefault AVCodecDefault;
-+
-+struct AVCodecContext;
-+struct AVSubtitle;
-+struct AVPacket;
-+
-+/**
-+ * AVCodec.
-+ */
-+typedef struct AVCodec {
-+ /**
-+ * Name of the codec implementation.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ * This is the primary way to find a codec from the user perspective.
-+ */
-+ const char* name;
-+ /**
-+ * Descriptive name for the codec, meant to be more human readable than name.
-+ * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-+ */
-+ const char* long_name;
-+ enum AVMediaType type;
-+ enum AVCodecID id;
-+ /**
-+ * Codec capabilities.
-+ * see AV_CODEC_CAP_*
-+ */
-+ int capabilities;
-+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
-+ const AVRational*
-+ supported_framerates; ///< array of supported framerates, or NULL if any,
-+ ///< array is terminated by {0,0}
-+ const enum AVPixelFormat*
-+ pix_fmts; ///< array of supported pixel formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const int*
-+ supported_samplerates; ///< array of supported audio samplerates, or NULL
-+ ///< if unknown, array is terminated by 0
-+ const enum AVSampleFormat*
-+ sample_fmts; ///< array of supported sample formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const uint64_t*
-+ channel_layouts; ///< array of support channel layouts, or NULL if
-+ ///< unknown. array is terminated by 0
-+ const AVClass* priv_class; ///< AVClass for the private context
-+ const AVProfile*
-+ profiles; ///< array of recognized profiles, or NULL if unknown, array is
-+ ///< terminated by {FF_PROFILE_UNKNOWN}
-+
-+ /**
-+ * Group name of the codec implementation.
-+ * This is a short symbolic name of the wrapper backing this codec. A
-+ * wrapper uses some kind of external implementation for the codec, such
-+ * as an external library, or a codec implementation provided by the OS or
-+ * the hardware.
-+ * If this field is NULL, this is a builtin, libavcodec native codec.
-+ * If non-NULL, this will be the suffix in AVCodec.name in most cases
-+ * (usually AVCodec.name will be of the form "<codec_name>_<wrapper_name>").
-+ */
-+ const char* wrapper_name;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+ /**
-+ * Internal codec capabilities.
-+ * See FF_CODEC_CAP_* in internal.h
-+ */
-+ int caps_internal;
-+
-+ int priv_data_size;
-+ /**
-+ * @name Frame-level threading support functions
-+ * @{
-+ */
-+ /**
-+ * Copy necessary context variables from a previous thread context to the
-+ * current one. If not defined, the next thread will start automatically;
-+ * otherwise, the codec must call ff_thread_finish_setup().
-+ *
-+ * dst and src will (rarely) point to the same context, in which case memcpy
-+ * should be skipped.
-+ */
-+ int (*update_thread_context)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+
-+ /**
-+ * Copy variables back to the user-facing context
-+ */
-+ int (*update_thread_context_for_user)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+ /** @} */
-+
-+ /**
-+ * Private codec-specific defaults.
-+ */
-+ const AVCodecDefault* defaults;
-+
-+ /**
-+ * Initialize codec static data, called from av_codec_iterate().
-+ *
-+ * This is not intended for time consuming operations as it is
-+ * run for every codec regardless of that codec being used.
-+ */
-+ void (*init_static_data)(struct AVCodec* codec);
-+
-+ int (*init)(struct AVCodecContext*);
-+ int (*encode_sub)(struct AVCodecContext*, uint8_t* buf, int buf_size,
-+ const struct AVSubtitle* sub);
-+ /**
-+ * Encode data to an AVPacket.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt output AVPacket
-+ * @param[in] frame AVFrame containing the raw data to be encoded
-+ * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-+ * non-empty packet was returned in avpkt.
-+ * @return 0 on success, negative error code on failure
-+ */
-+ int (*encode2)(struct AVCodecContext* avctx, struct AVPacket* avpkt,
-+ const struct AVFrame* frame, int* got_packet_ptr);
-+ /**
-+ * Decode picture or subtitle data.
-+ *
-+ * @param avctx codec context
-+ * @param outdata codec type dependent output struct
-+ * @param[out] got_frame_ptr decoder sets to 0 or 1 to indicate that a
-+ * non-empty frame or subtitle was returned in
-+ * outdata.
-+ * @param[in] avpkt AVPacket containing the data to be decoded
-+ * @return amount of bytes read from the packet on success, negative error
-+ * code on failure
-+ */
-+ int (*decode)(struct AVCodecContext* avctx, void* outdata, int* got_frame_ptr,
-+ struct AVPacket* avpkt);
-+ int (*close)(struct AVCodecContext*);
-+ /**
-+ * Encode API with decoupled frame/packet dataflow. This function is called
-+ * to get one output packet. It should call ff_encode_get_frame() to obtain
-+ * input data.
-+ */
-+ int (*receive_packet)(struct AVCodecContext* avctx, struct AVPacket* avpkt);
-+
-+ /**
-+ * Decode API with decoupled packet/frame dataflow. This function is called
-+ * to get one output frame. It should call ff_decode_get_packet() to obtain
-+ * input data.
-+ */
-+ int (*receive_frame)(struct AVCodecContext* avctx, struct AVFrame* frame);
-+ /**
-+ * Flush buffers.
-+ * Will be called when seeking
-+ */
-+ void (*flush)(struct AVCodecContext*);
-+
-+ /**
-+ * Decoding only, a comma-separated list of bitstream filters to apply to
-+ * packets before decoding.
-+ */
-+ const char* bsfs;
-+
-+ /**
-+ * Array of pointers to hardware configurations supported by the codec,
-+ * or NULL if no hardware supported. The array is terminated by a NULL
-+ * pointer.
-+ *
-+ * The user can only access this field via avcodec_get_hw_config().
-+ */
-+ const struct AVCodecHWConfigInternal* const* hw_configs;
-+
-+ /**
-+ * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.
-+ */
-+ const uint32_t* codec_tags;
-+} AVCodec;
-+
-+/**
-+ * Iterate over all registered codecs.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodec* av_codec_iterate(void** opaque);
-+
-+/**
-+ * Find a registered decoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered decoder with the specified name.
-+ *
-+ * @param name name of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder_by_name(const char* name);
-+
-+/**
-+ * Find a registered encoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered encoder with the specified name.
-+ *
-+ * @param name name of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder_by_name(const char* name);
-+/**
-+ * @return a non-zero number if codec is an encoder, zero otherwise
-+ */
-+int av_codec_is_encoder(const AVCodec* codec);
-+
-+/**
-+ * @return a non-zero number if codec is a decoder, zero otherwise
-+ */
-+int av_codec_is_decoder(const AVCodec* codec);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec the codec that is searched for the given profile
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ */
-+const char* av_get_profile_name(const AVCodec* codec, int profile);
-+
-+enum {
-+ /**
-+ * The codec supports this format via the hw_device_ctx interface.
-+ *
-+ * When selecting this format, AVCodecContext.hw_device_ctx should
-+ * have been set to a device of the specified type before calling
-+ * avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
-+ /**
-+ * The codec supports this format via the hw_frames_ctx interface.
-+ *
-+ * When selecting this format for a decoder,
-+ * AVCodecContext.hw_frames_ctx should be set to a suitable frames
-+ * context inside the get_format() callback. The frames context
-+ * must have been created on a device of the specified type.
-+ *
-+ * When selecting this format for an encoder,
-+ * AVCodecContext.hw_frames_ctx should be set to the context which
-+ * will be used for the input frames before calling avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
-+ /**
-+ * The codec supports this format by some internal method.
-+ *
-+ * This format can be selected without any additional configuration -
-+ * no device or frames context is required.
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_INTERNAL = 0x04,
-+ /**
-+ * The codec supports this format by some ad-hoc method.
-+ *
-+ * Additional settings and/or function calls are required. See the
-+ * codec-specific documentation for details. (Methods requiring
-+ * this sort of configuration are deprecated and others should be
-+ * used in preference.)
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_AD_HOC = 0x08,
-+};
-+
-+typedef struct AVCodecHWConfig {
-+ /**
-+ * For decoders, a hardware pixel format which that decoder may be
-+ * able to decode to if suitable hardware is available.
-+ *
-+ * For encoders, a pixel format which the encoder may be able to
-+ * accept. If set to AV_PIX_FMT_NONE, this applies to all pixel
-+ * formats supported by the codec.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+ /**
-+ * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
-+ * setup methods which can be used with this configuration.
-+ */
-+ int methods;
-+ /**
-+ * The device type associated with the configuration.
-+ *
-+ * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
-+ * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
-+ */
-+ enum AVHWDeviceType device_type;
-+} AVCodecHWConfig;
-+
-+/**
-+ * Retrieve supported hardware configurations for a codec.
-+ *
-+ * Values of index from zero to some maximum return the indexed configuration
-+ * descriptor; all other values return NULL. If the codec does not support
-+ * any hardware configurations then it will always return NULL.
-+ */
-+const AVCodecHWConfig* avcodec_get_hw_config(const AVCodec* codec, int index);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_CODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-@@ -0,0 +1,128 @@
-+/*
-+ * Codec descriptors public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_DESC_H
-+#define AVCODEC_CODEC_DESC_H
-+
-+#include "libavutil/avutil.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * This struct describes the properties of a single codec described by an
-+ * AVCodecID.
-+ * @see avcodec_descriptor_get()
-+ */
-+typedef struct AVCodecDescriptor {
-+ enum AVCodecID id;
-+ enum AVMediaType type;
-+ /**
-+ * Name of the codec described by this descriptor. It is non-empty and
-+ * unique for each codec descriptor. It should contain alphanumeric
-+ * characters and '_' only.
-+ */
-+ const char* name;
-+ /**
-+ * A more descriptive name for this codec. May be NULL.
-+ */
-+ const char* long_name;
-+ /**
-+ * Codec properties, a combination of AV_CODEC_PROP_* flags.
-+ */
-+ int props;
-+ /**
-+ * MIME type(s) associated with the codec.
-+ * May be NULL; if not, a NULL-terminated array of MIME types.
-+ * The first item is always non-NULL and is the preferred MIME type.
-+ */
-+ const char* const* mime_types;
-+ /**
-+ * If non-NULL, an array of profiles recognized for this codec.
-+ * Terminated with FF_PROFILE_UNKNOWN.
-+ */
-+ const struct AVProfile* profiles;
-+} AVCodecDescriptor;
-+
-+/**
-+ * Codec uses only intra compression.
-+ * Video and audio codecs only.
-+ */
-+#define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
-+/**
-+ * Codec supports lossy compression. Audio and video codecs only.
-+ * @note a codec may support both lossy and lossless
-+ * compression modes
-+ */
-+#define AV_CODEC_PROP_LOSSY (1 << 1)
-+/**
-+ * Codec supports lossless compression. Audio and video codecs only.
-+ */
-+#define AV_CODEC_PROP_LOSSLESS (1 << 2)
-+/**
-+ * Codec supports frame reordering. That is, the coded order (the order in which
-+ * the encoded packets are output by the encoders / stored / input to the
-+ * decoders) may be different from the presentation order of the corresponding
-+ * frames.
-+ *
-+ * For codecs that do not have this property set, PTS and DTS should always be
-+ * equal.
-+ */
-+#define AV_CODEC_PROP_REORDER (1 << 3)
-+/**
-+ * Subtitle codec is bitmap based
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
-+ */
-+#define AV_CODEC_PROP_BITMAP_SUB (1 << 16)
-+/**
-+ * Subtitle codec is text based.
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
-+ */
-+#define AV_CODEC_PROP_TEXT_SUB (1 << 17)
-+
-+/**
-+ * @return descriptor for given codec ID or NULL if no descriptor exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get(enum AVCodecID id);
-+
-+/**
-+ * Iterate over all codec descriptors known to libavcodec.
-+ *
-+ * @param prev previous descriptor. NULL to get the first descriptor.
-+ *
-+ * @return next descriptor or NULL after the last descriptor
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_next(const AVCodecDescriptor* prev);
-+
-+/**
-+ * @return codec descriptor with the given name or NULL if no such descriptor
-+ * exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get_by_name(const char* name);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_DESC_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-@@ -0,0 +1,637 @@
-+/*
-+ * Codec IDs
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_ID_H
-+#define AVCODEC_CODEC_ID_H
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/samplefmt.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Identify the syntax and semantics of the bitstream.
-+ * The principle is roughly:
-+ * Two decoders with the same ID can decode the same streams.
-+ * Two encoders with the same ID can encode compatible streams.
-+ * There may be slight deviations from the principle due to implementation
-+ * details.
-+ *
-+ * If you add a codec ID to this list, add it so that
-+ * 1. no value of an existing codec ID changes (that would break ABI),
-+ * 2. it is as close as possible to similar codecs
-+ *
-+ * After adding new codec IDs, do not forget to add an entry to the codec
-+ * descriptor list and bump libavcodec minor version.
-+ */
-+enum AVCodecID {
-+ AV_CODEC_ID_NONE,
-+
-+ /* video codecs */
-+ AV_CODEC_ID_MPEG1VIDEO,
-+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-+ AV_CODEC_ID_H261,
-+ AV_CODEC_ID_H263,
-+ AV_CODEC_ID_RV10,
-+ AV_CODEC_ID_RV20,
-+ AV_CODEC_ID_MJPEG,
-+ AV_CODEC_ID_MJPEGB,
-+ AV_CODEC_ID_LJPEG,
-+ AV_CODEC_ID_SP5X,
-+ AV_CODEC_ID_JPEGLS,
-+ AV_CODEC_ID_MPEG4,
-+ AV_CODEC_ID_RAWVIDEO,
-+ AV_CODEC_ID_MSMPEG4V1,
-+ AV_CODEC_ID_MSMPEG4V2,
-+ AV_CODEC_ID_MSMPEG4V3,
-+ AV_CODEC_ID_WMV1,
-+ AV_CODEC_ID_WMV2,
-+ AV_CODEC_ID_H263P,
-+ AV_CODEC_ID_H263I,
-+ AV_CODEC_ID_FLV1,
-+ AV_CODEC_ID_SVQ1,
-+ AV_CODEC_ID_SVQ3,
-+ AV_CODEC_ID_DVVIDEO,
-+ AV_CODEC_ID_HUFFYUV,
-+ AV_CODEC_ID_CYUV,
-+ AV_CODEC_ID_H264,
-+ AV_CODEC_ID_INDEO3,
-+ AV_CODEC_ID_VP3,
-+ AV_CODEC_ID_THEORA,
-+ AV_CODEC_ID_ASV1,
-+ AV_CODEC_ID_ASV2,
-+ AV_CODEC_ID_FFV1,
-+ AV_CODEC_ID_4XM,
-+ AV_CODEC_ID_VCR1,
-+ AV_CODEC_ID_CLJR,
-+ AV_CODEC_ID_MDEC,
-+ AV_CODEC_ID_ROQ,
-+ AV_CODEC_ID_INTERPLAY_VIDEO,
-+ AV_CODEC_ID_XAN_WC3,
-+ AV_CODEC_ID_XAN_WC4,
-+ AV_CODEC_ID_RPZA,
-+ AV_CODEC_ID_CINEPAK,
-+ AV_CODEC_ID_WS_VQA,
-+ AV_CODEC_ID_MSRLE,
-+ AV_CODEC_ID_MSVIDEO1,
-+ AV_CODEC_ID_IDCIN,
-+ AV_CODEC_ID_8BPS,
-+ AV_CODEC_ID_SMC,
-+ AV_CODEC_ID_FLIC,
-+ AV_CODEC_ID_TRUEMOTION1,
-+ AV_CODEC_ID_VMDVIDEO,
-+ AV_CODEC_ID_MSZH,
-+ AV_CODEC_ID_ZLIB,
-+ AV_CODEC_ID_QTRLE,
-+ AV_CODEC_ID_TSCC,
-+ AV_CODEC_ID_ULTI,
-+ AV_CODEC_ID_QDRAW,
-+ AV_CODEC_ID_VIXL,
-+ AV_CODEC_ID_QPEG,
-+ AV_CODEC_ID_PNG,
-+ AV_CODEC_ID_PPM,
-+ AV_CODEC_ID_PBM,
-+ AV_CODEC_ID_PGM,
-+ AV_CODEC_ID_PGMYUV,
-+ AV_CODEC_ID_PAM,
-+ AV_CODEC_ID_FFVHUFF,
-+ AV_CODEC_ID_RV30,
-+ AV_CODEC_ID_RV40,
-+ AV_CODEC_ID_VC1,
-+ AV_CODEC_ID_WMV3,
-+ AV_CODEC_ID_LOCO,
-+ AV_CODEC_ID_WNV1,
-+ AV_CODEC_ID_AASC,
-+ AV_CODEC_ID_INDEO2,
-+ AV_CODEC_ID_FRAPS,
-+ AV_CODEC_ID_TRUEMOTION2,
-+ AV_CODEC_ID_BMP,
-+ AV_CODEC_ID_CSCD,
-+ AV_CODEC_ID_MMVIDEO,
-+ AV_CODEC_ID_ZMBV,
-+ AV_CODEC_ID_AVS,
-+ AV_CODEC_ID_SMACKVIDEO,
-+ AV_CODEC_ID_NUV,
-+ AV_CODEC_ID_KMVC,
-+ AV_CODEC_ID_FLASHSV,
-+ AV_CODEC_ID_CAVS,
-+ AV_CODEC_ID_JPEG2000,
-+ AV_CODEC_ID_VMNC,
-+ AV_CODEC_ID_VP5,
-+ AV_CODEC_ID_VP6,
-+ AV_CODEC_ID_VP6F,
-+ AV_CODEC_ID_TARGA,
-+ AV_CODEC_ID_DSICINVIDEO,
-+ AV_CODEC_ID_TIERTEXSEQVIDEO,
-+ AV_CODEC_ID_TIFF,
-+ AV_CODEC_ID_GIF,
-+ AV_CODEC_ID_DXA,
-+ AV_CODEC_ID_DNXHD,
-+ AV_CODEC_ID_THP,
-+ AV_CODEC_ID_SGI,
-+ AV_CODEC_ID_C93,
-+ AV_CODEC_ID_BETHSOFTVID,
-+ AV_CODEC_ID_PTX,
-+ AV_CODEC_ID_TXD,
-+ AV_CODEC_ID_VP6A,
-+ AV_CODEC_ID_AMV,
-+ AV_CODEC_ID_VB,
-+ AV_CODEC_ID_PCX,
-+ AV_CODEC_ID_SUNRAST,
-+ AV_CODEC_ID_INDEO4,
-+ AV_CODEC_ID_INDEO5,
-+ AV_CODEC_ID_MIMIC,
-+ AV_CODEC_ID_RL2,
-+ AV_CODEC_ID_ESCAPE124,
-+ AV_CODEC_ID_DIRAC,
-+ AV_CODEC_ID_BFI,
-+ AV_CODEC_ID_CMV,
-+ AV_CODEC_ID_MOTIONPIXELS,
-+ AV_CODEC_ID_TGV,
-+ AV_CODEC_ID_TGQ,
-+ AV_CODEC_ID_TQI,
-+ AV_CODEC_ID_AURA,
-+ AV_CODEC_ID_AURA2,
-+ AV_CODEC_ID_V210X,
-+ AV_CODEC_ID_TMV,
-+ AV_CODEC_ID_V210,
-+ AV_CODEC_ID_DPX,
-+ AV_CODEC_ID_MAD,
-+ AV_CODEC_ID_FRWU,
-+ AV_CODEC_ID_FLASHSV2,
-+ AV_CODEC_ID_CDGRAPHICS,
-+ AV_CODEC_ID_R210,
-+ AV_CODEC_ID_ANM,
-+ AV_CODEC_ID_BINKVIDEO,
-+ AV_CODEC_ID_IFF_ILBM,
-+#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
-+ AV_CODEC_ID_KGV1,
-+ AV_CODEC_ID_YOP,
-+ AV_CODEC_ID_VP8,
-+ AV_CODEC_ID_PICTOR,
-+ AV_CODEC_ID_ANSI,
-+ AV_CODEC_ID_A64_MULTI,
-+ AV_CODEC_ID_A64_MULTI5,
-+ AV_CODEC_ID_R10K,
-+ AV_CODEC_ID_MXPEG,
-+ AV_CODEC_ID_LAGARITH,
-+ AV_CODEC_ID_PRORES,
-+ AV_CODEC_ID_JV,
-+ AV_CODEC_ID_DFA,
-+ AV_CODEC_ID_WMV3IMAGE,
-+ AV_CODEC_ID_VC1IMAGE,
-+ AV_CODEC_ID_UTVIDEO,
-+ AV_CODEC_ID_BMV_VIDEO,
-+ AV_CODEC_ID_VBLE,
-+ AV_CODEC_ID_DXTORY,
-+ AV_CODEC_ID_V410,
-+ AV_CODEC_ID_XWD,
-+ AV_CODEC_ID_CDXL,
-+ AV_CODEC_ID_XBM,
-+ AV_CODEC_ID_ZEROCODEC,
-+ AV_CODEC_ID_MSS1,
-+ AV_CODEC_ID_MSA1,
-+ AV_CODEC_ID_TSCC2,
-+ AV_CODEC_ID_MTS2,
-+ AV_CODEC_ID_CLLC,
-+ AV_CODEC_ID_MSS2,
-+ AV_CODEC_ID_VP9,
-+ AV_CODEC_ID_AIC,
-+ AV_CODEC_ID_ESCAPE130,
-+ AV_CODEC_ID_G2M,
-+ AV_CODEC_ID_WEBP,
-+ AV_CODEC_ID_HNM4_VIDEO,
-+ AV_CODEC_ID_HEVC,
-+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
-+ AV_CODEC_ID_FIC,
-+ AV_CODEC_ID_ALIAS_PIX,
-+ AV_CODEC_ID_BRENDER_PIX,
-+ AV_CODEC_ID_PAF_VIDEO,
-+ AV_CODEC_ID_EXR,
-+ AV_CODEC_ID_VP7,
-+ AV_CODEC_ID_SANM,
-+ AV_CODEC_ID_SGIRLE,
-+ AV_CODEC_ID_MVC1,
-+ AV_CODEC_ID_MVC2,
-+ AV_CODEC_ID_HQX,
-+ AV_CODEC_ID_TDSC,
-+ AV_CODEC_ID_HQ_HQA,
-+ AV_CODEC_ID_HAP,
-+ AV_CODEC_ID_DDS,
-+ AV_CODEC_ID_DXV,
-+ AV_CODEC_ID_SCREENPRESSO,
-+ AV_CODEC_ID_RSCC,
-+ AV_CODEC_ID_AVS2,
-+ AV_CODEC_ID_PGX,
-+ AV_CODEC_ID_AVS3,
-+ AV_CODEC_ID_MSP2,
-+ AV_CODEC_ID_VVC,
-+#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC
-+ AV_CODEC_ID_Y41P,
-+ AV_CODEC_ID_AVRP,
-+ AV_CODEC_ID_012V,
-+ AV_CODEC_ID_AVUI,
-+ AV_CODEC_ID_AYUV,
-+ AV_CODEC_ID_TARGA_Y216,
-+ AV_CODEC_ID_V308,
-+ AV_CODEC_ID_V408,
-+ AV_CODEC_ID_YUV4,
-+ AV_CODEC_ID_AVRN,
-+ AV_CODEC_ID_CPIA,
-+ AV_CODEC_ID_XFACE,
-+ AV_CODEC_ID_SNOW,
-+ AV_CODEC_ID_SMVJPEG,
-+ AV_CODEC_ID_APNG,
-+ AV_CODEC_ID_DAALA,
-+ AV_CODEC_ID_CFHD,
-+ AV_CODEC_ID_TRUEMOTION2RT,
-+ AV_CODEC_ID_M101,
-+ AV_CODEC_ID_MAGICYUV,
-+ AV_CODEC_ID_SHEERVIDEO,
-+ AV_CODEC_ID_YLC,
-+ AV_CODEC_ID_PSD,
-+ AV_CODEC_ID_PIXLET,
-+ AV_CODEC_ID_SPEEDHQ,
-+ AV_CODEC_ID_FMVC,
-+ AV_CODEC_ID_SCPR,
-+ AV_CODEC_ID_CLEARVIDEO,
-+ AV_CODEC_ID_XPM,
-+ AV_CODEC_ID_AV1,
-+ AV_CODEC_ID_BITPACKED,
-+ AV_CODEC_ID_MSCC,
-+ AV_CODEC_ID_SRGC,
-+ AV_CODEC_ID_SVG,
-+ AV_CODEC_ID_GDV,
-+ AV_CODEC_ID_FITS,
-+ AV_CODEC_ID_IMM4,
-+ AV_CODEC_ID_PROSUMER,
-+ AV_CODEC_ID_MWSC,
-+ AV_CODEC_ID_WCMV,
-+ AV_CODEC_ID_RASC,
-+ AV_CODEC_ID_HYMT,
-+ AV_CODEC_ID_ARBC,
-+ AV_CODEC_ID_AGM,
-+ AV_CODEC_ID_LSCR,
-+ AV_CODEC_ID_VP4,
-+ AV_CODEC_ID_IMM5,
-+ AV_CODEC_ID_MVDV,
-+ AV_CODEC_ID_MVHA,
-+ AV_CODEC_ID_CDTOONS,
-+ AV_CODEC_ID_MV30,
-+ AV_CODEC_ID_NOTCHLC,
-+ AV_CODEC_ID_PFM,
-+ AV_CODEC_ID_MOBICLIP,
-+ AV_CODEC_ID_PHOTOCD,
-+ AV_CODEC_ID_IPU,
-+ AV_CODEC_ID_ARGO,
-+ AV_CODEC_ID_CRI,
-+ AV_CODEC_ID_SIMBIOSIS_IMX,
-+ AV_CODEC_ID_SGA_VIDEO,
-+ AV_CODEC_ID_GEM,
-+
-+ /* various PCM "codecs" */
-+ AV_CODEC_ID_FIRST_AUDIO =
-+ 0x10000, ///< A dummy id pointing at the start of audio codecs
-+ AV_CODEC_ID_PCM_S16LE = 0x10000,
-+ AV_CODEC_ID_PCM_S16BE,
-+ AV_CODEC_ID_PCM_U16LE,
-+ AV_CODEC_ID_PCM_U16BE,
-+ AV_CODEC_ID_PCM_S8,
-+ AV_CODEC_ID_PCM_U8,
-+ AV_CODEC_ID_PCM_MULAW,
-+ AV_CODEC_ID_PCM_ALAW,
-+ AV_CODEC_ID_PCM_S32LE,
-+ AV_CODEC_ID_PCM_S32BE,
-+ AV_CODEC_ID_PCM_U32LE,
-+ AV_CODEC_ID_PCM_U32BE,
-+ AV_CODEC_ID_PCM_S24LE,
-+ AV_CODEC_ID_PCM_S24BE,
-+ AV_CODEC_ID_PCM_U24LE,
-+ AV_CODEC_ID_PCM_U24BE,
-+ AV_CODEC_ID_PCM_S24DAUD,
-+ AV_CODEC_ID_PCM_ZORK,
-+ AV_CODEC_ID_PCM_S16LE_PLANAR,
-+ AV_CODEC_ID_PCM_DVD,
-+ AV_CODEC_ID_PCM_F32BE,
-+ AV_CODEC_ID_PCM_F32LE,
-+ AV_CODEC_ID_PCM_F64BE,
-+ AV_CODEC_ID_PCM_F64LE,
-+ AV_CODEC_ID_PCM_BLURAY,
-+ AV_CODEC_ID_PCM_LXF,
-+ AV_CODEC_ID_S302M,
-+ AV_CODEC_ID_PCM_S8_PLANAR,
-+ AV_CODEC_ID_PCM_S24LE_PLANAR,
-+ AV_CODEC_ID_PCM_S32LE_PLANAR,
-+ AV_CODEC_ID_PCM_S16BE_PLANAR,
-+ AV_CODEC_ID_PCM_S64LE,
-+ AV_CODEC_ID_PCM_S64BE,
-+ AV_CODEC_ID_PCM_F16LE,
-+ AV_CODEC_ID_PCM_F24LE,
-+ AV_CODEC_ID_PCM_VIDC,
-+ AV_CODEC_ID_PCM_SGA,
-+
-+ /* various ADPCM codecs */
-+ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-+ AV_CODEC_ID_ADPCM_IMA_WAV,
-+ AV_CODEC_ID_ADPCM_IMA_DK3,
-+ AV_CODEC_ID_ADPCM_IMA_DK4,
-+ AV_CODEC_ID_ADPCM_IMA_WS,
-+ AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-+ AV_CODEC_ID_ADPCM_MS,
-+ AV_CODEC_ID_ADPCM_4XM,
-+ AV_CODEC_ID_ADPCM_XA,
-+ AV_CODEC_ID_ADPCM_ADX,
-+ AV_CODEC_ID_ADPCM_EA,
-+ AV_CODEC_ID_ADPCM_G726,
-+ AV_CODEC_ID_ADPCM_CT,
-+ AV_CODEC_ID_ADPCM_SWF,
-+ AV_CODEC_ID_ADPCM_YAMAHA,
-+ AV_CODEC_ID_ADPCM_SBPRO_4,
-+ AV_CODEC_ID_ADPCM_SBPRO_3,
-+ AV_CODEC_ID_ADPCM_SBPRO_2,
-+ AV_CODEC_ID_ADPCM_THP,
-+ AV_CODEC_ID_ADPCM_IMA_AMV,
-+ AV_CODEC_ID_ADPCM_EA_R1,
-+ AV_CODEC_ID_ADPCM_EA_R3,
-+ AV_CODEC_ID_ADPCM_EA_R2,
-+ AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-+ AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-+ AV_CODEC_ID_ADPCM_EA_XAS,
-+ AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-+ AV_CODEC_ID_ADPCM_IMA_ISS,
-+ AV_CODEC_ID_ADPCM_G722,
-+ AV_CODEC_ID_ADPCM_IMA_APC,
-+ AV_CODEC_ID_ADPCM_VIMA,
-+ AV_CODEC_ID_ADPCM_AFC,
-+ AV_CODEC_ID_ADPCM_IMA_OKI,
-+ AV_CODEC_ID_ADPCM_DTK,
-+ AV_CODEC_ID_ADPCM_IMA_RAD,
-+ AV_CODEC_ID_ADPCM_G726LE,
-+ AV_CODEC_ID_ADPCM_THP_LE,
-+ AV_CODEC_ID_ADPCM_PSX,
-+ AV_CODEC_ID_ADPCM_AICA,
-+ AV_CODEC_ID_ADPCM_IMA_DAT4,
-+ AV_CODEC_ID_ADPCM_MTAF,
-+ AV_CODEC_ID_ADPCM_AGM,
-+ AV_CODEC_ID_ADPCM_ARGO,
-+ AV_CODEC_ID_ADPCM_IMA_SSI,
-+ AV_CODEC_ID_ADPCM_ZORK,
-+ AV_CODEC_ID_ADPCM_IMA_APM,
-+ AV_CODEC_ID_ADPCM_IMA_ALP,
-+ AV_CODEC_ID_ADPCM_IMA_MTF,
-+ AV_CODEC_ID_ADPCM_IMA_CUNNING,
-+ AV_CODEC_ID_ADPCM_IMA_MOFLEX,
-+ AV_CODEC_ID_ADPCM_IMA_ACORN,
-+
-+ /* AMR */
-+ AV_CODEC_ID_AMR_NB = 0x12000,
-+ AV_CODEC_ID_AMR_WB,
-+
-+ /* RealAudio codecs*/
-+ AV_CODEC_ID_RA_144 = 0x13000,
-+ AV_CODEC_ID_RA_288,
-+
-+ /* various DPCM codecs */
-+ AV_CODEC_ID_ROQ_DPCM = 0x14000,
-+ AV_CODEC_ID_INTERPLAY_DPCM,
-+ AV_CODEC_ID_XAN_DPCM,
-+ AV_CODEC_ID_SOL_DPCM,
-+ AV_CODEC_ID_SDX2_DPCM,
-+ AV_CODEC_ID_GREMLIN_DPCM,
-+ AV_CODEC_ID_DERF_DPCM,
-+
-+ /* audio codecs */
-+ AV_CODEC_ID_MP2 = 0x15000,
-+ AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-+ AV_CODEC_ID_AAC,
-+ AV_CODEC_ID_AC3,
-+ AV_CODEC_ID_DTS,
-+ AV_CODEC_ID_VORBIS,
-+ AV_CODEC_ID_DVAUDIO,
-+ AV_CODEC_ID_WMAV1,
-+ AV_CODEC_ID_WMAV2,
-+ AV_CODEC_ID_MACE3,
-+ AV_CODEC_ID_MACE6,
-+ AV_CODEC_ID_VMDAUDIO,
-+ AV_CODEC_ID_FLAC,
-+ AV_CODEC_ID_MP3ADU,
-+ AV_CODEC_ID_MP3ON4,
-+ AV_CODEC_ID_SHORTEN,
-+ AV_CODEC_ID_ALAC,
-+ AV_CODEC_ID_WESTWOOD_SND1,
-+ AV_CODEC_ID_GSM, ///< as in Berlin toast format
-+ AV_CODEC_ID_QDM2,
-+ AV_CODEC_ID_COOK,
-+ AV_CODEC_ID_TRUESPEECH,
-+ AV_CODEC_ID_TTA,
-+ AV_CODEC_ID_SMACKAUDIO,
-+ AV_CODEC_ID_QCELP,
-+ AV_CODEC_ID_WAVPACK,
-+ AV_CODEC_ID_DSICINAUDIO,
-+ AV_CODEC_ID_IMC,
-+ AV_CODEC_ID_MUSEPACK7,
-+ AV_CODEC_ID_MLP,
-+ AV_CODEC_ID_GSM_MS, /* as found in WAV */
-+ AV_CODEC_ID_ATRAC3,
-+ AV_CODEC_ID_APE,
-+ AV_CODEC_ID_NELLYMOSER,
-+ AV_CODEC_ID_MUSEPACK8,
-+ AV_CODEC_ID_SPEEX,
-+ AV_CODEC_ID_WMAVOICE,
-+ AV_CODEC_ID_WMAPRO,
-+ AV_CODEC_ID_WMALOSSLESS,
-+ AV_CODEC_ID_ATRAC3P,
-+ AV_CODEC_ID_EAC3,
-+ AV_CODEC_ID_SIPR,
-+ AV_CODEC_ID_MP1,
-+ AV_CODEC_ID_TWINVQ,
-+ AV_CODEC_ID_TRUEHD,
-+ AV_CODEC_ID_MP4ALS,
-+ AV_CODEC_ID_ATRAC1,
-+ AV_CODEC_ID_BINKAUDIO_RDFT,
-+ AV_CODEC_ID_BINKAUDIO_DCT,
-+ AV_CODEC_ID_AAC_LATM,
-+ AV_CODEC_ID_QDMC,
-+ AV_CODEC_ID_CELT,
-+ AV_CODEC_ID_G723_1,
-+ AV_CODEC_ID_G729,
-+ AV_CODEC_ID_8SVX_EXP,
-+ AV_CODEC_ID_8SVX_FIB,
-+ AV_CODEC_ID_BMV_AUDIO,
-+ AV_CODEC_ID_RALF,
-+ AV_CODEC_ID_IAC,
-+ AV_CODEC_ID_ILBC,
-+ AV_CODEC_ID_OPUS,
-+ AV_CODEC_ID_COMFORT_NOISE,
-+ AV_CODEC_ID_TAK,
-+ AV_CODEC_ID_METASOUND,
-+ AV_CODEC_ID_PAF_AUDIO,
-+ AV_CODEC_ID_ON2AVC,
-+ AV_CODEC_ID_DSS_SP,
-+ AV_CODEC_ID_CODEC2,
-+ AV_CODEC_ID_FFWAVESYNTH,
-+ AV_CODEC_ID_SONIC,
-+ AV_CODEC_ID_SONIC_LS,
-+ AV_CODEC_ID_EVRC,
-+ AV_CODEC_ID_SMV,
-+ AV_CODEC_ID_DSD_LSBF,
-+ AV_CODEC_ID_DSD_MSBF,
-+ AV_CODEC_ID_DSD_LSBF_PLANAR,
-+ AV_CODEC_ID_DSD_MSBF_PLANAR,
-+ AV_CODEC_ID_4GV,
-+ AV_CODEC_ID_INTERPLAY_ACM,
-+ AV_CODEC_ID_XMA1,
-+ AV_CODEC_ID_XMA2,
-+ AV_CODEC_ID_DST,
-+ AV_CODEC_ID_ATRAC3AL,
-+ AV_CODEC_ID_ATRAC3PAL,
-+ AV_CODEC_ID_DOLBY_E,
-+ AV_CODEC_ID_APTX,
-+ AV_CODEC_ID_APTX_HD,
-+ AV_CODEC_ID_SBC,
-+ AV_CODEC_ID_ATRAC9,
-+ AV_CODEC_ID_HCOM,
-+ AV_CODEC_ID_ACELP_KELVIN,
-+ AV_CODEC_ID_MPEGH_3D_AUDIO,
-+ AV_CODEC_ID_SIREN,
-+ AV_CODEC_ID_HCA,
-+ AV_CODEC_ID_FASTAUDIO,
-+ AV_CODEC_ID_MSNSIREN,
-+
-+ /* subtitle codecs */
-+ AV_CODEC_ID_FIRST_SUBTITLE =
-+ 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
-+ AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-+ AV_CODEC_ID_DVB_SUBTITLE,
-+ AV_CODEC_ID_TEXT, ///< raw UTF-8 text
-+ AV_CODEC_ID_XSUB,
-+ AV_CODEC_ID_SSA,
-+ AV_CODEC_ID_MOV_TEXT,
-+ AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-+ AV_CODEC_ID_DVB_TELETEXT,
-+ AV_CODEC_ID_SRT,
-+ AV_CODEC_ID_MICRODVD,
-+ AV_CODEC_ID_EIA_608,
-+ AV_CODEC_ID_JACOSUB,
-+ AV_CODEC_ID_SAMI,
-+ AV_CODEC_ID_REALTEXT,
-+ AV_CODEC_ID_STL,
-+ AV_CODEC_ID_SUBVIEWER1,
-+ AV_CODEC_ID_SUBVIEWER,
-+ AV_CODEC_ID_SUBRIP,
-+ AV_CODEC_ID_WEBVTT,
-+ AV_CODEC_ID_MPL2,
-+ AV_CODEC_ID_VPLAYER,
-+ AV_CODEC_ID_PJS,
-+ AV_CODEC_ID_ASS,
-+ AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
-+ AV_CODEC_ID_TTML,
-+ AV_CODEC_ID_ARIB_CAPTION,
-+
-+ /* other specific kind of codecs (generally used for attachments) */
-+ AV_CODEC_ID_FIRST_UNKNOWN =
-+ 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
-+ AV_CODEC_ID_TTF = 0x18000,
-+
-+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program
-+ ///< stream.
-+ AV_CODEC_ID_EPG,
-+ AV_CODEC_ID_BINTEXT,
-+ AV_CODEC_ID_XBIN,
-+ AV_CODEC_ID_IDF,
-+ AV_CODEC_ID_OTF,
-+ AV_CODEC_ID_SMPTE_KLV,
-+ AV_CODEC_ID_DVD_NAV,
-+ AV_CODEC_ID_TIMED_ID3,
-+ AV_CODEC_ID_BIN_DATA,
-+
-+ AV_CODEC_ID_PROBE =
-+ 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf
-+ ///< should attempt to identify it
-+
-+ AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_MPEG4SYSTEMS =
-+ 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing
-+ ///< only metadata information.
-+ AV_CODEC_ID_WRAPPED_AVFRAME =
-+ 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
-+};
-+
-+/**
-+ * Get the type of the given codec.
-+ */
-+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-+
-+/**
-+ * Get the name of a codec.
-+ * @return a static string identifying the codec; never NULL
-+ */
-+const char* avcodec_get_name(enum AVCodecID id);
-+
-+/**
-+ * Return codec bits per sample.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return codec bits per sample.
-+ * Only return non-zero if the bits per sample is exactly correct, not an
-+ * approximation.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec_id the ID of the codec to which the requested profile belongs
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ *
-+ * @note unlike av_get_profile_name(), which searches a list of profiles
-+ * supported by a specific decoder or encoder implementation, this
-+ * function searches the list of profiles from the AVCodecDescriptor
-+ */
-+const char* avcodec_profile_name(enum AVCodecID codec_id, int profile);
-+
-+/**
-+ * Return the PCM codec associated with a sample format.
-+ * @param be endianness, 0 for little, 1 for big,
-+ * -1 (or anything else) for native
-+ * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
-+ */
-+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_ID_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-@@ -0,0 +1,236 @@
-+/*
-+ * Codec parameters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_PAR_H
-+#define AVCODEC_CODEC_PAR_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/pixfmt.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ */
-+
-+enum AVFieldOrder {
-+ AV_FIELD_UNKNOWN,
-+ AV_FIELD_PROGRESSIVE,
-+ AV_FIELD_TT, //< Top coded_first, top displayed first
-+ AV_FIELD_BB, //< Bottom coded first, bottom displayed first
-+ AV_FIELD_TB, //< Top coded first, bottom displayed first
-+ AV_FIELD_BT, //< Bottom coded first, top displayed first
-+};
-+
-+/**
-+ * This struct describes the properties of an encoded stream.
-+ *
-+ * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must
-+ * be allocated with avcodec_parameters_alloc() and freed with
-+ * avcodec_parameters_free().
-+ */
-+typedef struct AVCodecParameters {
-+ /**
-+ * General type of the encoded data.
-+ */
-+ enum AVMediaType codec_type;
-+ /**
-+ * Specific type of the encoded data (the codec used).
-+ */
-+ enum AVCodecID codec_id;
-+ /**
-+ * Additional information about the codec (corresponds to the AVI FOURCC).
-+ */
-+ uint32_t codec_tag;
-+
-+ /**
-+ * Extra binary data needed for initializing the decoder, codec-dependent.
-+ *
-+ * Must be allocated with av_malloc() and will be freed by
-+ * avcodec_parameters_free(). The allocated size of extradata must be at
-+ * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding
-+ * bytes zeroed.
-+ */
-+ uint8_t* extradata;
-+ /**
-+ * Size of the extradata content in bytes.
-+ */
-+ int extradata_size;
-+
-+ /**
-+ * - video: the pixel format, the value corresponds to enum AVPixelFormat.
-+ * - audio: the sample format, the value corresponds to enum AVSampleFormat.
-+ */
-+ int format;
-+
-+ /**
-+ * The average bitrate of the encoded data (in bits per second).
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * The number of bits per sample in the codedwords.
-+ *
-+ * This is basically the bitrate per sample. It is mandatory for a bunch of
-+ * formats to actually decode them. It's the number of bits for one sample in
-+ * the actual coded bitstream.
-+ *
-+ * This could be for example 4 for ADPCM
-+ * For PCM formats this matches bits_per_raw_sample
-+ * Can be 0
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * This is the number of valid bits in each output sample. If the
-+ * sample format has more bits, the least significant bits are additional
-+ * padding bits, which are always 0. Use right shifts to reduce the sample
-+ * to its actual size. For example, audio formats with 24 bit samples will
-+ * have bits_per_raw_sample set to 24, and format set to AV_SAMPLE_FMT_S32.
-+ * To get the original sample use "(int32_t)sample >> 8"."
-+ *
-+ * For ADPCM this might be 12 or 16 or similar
-+ * Can be 0
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * Codec-specific bitstream restrictions that the stream conforms to.
-+ */
-+ int profile;
-+ int level;
-+
-+ /**
-+ * Video only. The dimensions of the video frame in pixels.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Video only. The aspect ratio (width / height) which a single pixel
-+ * should have when displayed.
-+ *
-+ * When the aspect ratio is unknown / undefined, the numerator should be
-+ * set to 0 (the denominator may have any value).
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Video only. The order of the fields in interlaced video.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Video only. Additional colorspace characteristics.
-+ */
-+ enum AVColorRange color_range;
-+ enum AVColorPrimaries color_primaries;
-+ enum AVColorTransferCharacteristic color_trc;
-+ enum AVColorSpace color_space;
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * Video only. Number of delayed frames.
-+ */
-+ int video_delay;
-+
-+ /**
-+ * Audio only. The channel layout bitmask. May be 0 if the channel layout is
-+ * unknown or unspecified, otherwise the number of bits set must be equal to
-+ * the channels field.
-+ */
-+ uint64_t channel_layout;
-+ /**
-+ * Audio only. The number of audio channels.
-+ */
-+ int channels;
-+ /**
-+ * Audio only. The number of audio samples per second.
-+ */
-+ int sample_rate;
-+ /**
-+ * Audio only. The number of bytes per coded audio frame, required by some
-+ * formats.
-+ *
-+ * Corresponds to nBlockAlign in WAVEFORMATEX.
-+ */
-+ int block_align;
-+ /**
-+ * Audio only. Audio frame size, if known. Required by some formats to be
-+ * static.
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) inserted by the encoder at
-+ * the beginning of the audio. I.e. this number of leading decoded samples
-+ * must be discarded by the caller to get the original audio without leading
-+ * padding.
-+ */
-+ int initial_padding;
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ */
-+ int trailing_padding;
-+ /**
-+ * Audio only. Number of samples to skip after a discontinuity.
-+ */
-+ int seek_preroll;
-+} AVCodecParameters;
-+
-+/**
-+ * Allocate a new AVCodecParameters and set its fields to default values
-+ * (unknown/invalid/0). The returned struct must be freed with
-+ * avcodec_parameters_free().
-+ */
-+AVCodecParameters* avcodec_parameters_alloc(void);
-+
-+/**
-+ * Free an AVCodecParameters instance and everything associated with it and
-+ * write NULL to the supplied pointer.
-+ */
-+void avcodec_parameters_free(AVCodecParameters** par);
-+
-+/**
-+ * Copy the contents of src to dst. Any allocated fields in dst are freed and
-+ * replaced with newly allocated duplicates of the corresponding fields in src.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_copy(AVCodecParameters* dst,
-+ const AVCodecParameters* src);
-+
-+/**
-+ * This function is the same as av_get_audio_frame_duration(), except it works
-+ * with AVCodecParameters instead of an AVCodecContext.
-+ */
-+int av_get_audio_frame_duration2(AVCodecParameters* par, int frame_bytes);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_PAR_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-@@ -0,0 +1,171 @@
-+/*
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_DEFS_H
-+#define AVCODEC_DEFS_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Misc types and constants that do not belong anywhere else.
-+ */
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+
-+/**
-+ * @ingroup lavc_decoding
-+ * Required number of additionally allocated bytes at the end of the input
-+ * bitstream for decoding. This is mainly needed because some optimized
-+ * bitstream readers read 32 or 64 bit at once and could read over the end.<br>
-+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
-+ * MPEG bitstreams could cause overread and segfault.
-+ */
-+#define AV_INPUT_BUFFER_PADDING_SIZE 64
-+
-+/**
-+ * @ingroup lavc_decoding
-+ */
-+enum AVDiscard {
-+ /* We leave some space between them for extensions (drop some
-+ * keyframes for intra-only or drop just some bidir frames). */
-+ AVDISCARD_NONE = -16, ///< discard nothing
-+ AVDISCARD_DEFAULT =
-+ 0, ///< discard useless packets like 0 size packets in avi
-+ AVDISCARD_NONREF = 8, ///< discard all non reference
-+ AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
-+ AVDISCARD_NONINTRA = 24, ///< discard all non intra frames
-+ AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-+ AVDISCARD_ALL = 48, ///< discard all
-+};
-+
-+enum AVAudioServiceType {
-+ AV_AUDIO_SERVICE_TYPE_MAIN = 0,
-+ AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
-+ AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-+ AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3,
-+ AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4,
-+ AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5,
-+ AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6,
-+ AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7,
-+ AV_AUDIO_SERVICE_TYPE_KARAOKE = 8,
-+ AV_AUDIO_SERVICE_TYPE_NB, ///< Not part of ABI
-+};
-+
-+/**
-+ * Pan Scan area.
-+ * This specifies the area which should be displayed.
-+ * Note there may be multiple such areas for one frame.
-+ */
-+typedef struct AVPanScan {
-+ /**
-+ * id
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int id;
-+
-+ /**
-+ * width and height in 1/16 pel
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * position of the top left corner in 1/16 pel for up to 3 fields/frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int16_t position[3][2];
-+} AVPanScan;
-+
-+/**
-+ * This structure describes the bitrate properties of an encoded bitstream. It
-+ * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD
-+ * parameters for H.264/HEVC.
-+ */
-+typedef struct AVCPBProperties {
-+ /**
-+ * Maximum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t max_bitrate;
-+ /**
-+ * Minimum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t min_bitrate;
-+ /**
-+ * Average bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t avg_bitrate;
-+
-+ /**
-+ * The size of the buffer to which the ratecontrol is applied, in bits.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t buffer_size;
-+
-+ /**
-+ * The delay between the time the packet this structure is associated with
-+ * is received and the time when it should be decoded, in periods of a 27MHz
-+ * clock.
-+ *
-+ * UINT64_MAX when unknown or unspecified.
-+ */
-+ uint64_t vbv_delay;
-+} AVCPBProperties;
-+
-+/**
-+ * Allocate a CPB properties structure and initialize its fields to default
-+ * values.
-+ *
-+ * @param size if non-NULL, the size of the allocated struct will be written
-+ * here. This is useful for embedding it in side data.
-+ *
-+ * @return the newly allocated struct or NULL on failure
-+ */
-+AVCPBProperties* av_cpb_properties_alloc(size_t* size);
-+
-+/**
-+ * This structure supplies correlation between a packet timestamp and a wall
-+ * clock production time. The definition follows the Producer Reference Time
-+ * ('prft') as defined in ISO/IEC 14496-12
-+ */
-+typedef struct AVProducerReferenceTime {
-+ /**
-+ * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()).
-+ */
-+ int64_t wallclock;
-+ int flags;
-+} AVProducerReferenceTime;
-+
-+/**
-+ * Encode extradata length to a buffer. Used by xiph codecs.
-+ *
-+ * @param s buffer to write to; must be at least (v/255+1) bytes long
-+ * @param v size of extradata in bytes
-+ * @return number of bytes written to the buffer.
-+ */
-+unsigned int av_xiphlacing(unsigned char* s, unsigned int v);
-+
-+#endif // AVCODEC_DEFS_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-@@ -0,0 +1,724 @@
-+/*
-+ * AVPacket public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_PACKET_H
-+#define AVCODEC_PACKET_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "libavutil/attributes.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/rational.h"
-+
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @defgroup lavc_packet AVPacket
-+ *
-+ * Types and functions for working with AVPacket.
-+ * @{
-+ */
-+enum AVPacketSideDataType {
-+ /**
-+ * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
-+ * bytes worth of palette. This side data signals that a new palette is
-+ * present.
-+ */
-+ AV_PKT_DATA_PALETTE,
-+
-+ /**
-+ * The AV_PKT_DATA_NEW_EXTRADATA is used to notify the codec or the format
-+ * that the extradata buffer was changed and the receiving side should
-+ * act upon it appropriately. The new extradata is embedded in the side
-+ * data buffer and should be immediately used for processing the current
-+ * frame or packet.
-+ */
-+ AV_PKT_DATA_NEW_EXTRADATA,
-+
-+ /**
-+ * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-+ * @code
-+ * u32le param_flags
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-+ * s32le channel_count
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-+ * u64le channel_layout
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-+ * s32le sample_rate
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-+ * s32le width
-+ * s32le height
-+ * @endcode
-+ */
-+ AV_PKT_DATA_PARAM_CHANGE,
-+
-+ /**
-+ * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-+ * structures with info about macroblocks relevant to splitting the
-+ * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-+ * That is, it does not necessarily contain info about all macroblocks,
-+ * as long as the distance between macroblocks in the info is smaller
-+ * than the target payload size.
-+ * Each MB info structure is 12 bytes, and is laid out as follows:
-+ * @code
-+ * u32le bit offset from the start of the packet
-+ * u8 current quantizer at the start of the macroblock
-+ * u8 GOB number
-+ * u16le macroblock address within the GOB
-+ * u8 horizontal MV predictor
-+ * u8 vertical MV predictor
-+ * u8 horizontal MV predictor for block number 3
-+ * u8 vertical MV predictor for block number 3
-+ * @endcode
-+ */
-+ AV_PKT_DATA_H263_MB_INFO,
-+
-+ /**
-+ * This side data should be associated with an audio stream and contains
-+ * ReplayGain information in form of the AVReplayGain struct.
-+ */
-+ AV_PKT_DATA_REPLAYGAIN,
-+
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the decoded video frames for
-+ * correct presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_PKT_DATA_DISPLAYMATRIX,
-+
-+ /**
-+ * This side data should be associated with a video stream and contains
-+ * Stereoscopic 3D information in form of the AVStereo3D struct.
-+ */
-+ AV_PKT_DATA_STEREO3D,
-+
-+ /**
-+ * This side data should be associated with an audio stream and corresponds
-+ * to enum AVAudioServiceType.
-+ */
-+ AV_PKT_DATA_AUDIO_SERVICE_TYPE,
-+
-+ /**
-+ * This side data contains quality related information from the encoder.
-+ * @code
-+ * u32le quality factor of the compressed frame. Allowed range is between 1
-+ * (good) and FF_LAMBDA_MAX (bad). u8 picture type u8 error count u16
-+ * reserved u64le[error count] sum of squared differences between encoder in
-+ * and output
-+ * @endcode
-+ */
-+ AV_PKT_DATA_QUALITY_STATS,
-+
-+ /**
-+ * This side data contains an integer value representing the stream index
-+ * of a "fallback" track. A fallback track indicates an alternate
-+ * track to use when the current track can not be decoded for some reason.
-+ * e.g. no decoder available for codec.
-+ */
-+ AV_PKT_DATA_FALLBACK_TRACK,
-+
-+ /**
-+ * This side data corresponds to the AVCPBProperties struct.
-+ */
-+ AV_PKT_DATA_CPB_PROPERTIES,
-+
-+ /**
-+ * Recommmends skipping the specified number of samples
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SKIP_SAMPLES,
-+
-+ /**
-+ * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
-+ * the packet may contain "dual mono" audio specific to Japanese DTV
-+ * and if it is true, recommends only the selected channel to be used.
-+ * @code
-+ * u8 selected channels (0=mail/left, 1=sub/right, 2=both)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_JP_DUALMONO,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop.
-+ */
-+ AV_PKT_DATA_STRINGS_METADATA,
-+
-+ /**
-+ * Subtitle event position
-+ * @code
-+ * u32le x1
-+ * u32le y1
-+ * u32le x2
-+ * u32le y2
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SUBTITLE_POSITION,
-+
-+ /**
-+ * Data found in BlockAdditional element of matroska container. There is
-+ * no end marker for the data, so it is required to rely on the side data
-+ * size to recognize the end. 8 byte id (as found in BlockAddId) followed
-+ * by data.
-+ */
-+ AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
-+
-+ /**
-+ * The optional first identifier line of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_IDENTIFIER,
-+
-+ /**
-+ * The optional settings (rendering instructions) that immediately
-+ * follow the timestamp specifier of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_SETTINGS,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop. This
-+ * side data includes updated metadata which appeared in the stream.
-+ */
-+ AV_PKT_DATA_METADATA_UPDATE,
-+
-+ /**
-+ * MPEGTS stream ID as uint8_t, this is required to pass the stream ID
-+ * information from the demuxer to the corresponding muxer.
-+ */
-+ AV_PKT_DATA_MPEGTS_STREAM_ID,
-+
-+ /**
-+ * Mastering display metadata (based on SMPTE-2086:2014). This metadata
-+ * should be associated with a video stream and contains data in the form
-+ * of the AVMasteringDisplayMetadata struct.
-+ */
-+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
-+
-+ /**
-+ * This side data should be associated with a video stream and corresponds
-+ * to the AVSphericalMapping structure.
-+ */
-+ AV_PKT_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This metadata should be
-+ * associated with a video stream and contains data in the form of the
-+ * AVContentLightMetadata struct.
-+ */
-+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
-+ * a video stream. A53 CC bitstream is stored as uint8_t in
-+ * AVPacketSideData.data. The number of bytes of CC data is
-+ * AVPacketSideData.size.
-+ */
-+ AV_PKT_DATA_A53_CC,
-+
-+ /**
-+ * This side data is encryption initialization data.
-+ * The format is not part of ABI, use av_encryption_init_info_* methods to
-+ * access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INIT_INFO,
-+
-+ /**
-+ * This side data contains encryption info for how to decrypt the packet.
-+ * The format is not part of ABI, use av_encryption_info_* methods to access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INFO,
-+
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_PKT_DATA_AFD,
-+
-+ /**
-+ * Producer Reference Time data corresponding to the AVProducerReferenceTime
-+ * struct, usually exported by some encoders (on demand through the prft flag
-+ * set in the AVCodecContext export_side_data field).
-+ */
-+ AV_PKT_DATA_PRFT,
-+
-+ /**
-+ * ICC profile data consisting of an opaque octet buffer following the
-+ * format described by ISO 15076-1.
-+ */
-+ AV_PKT_DATA_ICC_PROFILE,
-+
-+ /**
-+ * DOVI configuration
-+ * ref:
-+ * dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2,
-+ * section 2.2
-+ * dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2,
-+ * section 3.3 Tags are stored in struct AVDOVIDecoderConfigurationRecord.
-+ */
-+ AV_PKT_DATA_DOVI_CONF,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_PKT_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR10+ dynamic metadata associated with a video frame. The metadata is in
-+ * the form of the AVDynamicHDRPlus struct and contains
-+ * information for color volume transform - application 4 of
-+ * SMPTE 2094-40:2016 standard.
-+ */
-+ AV_PKT_DATA_DYNAMIC_HDR10_PLUS,
-+
-+ /**
-+ * The number of side data types.
-+ * This is not part of the public API/ABI in the sense that it may
-+ * change when new side data types are added.
-+ * This must stay the last enum value.
-+ * If its value becomes huge, some code using it
-+ * needs to be updated as it assumes it to be smaller than other limits.
-+ */
-+ AV_PKT_DATA_NB
-+};
-+
-+#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS // DEPRECATED
-+
-+typedef struct AVPacketSideData {
-+ uint8_t* data;
-+ size_t size;
-+ enum AVPacketSideDataType type;
-+} AVPacketSideData;
-+
-+/**
-+ * This structure stores compressed data. It is typically exported by demuxers
-+ * and then passed as input to decoders, or received as output from encoders and
-+ * then passed to muxers.
-+ *
-+ * For video, it should typically contain one compressed frame. For audio it may
-+ * contain several compressed frames. Encoders are allowed to output empty
-+ * packets, with no compressed data, containing only side data
-+ * (e.g. to update some stream parameters at the end of encoding).
-+ *
-+ * The semantics of data ownership depends on the buf field.
-+ * If it is set, the packet data is dynamically allocated and is
-+ * valid indefinitely until a call to av_packet_unref() reduces the
-+ * reference count to 0.
-+ *
-+ * If the buf field is not set av_packet_ref() would make a copy instead
-+ * of increasing the reference count.
-+ *
-+ * The side data is always allocated with av_malloc(), copied by
-+ * av_packet_ref() and freed by av_packet_unref().
-+ *
-+ * sizeof(AVPacket) being a part of the public ABI is deprecated. once
-+ * av_init_packet() is removed, new packets will only be able to be allocated
-+ * with av_packet_alloc(), and new fields may be added to the end of the struct
-+ * with a minor bump.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ * @see av_packet_unref
-+ */
-+typedef struct AVPacket {
-+ /**
-+ * A reference to the reference-counted buffer where the packet data is
-+ * stored.
-+ * May be NULL, then the packet data is not reference-counted.
-+ */
-+ AVBufferRef* buf;
-+ /**
-+ * Presentation timestamp in AVStream->time_base units; the time at which
-+ * the decompressed packet will be presented to the user.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ * pts MUST be larger or equal to dts as presentation cannot happen before
-+ * decompression, unless one wants to view hex dumps. Some formats misuse
-+ * the terms dts and pts/cts to mean something different. Such timestamps
-+ * must be converted to true pts/dts before they are stored in AVPacket.
-+ */
-+ int64_t pts;
-+ /**
-+ * Decompression timestamp in AVStream->time_base units; the time at which
-+ * the packet is decompressed.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ */
-+ int64_t dts;
-+ uint8_t* data;
-+ int size;
-+ int stream_index;
-+ /**
-+ * A combination of AV_PKT_FLAG values
-+ */
-+ int flags;
-+ /**
-+ * Additional packet data that can be provided by the container.
-+ * Packet can contain several types of side information.
-+ */
-+ AVPacketSideData* side_data;
-+ int side_data_elems;
-+
-+ /**
-+ * Duration of this packet in AVStream->time_base units, 0 if unknown.
-+ * Equals next_pts - this_pts in presentation order.
-+ */
-+ int64_t duration;
-+
-+ int64_t pos; ///< byte position in stream, -1 if unknown
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the packet is unreferenced. av_packet_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target packet's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * Time base of the packet's timestamps.
-+ * In the future, this field may be set on packets output by encoders or
-+ * demuxers, but its value will be by default ignored on input to decoders
-+ * or muxers.
-+ */
-+ AVRational time_base;
-+} AVPacket;
-+
-+#if FF_API_INIT_PACKET
-+attribute_deprecated typedef struct AVPacketList {
-+ AVPacket pkt;
-+ struct AVPacketList* next;
-+} AVPacketList;
-+#endif
-+
-+#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
-+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-+/**
-+ * Flag is used to discard packets which are required to maintain valid
-+ * decoder state but are not required for output and should be dropped
-+ * after decoding.
-+ **/
-+#define AV_PKT_FLAG_DISCARD 0x0004
-+/**
-+ * The packet comes from a trusted source.
-+ *
-+ * Otherwise-unsafe constructs such as arbitrary pointers to data
-+ * outside the packet may be followed.
-+ */
-+#define AV_PKT_FLAG_TRUSTED 0x0008
-+/**
-+ * Flag is used to indicate packets that contain frames that can
-+ * be discarded by the decoder. I.e. Non-reference frames.
-+ */
-+#define AV_PKT_FLAG_DISPOSABLE 0x0010
-+
-+enum AVSideDataParamChangeFlags {
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-+ AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004,
-+ AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008,
-+};
-+
-+/**
-+ * Allocate an AVPacket and set its fields to default values. The resulting
-+ * struct must be freed using av_packet_free().
-+ *
-+ * @return An AVPacket filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVPacket itself, not the data buffers. Those
-+ * must be allocated through other means such as av_new_packet.
-+ *
-+ * @see av_new_packet
-+ */
-+AVPacket* av_packet_alloc(void);
-+
-+/**
-+ * Create a new packet that references the same data as src.
-+ *
-+ * This is a shortcut for av_packet_alloc()+av_packet_ref().
-+ *
-+ * @return newly created AVPacket on success, NULL on error.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ */
-+AVPacket* av_packet_clone(const AVPacket* src);
-+
-+/**
-+ * Free the packet, if the packet is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param pkt packet to be freed. The pointer will be set to NULL.
-+ * @note passing NULL is a no-op.
-+ */
-+void av_packet_free(AVPacket** pkt);
-+
-+#if FF_API_INIT_PACKET
-+/**
-+ * Initialize optional fields of a packet with default values.
-+ *
-+ * Note, this does not touch the data and size members, which have to be
-+ * initialized separately.
-+ *
-+ * @param pkt packet
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_unref
-+ *
-+ * @deprecated This function is deprecated. Once it's removed,
-+ sizeof(AVPacket) will not be a part of the ABI anymore.
-+ */
-+attribute_deprecated void av_init_packet(AVPacket* pkt);
-+#endif
-+
-+/**
-+ * Allocate the payload of a packet and initialize its fields with
-+ * default values.
-+ *
-+ * @param pkt packet
-+ * @param size wanted payload size
-+ * @return 0 if OK, AVERROR_xxx otherwise
-+ */
-+int av_new_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Reduce packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param size new size
-+ */
-+void av_shrink_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Increase packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param grow_by number of bytes by which to increase the size of the packet
-+ */
-+int av_grow_packet(AVPacket* pkt, int grow_by);
-+
-+/**
-+ * Initialize a reference-counted packet from av_malloc()ed data.
-+ *
-+ * @param pkt packet to be initialized. This function will set the data, size,
-+ * and buf fields, all others are left untouched.
-+ * @param data Data allocated by av_malloc() to be used as packet data. If this
-+ * function returns successfully, the data is owned by the underlying
-+ * AVBuffer. The caller may not access the data through other means.
-+ * @param size size of data in bytes, without the padding. I.e. the full buffer
-+ * size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_packet_from_data(AVPacket* pkt, uint8_t* data, int size);
-+
-+/**
-+ * Allocate new information of a packet.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size side information size
-+ * @return pointer to fresh allocated data or NULL otherwise
-+ */
-+uint8_t* av_packet_new_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Wrap an existing array as a packet side data.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param data the side data array. It must be allocated with the av_malloc()
-+ * family of functions. The ownership of the data is transferred to
-+ * pkt.
-+ * @param size side information size
-+ * @return a non-negative number on success, a negative AVERROR code on
-+ * failure. On failure, the packet is unchanged and the data remains
-+ * owned by the caller.
-+ */
-+int av_packet_add_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ uint8_t* data, size_t size);
-+
-+/**
-+ * Shrink the already allocated side data buffer
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size new side information size
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_shrink_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Get side information from packet.
-+ *
-+ * @param pkt packet
-+ * @param type desired side information type
-+ * @param size If supplied, *size will be set to the size of the side data
-+ * or to zero if the desired side data is not present.
-+ * @return pointer to data if present or NULL otherwise
-+ */
-+uint8_t* av_packet_get_side_data(const AVPacket* pkt,
-+ enum AVPacketSideDataType type, size_t* size);
-+
-+const char* av_packet_side_data_name(enum AVPacketSideDataType type);
-+
-+/**
-+ * Pack a dictionary for use in side_data.
-+ *
-+ * @param dict The dictionary to pack.
-+ * @param size pointer to store the size of the returned data
-+ * @return pointer to data if successful, NULL otherwise
-+ */
-+uint8_t* av_packet_pack_dictionary(AVDictionary* dict, size_t* size);
-+/**
-+ * Unpack a dictionary from side_data.
-+ *
-+ * @param data data from side_data
-+ * @param size size of the data
-+ * @param dict the metadata storage dictionary
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_unpack_dictionary(const uint8_t* data, size_t size,
-+ AVDictionary** dict);
-+
-+/**
-+ * Convenience function to free all the side data stored.
-+ * All the other fields stay untouched.
-+ *
-+ * @param pkt packet
-+ */
-+void av_packet_free_side_data(AVPacket* pkt);
-+
-+/**
-+ * Setup a new reference to the data described by a given packet
-+ *
-+ * If src is reference-counted, setup dst as a new reference to the
-+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
-+ * data from src into it.
-+ *
-+ * All the other fields are copied from src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param dst Destination packet. Will be completely overwritten.
-+ * @param src Source packet
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On error, dst
-+ * will be blank (as if returned by av_packet_alloc()).
-+ */
-+int av_packet_ref(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Wipe the packet.
-+ *
-+ * Unreference the buffer referenced by the packet and reset the
-+ * remaining packet fields to their default values.
-+ *
-+ * @param pkt The packet to be unreferenced.
-+ */
-+void av_packet_unref(AVPacket* pkt);
-+
-+/**
-+ * Move every field in src to dst and reset src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param src Source packet, will be reset
-+ * @param dst Destination packet
-+ */
-+void av_packet_move_ref(AVPacket* dst, AVPacket* src);
-+
-+/**
-+ * Copy only "properties" fields from src to dst.
-+ *
-+ * Properties for the purpose of this function are all the fields
-+ * beside those related to the packet data (buf, data, size)
-+ *
-+ * @param dst Destination packet
-+ * @param src Source packet
-+ *
-+ * @return 0 on success AVERROR on failure.
-+ */
-+int av_packet_copy_props(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Ensure the data described by a given packet is reference counted.
-+ *
-+ * @note This function does not ensure that the reference will be writable.
-+ * Use av_packet_make_writable instead for that purpose.
-+ *
-+ * @see av_packet_ref
-+ * @see av_packet_make_writable
-+ *
-+ * @param pkt packet whose data should be made reference counted.
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_refcounted(AVPacket* pkt);
-+
-+/**
-+ * Create a writable reference for the data described by a given packet,
-+ * avoiding data copy if possible.
-+ *
-+ * @param pkt Packet whose data should be made writable.
-+ *
-+ * @return 0 on success, a negative AVERROR on failure. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_writable(AVPacket* pkt);
-+
-+/**
-+ * Convert valid timing fields (timestamps / durations) in a packet from one
-+ * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
-+ * ignored.
-+ *
-+ * @param pkt packet on which the conversion will be performed
-+ * @param tb_src source timebase, in which the timing fields in pkt are
-+ * expressed
-+ * @param tb_dst destination timebase, to which the timing fields will be
-+ * converted
-+ */
-+void av_packet_rescale_ts(AVPacket* pkt, AVRational tb_src, AVRational tb_dst);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_PACKET_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-@@ -0,0 +1,156 @@
-+/*
-+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
-+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
-+ *
-+ * Copyright (C) 2008 NVIDIA
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VDPAU_H
-+#define AVCODEC_VDPAU_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_codec_hwaccel_vdpau
-+ * Public libavcodec VDPAU header.
-+ */
-+
-+/**
-+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
-+ * @ingroup lavc_codec_hwaccel
-+ *
-+ * VDPAU hardware acceleration has two modules
-+ * - VDPAU decoding
-+ * - VDPAU presentation
-+ *
-+ * The VDPAU decoding module parses all headers using FFmpeg
-+ * parsing mechanisms and uses VDPAU for the actual decoding.
-+ *
-+ * As per the current implementation, the actual decoding
-+ * and rendering (API calls) are done as part of the VDPAU
-+ * presentation (vo_vdpau.c) module.
-+ *
-+ * @{
-+ */
-+
-+#include <vdpau/vdpau.h>
-+
-+#include "libavutil/avconfig.h"
-+#include "libavutil/attributes.h"
-+
-+#include "avcodec.h"
-+
-+struct AVCodecContext;
-+struct AVFrame;
-+
-+typedef int (*AVVDPAU_Render2)(struct AVCodecContext*, struct AVFrame*,
-+ const VdpPictureInfo*, uint32_t,
-+ const VdpBitstreamBuffer*);
-+
-+/**
-+ * This structure is used to share data between the libavcodec library and
-+ * the client video application.
-+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
-+ * function and make it available as
-+ * AVCodecContext.hwaccel_context. Members can be set by the user once
-+ * during initialization or through each AVCodecContext.get_buffer()
-+ * function call. In any case, they must be valid prior to calling
-+ * decoding functions.
-+ *
-+ * The size of this structure is not a part of the public ABI and must not
-+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
-+ * AVVDPAUContext.
-+ */
-+typedef struct AVVDPAUContext {
-+ /**
-+ * VDPAU decoder handle
-+ *
-+ * Set by user.
-+ */
-+ VdpDecoder decoder;
-+
-+ /**
-+ * VDPAU decoder render callback
-+ *
-+ * Set by the user.
-+ */
-+ VdpDecoderRender* render;
-+
-+ AVVDPAU_Render2 render2;
-+} AVVDPAUContext;
-+
-+/**
-+ * @brief allocation function for AVVDPAUContext
-+ *
-+ * Allows extending the struct without breaking API/ABI
-+ */
-+AVVDPAUContext* av_alloc_vdpaucontext(void);
-+
-+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext*);
-+void av_vdpau_hwaccel_set_render2(AVVDPAUContext*, AVVDPAU_Render2);
-+
-+/**
-+ * Associate a VDPAU device with a codec context for hardware acceleration.
-+ * This function is meant to be called from the get_format() codec callback,
-+ * or earlier. It can also be called after avcodec_flush_buffers() to change
-+ * the underlying VDPAU device mid-stream (e.g. to recover from non-transparent
-+ * display preemption).
-+ *
-+ * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
-+ * successfully.
-+ *
-+ * @param avctx decoding context whose get_format() callback is invoked
-+ * @param device VDPAU device handle to use for hardware acceleration
-+ * @param get_proc_address VDPAU device driver
-+ * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags
-+ *
-+ * @return 0 on success, an AVERROR code on failure.
-+ */
-+int av_vdpau_bind_context(AVCodecContext* avctx, VdpDevice device,
-+ VdpGetProcAddress* get_proc_address, unsigned flags);
-+
-+/**
-+ * Gets the parameters to create an adequate VDPAU video surface for the codec
-+ * context using VDPAU hardware decoding acceleration.
-+ *
-+ * @note Behavior is undefined if the context was not successfully bound to a
-+ * VDPAU device using av_vdpau_bind_context().
-+ *
-+ * @param avctx the codec context being used for decoding the stream
-+ * @param type storage space for the VDPAU video surface chroma type
-+ * (or NULL to ignore)
-+ * @param width storage space for the VDPAU video surface pixel width
-+ * (or NULL to ignore)
-+ * @param height storage space for the VDPAU video surface pixel height
-+ * (or NULL to ignore)
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_vdpau_get_surface_parameters(AVCodecContext* avctx, VdpChromaType* type,
-+ uint32_t* width, uint32_t* height);
-+
-+/**
-+ * Allocate an AVVDPAUContext.
-+ *
-+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
-+ */
-+AVVDPAUContext* av_vdpau_alloc_context(void);
-+
-+/* @}*/
-+
-+#endif /* AVCODEC_VDPAU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-@@ -0,0 +1,67 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VERSION_H
-+#define AVCODEC_VERSION_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec version macros.
-+ */
-+
-+#include "libavutil/version.h"
-+
-+#define LIBAVCODEC_VERSION_MAJOR 59
-+#define LIBAVCODEC_VERSION_MINOR 18
-+#define LIBAVCODEC_VERSION_MICRO 100
-+
-+#define LIBAVCODEC_VERSION_INT \
-+ AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_VERSION \
-+ AV_VERSION(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-+
-+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-+
-+/**
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ */
-+
-+#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60)
-+
-+#endif /* AVCODEC_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-@@ -0,0 +1,173 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Macro definitions for various function/variable attributes
-+ */
-+
-+#ifndef AVUTIL_ATTRIBUTES_H
-+#define AVUTIL_ATTRIBUTES_H
-+
-+#ifdef __GNUC__
-+# define AV_GCC_VERSION_AT_LEAST(x, y) \
-+ (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-+# define AV_GCC_VERSION_AT_MOST(x, y) \
-+ (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y))
-+#else
-+# define AV_GCC_VERSION_AT_LEAST(x, y) 0
-+# define AV_GCC_VERSION_AT_MOST(x, y) 0
-+#endif
-+
-+#ifdef __has_builtin
-+# define AV_HAS_BUILTIN(x) __has_builtin(x)
-+#else
-+# define AV_HAS_BUILTIN(x) 0
-+#endif
-+
-+#ifndef av_always_inline
-+# if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_always_inline __attribute__((always_inline)) inline
-+# elif defined(_MSC_VER)
-+# define av_always_inline __forceinline
-+# else
-+# define av_always_inline inline
-+# endif
-+#endif
-+
-+#ifndef av_extern_inline
-+# if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
-+# define av_extern_inline extern inline
-+# else
-+# define av_extern_inline inline
-+# endif
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 4)
-+# define av_warn_unused_result __attribute__((warn_unused_result))
-+#else
-+# define av_warn_unused_result
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_noinline __attribute__((noinline))
-+#elif defined(_MSC_VER)
-+# define av_noinline __declspec(noinline)
-+#else
-+# define av_noinline
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_pure __attribute__((pure))
-+#else
-+# define av_pure
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 6) || defined(__clang__)
-+# define av_const __attribute__((const))
-+#else
-+# define av_const
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3) || defined(__clang__)
-+# define av_cold __attribute__((cold))
-+#else
-+# define av_cold
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 1) && !defined(__llvm__)
-+# define av_flatten __attribute__((flatten))
-+#else
-+# define av_flatten
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define attribute_deprecated __attribute__((deprecated))
-+#elif defined(_MSC_VER)
-+# define attribute_deprecated __declspec(deprecated)
-+#else
-+# define attribute_deprecated
-+#endif
-+
-+/**
-+ * Disable warnings about deprecated features
-+ * This is useful for sections of code kept for backward compatibility and
-+ * scheduled for removal.
-+ */
-+#ifndef AV_NOWARN_DEPRECATED
-+# if AV_GCC_VERSION_AT_LEAST(4, 6)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ _Pragma("GCC diagnostic push") \
-+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
-+ code _Pragma("GCC diagnostic pop")
-+# elif defined(_MSC_VER)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ __pragma(warning(push)) __pragma(warning(disable : 4996)) code; \
-+ __pragma(warning(pop))
-+# else
-+# define AV_NOWARN_DEPRECATED(code) code
-+# endif
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_unused __attribute__((unused))
-+#else
-+# define av_unused
-+#endif
-+
-+/**
-+ * Mark a variable as used and prevent the compiler from optimizing it
-+ * away. This is useful for variables accessed only from inline
-+ * assembler without the compiler being aware.
-+ */
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_used __attribute__((used))
-+#else
-+# define av_used
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 3) || defined(__clang__)
-+# define av_alias __attribute__((may_alias))
-+#else
-+# define av_alias
-+#endif
-+
-+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
-+# define av_uninit(x) x = x
-+#else
-+# define av_uninit(x) x
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_builtin_constant_p __builtin_constant_p
-+# define av_printf_format(fmtpos, attrpos) \
-+ __attribute__((__format__(__printf__, fmtpos, attrpos)))
-+#else
-+# define av_builtin_constant_p(x) 0
-+# define av_printf_format(fmtpos, attrpos)
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 5) || defined(__clang__)
-+# define av_noreturn __attribute__((noreturn))
-+#else
-+# define av_noreturn
-+#endif
-+
-+#endif /* AVUTIL_ATTRIBUTES_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-@@ -0,0 +1,6 @@
-+/* Generated by ffmpeg configure */
-+#ifndef AVUTIL_AVCONFIG_H
-+#define AVUTIL_AVCONFIG_H
-+#define AV_HAVE_BIGENDIAN 0
-+#define AV_HAVE_FAST_UNALIGNED 1
-+#endif /* AVUTIL_AVCONFIG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-@@ -0,0 +1,366 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_AVUTIL_H
-+#define AVUTIL_AVUTIL_H
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Convenience header that includes @ref lavu "libavutil"'s core.
-+ */
-+
-+/**
-+ * @mainpage
-+ *
-+ * @section ffmpeg_intro Introduction
-+ *
-+ * This document describes the usage of the different libraries
-+ * provided by FFmpeg.
-+ *
-+ * @li @ref libavc "libavcodec" encoding/decoding library
-+ * @li @ref lavfi "libavfilter" graph-based frame editing library
-+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
-+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
-+ * @li @ref lavu "libavutil" common utility library
-+ * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
-+ * @li @ref lpp "libpostproc" post processing library
-+ * @li @ref libsws "libswscale" color conversion and scaling library
-+ *
-+ * @section ffmpeg_versioning Versioning and compatibility
-+ *
-+ * Each of the FFmpeg libraries contains a version.h header, which defines a
-+ * major, minor and micro version number with the
-+ * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
-+ * number is incremented with backward incompatible changes - e.g. removing
-+ * parts of the public API, reordering public struct members, etc. The minor
-+ * version number is incremented for backward compatible API changes or major
-+ * new features - e.g. adding a new public function or a new decoder. The micro
-+ * version number is incremented for smaller changes that a calling program
-+ * might still want to check for - e.g. changing behavior in a previously
-+ * unspecified situation.
-+ *
-+ * FFmpeg guarantees backward API and ABI compatibility for each library as long
-+ * as its major version number is unchanged. This means that no public symbols
-+ * will be removed or renamed. Types and names of the public struct members and
-+ * values of public macros and enums will remain the same (unless they were
-+ * explicitly declared as not part of the public API). Documented behavior will
-+ * not change.
-+ *
-+ * In other words, any correct program that works with a given FFmpeg snapshot
-+ * should work just as well without any changes with any later snapshot with the
-+ * same major versions. This applies to both rebuilding the program against new
-+ * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
-+ * links against.
-+ *
-+ * However, new public symbols may be added and new members may be appended to
-+ * public structs whose size is not part of public ABI (most public structs in
-+ * FFmpeg). New macros and enum values may be added. Behavior in undocumented
-+ * situations may change slightly (and be documented). All those are accompanied
-+ * by an entry in doc/APIchanges and incrementing either the minor or micro
-+ * version number.
-+ */
-+
-+/**
-+ * @defgroup lavu libavutil
-+ * Common code shared across all FFmpeg libraries.
-+ *
-+ * @note
-+ * libavutil is designed to be modular. In most cases, in order to use the
-+ * functions provided by one component of libavutil you must explicitly include
-+ * the specific header containing that feature. If you are only using
-+ * media-related components, you could simply include libavutil/avutil.h, which
-+ * brings in most of the "core" components.
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_crypto Crypto and Hashing
-+ *
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavu_math Mathematics
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_string String Manipulation
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_mem Memory Management
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_data Data Structures
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_video Video related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_audio Audio related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_error Error Codes
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_log Logging Facility
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_misc Other
-+ *
-+ * @{
-+ *
-+ * @defgroup preproc_misc Preprocessor String Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup version_utils Library Version Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_ver
-+ * @{
-+ */
-+
-+/**
-+ * Return the LIBAVUTIL_VERSION_INT constant.
-+ */
-+unsigned avutil_version(void);
-+
-+/**
-+ * Return an informative version string. This usually is the actual release
-+ * version number or a git commit description. This string has no fixed format
-+ * and can change any time. It should never be parsed by code.
-+ */
-+const char* av_version_info(void);
-+
-+/**
-+ * Return the libavutil build-time configuration.
-+ */
-+const char* avutil_configuration(void);
-+
-+/**
-+ * Return the libavutil license.
-+ */
-+const char* avutil_license(void);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_media Media Type
-+ * @brief Media Type
-+ */
-+
-+enum AVMediaType {
-+ AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA
-+ AVMEDIA_TYPE_VIDEO,
-+ AVMEDIA_TYPE_AUDIO,
-+ AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous
-+ AVMEDIA_TYPE_SUBTITLE,
-+ AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse
-+ AVMEDIA_TYPE_NB
-+};
-+
-+/**
-+ * Return a string describing the media_type enum, NULL if media_type
-+ * is unknown.
-+ */
-+const char* av_get_media_type_string(enum AVMediaType media_type);
-+
-+/**
-+ * @defgroup lavu_const Constants
-+ * @{
-+ *
-+ * @defgroup lavu_enc Encoding specific
-+ *
-+ * @note those definition should move to avcodec
-+ * @{
-+ */
-+
-+#define FF_LAMBDA_SHIFT 7
-+#define FF_LAMBDA_SCALE (1 << FF_LAMBDA_SHIFT)
-+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-+#define FF_LAMBDA_MAX (256 * 128 - 1)
-+
-+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE // FIXME maybe remove
-+
-+/**
-+ * @}
-+ * @defgroup lavu_time Timestamp specific
-+ *
-+ * FFmpeg internal timebase and timestamp definitions
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * @brief Undefined timestamp value
-+ *
-+ * Usually reported by demuxer that work on containers that do not provide
-+ * either pts or dts.
-+ */
-+
-+#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000))
-+
-+/**
-+ * Internal time base represented as integer
-+ */
-+
-+#define AV_TIME_BASE 1000000
-+
-+/**
-+ * Internal time base represented as fractional value
-+ */
-+
-+#define AV_TIME_BASE_Q \
-+ (AVRational) { 1, AV_TIME_BASE }
-+
-+/**
-+ * @}
-+ * @}
-+ * @defgroup lavu_picture Image related
-+ *
-+ * AVPicture types, pixel formats and basic image planes manipulation.
-+ *
-+ * @{
-+ */
-+
-+enum AVPictureType {
-+ AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-+ AV_PICTURE_TYPE_I, ///< Intra
-+ AV_PICTURE_TYPE_P, ///< Predicted
-+ AV_PICTURE_TYPE_B, ///< Bi-dir predicted
-+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4
-+ AV_PICTURE_TYPE_SI, ///< Switching Intra
-+ AV_PICTURE_TYPE_SP, ///< Switching Predicted
-+ AV_PICTURE_TYPE_BI, ///< BI type
-+};
-+
-+/**
-+ * Return a single letter to describe the given picture type
-+ * pict_type.
-+ *
-+ * @param[in] pict_type the picture type @return a single character
-+ * representing the picture type, '?' if pict_type is unknown
-+ */
-+char av_get_picture_type_char(enum AVPictureType pict_type);
-+
-+/**
-+ * @}
-+ */
-+
-+#include "common.h"
-+#include "error.h"
-+#include "rational.h"
-+#include "version.h"
-+#include "macros.h"
-+#include "mathematics.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+/**
-+ * Return x default pointer in case p is NULL.
-+ */
-+static inline void* av_x_if_null(const void* p, const void* x) {
-+ return (void*)(intptr_t)(p ? p : x);
-+}
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param elsize size in bytes of each list element (only 1, 2, 4 or 8)
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+unsigned av_int_list_length_for_size(unsigned elsize, const void* list,
-+ uint64_t term) av_pure;
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+#define av_int_list_length(list, term) \
-+ av_int_list_length_for_size(sizeof(*(list)), list, term)
-+
-+/**
-+ * Open a file using a UTF-8 filename.
-+ * The API of this function matches POSIX fopen(), errors are returned through
-+ * errno.
-+ */
-+FILE* av_fopen_utf8(const char* path, const char* mode);
-+
-+/**
-+ * Return the fractional representation of the internal time base.
-+ */
-+AVRational av_get_time_base_q(void);
-+
-+#define AV_FOURCC_MAX_STRING_SIZE 32
-+
-+#define av_fourcc2str(fourcc) \
-+ av_fourcc_make_string((char[AV_FOURCC_MAX_STRING_SIZE]){0}, fourcc)
-+
-+/**
-+ * Fill the provided buffer with a string containing a FourCC (four-character
-+ * code) representation.
-+ *
-+ * @param buf a buffer with size in bytes of at least
-+ * AV_FOURCC_MAX_STRING_SIZE
-+ * @param fourcc the fourcc to represent
-+ * @return the buffer in input
-+ */
-+char* av_fourcc_make_string(char* buf, uint32_t fourcc);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_AVUTIL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-@@ -0,0 +1,324 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_buffer
-+ * refcounted data buffer API
-+ */
-+
-+#ifndef AVUTIL_BUFFER_H
-+#define AVUTIL_BUFFER_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+/**
-+ * @defgroup lavu_buffer AVBuffer
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBuffer is an API for reference-counted data buffers.
-+ *
-+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
-+ * represents the data buffer itself; it is opaque and not meant to be accessed
-+ * by the caller directly, but only through AVBufferRef. However, the caller may
-+ * e.g. compare two AVBuffer pointers to check whether two different references
-+ * are describing the same data buffer. AVBufferRef represents a single
-+ * reference to an AVBuffer and it is the object that may be manipulated by the
-+ * caller directly.
-+ *
-+ * There are two functions provided for creating a new AVBuffer with a single
-+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
-+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
-+ * reference, additional references may be created with av_buffer_ref().
-+ * Use av_buffer_unref() to free a reference (this will automatically free the
-+ * data once all the references are freed).
-+ *
-+ * The convention throughout this API and the rest of FFmpeg is such that the
-+ * buffer is considered writable if there exists only one reference to it (and
-+ * it has not been marked as read-only). The av_buffer_is_writable() function is
-+ * provided to check whether this is true and av_buffer_make_writable() will
-+ * automatically create a new writable buffer when necessary.
-+ * Of course nothing prevents the calling code from violating this convention,
-+ * however that is safe only when all the existing references are under its
-+ * control.
-+ *
-+ * @note Referencing and unreferencing the buffers is thread-safe and thus
-+ * may be done from multiple threads simultaneously without any need for
-+ * additional locking.
-+ *
-+ * @note Two different references to the same buffer can point to different
-+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
-+ */
-+
-+/**
-+ * A reference counted buffer type. It is opaque and is meant to be used through
-+ * references (AVBufferRef).
-+ */
-+typedef struct AVBuffer AVBuffer;
-+
-+/**
-+ * A reference to a data buffer.
-+ *
-+ * The size of this struct is not a part of the public ABI and it is not meant
-+ * to be allocated directly.
-+ */
-+typedef struct AVBufferRef {
-+ AVBuffer* buffer;
-+
-+ /**
-+ * The data buffer. It is considered writable if and only if
-+ * this is the only reference to the buffer, in which case
-+ * av_buffer_is_writable() returns 1.
-+ */
-+ uint8_t* data;
-+ /**
-+ * Size of data in bytes.
-+ */
-+ size_t size;
-+} AVBufferRef;
-+
-+/**
-+ * Allocate an AVBuffer of the given size using av_malloc().
-+ *
-+ * @return an AVBufferRef of given size or NULL when out of memory
-+ */
-+AVBufferRef* av_buffer_alloc(size_t size);
-+
-+/**
-+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
-+ * to zero.
-+ */
-+AVBufferRef* av_buffer_allocz(size_t size);
-+
-+/**
-+ * Always treat the buffer as read-only, even when it has only one
-+ * reference.
-+ */
-+#define AV_BUFFER_FLAG_READONLY (1 << 0)
-+
-+/**
-+ * Create an AVBuffer from an existing array.
-+ *
-+ * If this function is successful, data is owned by the AVBuffer. The caller may
-+ * only access data through the returned AVBufferRef and references derived from
-+ * it.
-+ * If this function fails, data is left untouched.
-+ * @param data data array
-+ * @param size size of data in bytes
-+ * @param free a callback for freeing this buffer's data
-+ * @param opaque parameter to be got for processing or passed to free
-+ * @param flags a combination of AV_BUFFER_FLAG_*
-+ *
-+ * @return an AVBufferRef referring to data on success, NULL on failure.
-+ */
-+AVBufferRef* av_buffer_create(uint8_t* data, size_t size,
-+ void (*free)(void* opaque, uint8_t* data),
-+ void* opaque, int flags);
-+
-+/**
-+ * Default free callback, which calls av_free() on the buffer data.
-+ * This function is meant to be passed to av_buffer_create(), not called
-+ * directly.
-+ */
-+void av_buffer_default_free(void* opaque, uint8_t* data);
-+
-+/**
-+ * Create a new reference to an AVBuffer.
-+ *
-+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
-+ * failure.
-+ */
-+AVBufferRef* av_buffer_ref(const AVBufferRef* buf);
-+
-+/**
-+ * Free a given reference and automatically free the buffer if there are no more
-+ * references to it.
-+ *
-+ * @param buf the reference to be freed. The pointer is set to NULL on return.
-+ */
-+void av_buffer_unref(AVBufferRef** buf);
-+
-+/**
-+ * @return 1 if the caller may write to the data referred to by buf (which is
-+ * true if and only if buf is the only reference to the underlying AVBuffer).
-+ * Return 0 otherwise.
-+ * A positive answer is valid until av_buffer_ref() is called on buf.
-+ */
-+int av_buffer_is_writable(const AVBufferRef* buf);
-+
-+/**
-+ * @return the opaque parameter set by av_buffer_create.
-+ */
-+void* av_buffer_get_opaque(const AVBufferRef* buf);
-+
-+int av_buffer_get_ref_count(const AVBufferRef* buf);
-+
-+/**
-+ * Create a writable reference from a given buffer reference, avoiding data copy
-+ * if possible.
-+ *
-+ * @param buf buffer reference to make writable. On success, buf is either left
-+ * untouched, or it is unreferenced and a new writable AVBufferRef is
-+ * written in its place. On failure, buf is left untouched.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ */
-+int av_buffer_make_writable(AVBufferRef** buf);
-+
-+/**
-+ * Reallocate a given buffer.
-+ *
-+ * @param buf a buffer reference to reallocate. On success, buf will be
-+ * unreferenced and a new reference with the required size will be
-+ * written in its place. On failure buf will be left untouched. *buf
-+ * may be NULL, then a new buffer is allocated.
-+ * @param size required new buffer size.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ *
-+ * @note the buffer is actually reallocated with av_realloc() only if it was
-+ * initially allocated through av_buffer_realloc(NULL) and there is only one
-+ * reference to it (i.e. the one passed to this function). In all other cases
-+ * a new buffer is allocated and the data is copied.
-+ */
-+int av_buffer_realloc(AVBufferRef** buf, size_t size);
-+
-+/**
-+ * Ensure dst refers to the same data as src.
-+ *
-+ * When *dst is already equivalent to src, do nothing. Otherwise unreference dst
-+ * and replace it with a new reference to src.
-+ *
-+ * @param dst Pointer to either a valid buffer reference or NULL. On success,
-+ * this will point to a buffer reference equivalent to src. On
-+ * failure, dst will be left untouched.
-+ * @param src A buffer reference to replace dst with. May be NULL, then this
-+ * function is equivalent to av_buffer_unref(dst).
-+ * @return 0 on success
-+ * AVERROR(ENOMEM) on memory allocation failure.
-+ */
-+int av_buffer_replace(AVBufferRef** dst, const AVBufferRef* src);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_bufferpool AVBufferPool
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
-+ *
-+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
-+ * meant to solve this in cases when the caller needs a set of buffers of the
-+ * same size (the most obvious use case being buffers for raw video or audio
-+ * frames).
-+ *
-+ * At the beginning, the user must call av_buffer_pool_init() to create the
-+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
-+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
-+ * reference works in all aspects the same way as the one created by
-+ * av_buffer_alloc(). However, when the last reference to this buffer is
-+ * unreferenced, it is returned to the pool instead of being freed and will be
-+ * reused for subsequent av_buffer_pool_get() calls.
-+ *
-+ * When the caller is done with the pool and no longer needs to allocate any new
-+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
-+ * Once all the buffers are released, it will automatically be freed.
-+ *
-+ * Allocating and releasing buffers with this API is thread-safe as long as
-+ * either the default alloc callback is used, or the user-supplied one is
-+ * thread-safe.
-+ */
-+
-+/**
-+ * The buffer pool. This structure is opaque and not meant to be accessed
-+ * directly. It is allocated with av_buffer_pool_init() and freed with
-+ * av_buffer_pool_uninit().
-+ */
-+typedef struct AVBufferPool AVBufferPool;
-+
-+/**
-+ * Allocate and initialize a buffer pool.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be used
-+ * (av_buffer_alloc()).
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init(size_t size,
-+ AVBufferRef* (*alloc)(size_t size));
-+
-+/**
-+ * Allocate and initialize a buffer pool with a more complex allocator.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param opaque arbitrary user data used by the allocator
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be
-+ * used (av_buffer_alloc()).
-+ * @param pool_free a function that will be called immediately before the pool
-+ * is freed. I.e. after av_buffer_pool_uninit() is called
-+ * by the caller and all the frames are returned to the pool
-+ * and freed. It is intended to uninitialize the user opaque
-+ * data. May be NULL.
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init2(size_t size, void* opaque,
-+ AVBufferRef* (*alloc)(void* opaque,
-+ size_t size),
-+ void (*pool_free)(void* opaque));
-+
-+/**
-+ * Mark the pool as being available for freeing. It will actually be freed only
-+ * once all the allocated buffers associated with the pool are released. Thus it
-+ * is safe to call this function while some of the allocated buffers are still
-+ * in use.
-+ *
-+ * @param pool pointer to the pool to be freed. It will be set to NULL.
-+ */
-+void av_buffer_pool_uninit(AVBufferPool** pool);
-+
-+/**
-+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
-+ * This function may be called simultaneously from multiple threads.
-+ *
-+ * @return a reference to the new buffer on success, NULL on error.
-+ */
-+AVBufferRef* av_buffer_pool_get(AVBufferPool* pool);
-+
-+/**
-+ * Query the original opaque parameter of an allocated buffer in the pool.
-+ *
-+ * @param ref a buffer reference to a buffer returned by av_buffer_pool_get.
-+ * @return the opaque parameter set by the buffer allocator function of the
-+ * buffer pool.
-+ *
-+ * @note the opaque parameter of ref is used by the buffer pool implementation,
-+ * therefore you have to use this function to access the original opaque
-+ * parameter of an allocated buffer.
-+ */
-+void* av_buffer_pool_buffer_get_opaque(const AVBufferRef* ref);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_BUFFER_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-@@ -0,0 +1,270 @@
-+/*
-+ * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ * Copyright (c) 2008 Peter Ross
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CHANNEL_LAYOUT_H
-+#define AVUTIL_CHANNEL_LAYOUT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @file
-+ * audio channel layout utility functions
-+ */
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup channel_masks Audio channel masks
-+ *
-+ * A channel layout is a 64-bits integer with a bit set for every channel.
-+ * The number of bits set must be equal to the number of channels.
-+ * The value 0 means that the channel layout is not known.
-+ * @note this data structure is not powerful enough to handle channels
-+ * combinations that have the same channel multiple times, such as
-+ * dual-mono.
-+ *
-+ * @{
-+ */
-+#define AV_CH_FRONT_LEFT 0x00000001
-+#define AV_CH_FRONT_RIGHT 0x00000002
-+#define AV_CH_FRONT_CENTER 0x00000004
-+#define AV_CH_LOW_FREQUENCY 0x00000008
-+#define AV_CH_BACK_LEFT 0x00000010
-+#define AV_CH_BACK_RIGHT 0x00000020
-+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
-+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
-+#define AV_CH_BACK_CENTER 0x00000100
-+#define AV_CH_SIDE_LEFT 0x00000200
-+#define AV_CH_SIDE_RIGHT 0x00000400
-+#define AV_CH_TOP_CENTER 0x00000800
-+#define AV_CH_TOP_FRONT_LEFT 0x00001000
-+#define AV_CH_TOP_FRONT_CENTER 0x00002000
-+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
-+#define AV_CH_TOP_BACK_LEFT 0x00008000
-+#define AV_CH_TOP_BACK_CENTER 0x00010000
-+#define AV_CH_TOP_BACK_RIGHT 0x00020000
-+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
-+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
-+#define AV_CH_WIDE_LEFT 0x0000000080000000ULL
-+#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL
-+#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL
-+#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL
-+#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL
-+#define AV_CH_TOP_SIDE_LEFT 0x0000001000000000ULL
-+#define AV_CH_TOP_SIDE_RIGHT 0x0000002000000000ULL
-+#define AV_CH_BOTTOM_FRONT_CENTER 0x0000004000000000ULL
-+#define AV_CH_BOTTOM_FRONT_LEFT 0x0000008000000000ULL
-+#define AV_CH_BOTTOM_FRONT_RIGHT 0x0000010000000000ULL
-+
-+/** Channel mask value used for AVCodecContext.request_channel_layout
-+ to indicate that the user requests the channel order of the decoder output
-+ to be the native codec channel order. */
-+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
-+
-+/**
-+ * @}
-+ * @defgroup channel_mask_c Audio channel layouts
-+ * @{
-+ * */
-+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_2 \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_QUAD \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT0 \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_5POINT0_BACK \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT0_FRONT \
-+ (AV_CH_LAYOUT_2_2 | AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_FRONT \
-+ (AV_CH_LAYOUT_6POINT0_FRONT | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_7POINT0 \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT0_FRONT \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1 \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT1_WIDE \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_OCTAGONAL \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_CENTER | \
-+ AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_HEXADECAGONAL \
-+ (AV_CH_LAYOUT_OCTAGONAL | AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_BACK_CENTER | \
-+ AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT | AV_CH_STEREO_RIGHT)
-+#define AV_CH_LAYOUT_22POINT2 \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER | AV_CH_BACK_CENTER | AV_CH_LOW_FREQUENCY_2 | \
-+ AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT | AV_CH_TOP_FRONT_LEFT | \
-+ AV_CH_TOP_FRONT_RIGHT | AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_CENTER | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_SIDE_LEFT | \
-+ AV_CH_TOP_SIDE_RIGHT | AV_CH_TOP_BACK_CENTER | AV_CH_BOTTOM_FRONT_CENTER | \
-+ AV_CH_BOTTOM_FRONT_LEFT | AV_CH_BOTTOM_FRONT_RIGHT)
-+
-+enum AVMatrixEncoding {
-+ AV_MATRIX_ENCODING_NONE,
-+ AV_MATRIX_ENCODING_DOLBY,
-+ AV_MATRIX_ENCODING_DPLII,
-+ AV_MATRIX_ENCODING_DPLIIX,
-+ AV_MATRIX_ENCODING_DPLIIZ,
-+ AV_MATRIX_ENCODING_DOLBYEX,
-+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
-+ AV_MATRIX_ENCODING_NB
-+};
-+
-+/**
-+ * Return a channel layout id that matches name, or 0 if no match is found.
-+ *
-+ * name can be one or several of the following notations,
-+ * separated by '+' or '|':
-+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
-+ * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
-+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
-+ * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
-+ * - a number of channels, in decimal, followed by 'c', yielding
-+ * the default channel layout for that number of channels (@see
-+ * av_get_default_channel_layout);
-+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
-+ * AV_CH_* macros).
-+ *
-+ * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
-+ */
-+uint64_t av_get_channel_layout(const char* name);
-+
-+/**
-+ * Return a channel layout and the number of channels based on the specified
-+ * name.
-+ *
-+ * This function is similar to (@see av_get_channel_layout), but can also parse
-+ * unknown channel layout specifications.
-+ *
-+ * @param[in] name channel layout specification string
-+ * @param[out] channel_layout parsed channel layout (0 if unknown)
-+ * @param[out] nb_channels number of channels
-+ *
-+ * @return 0 on success, AVERROR(EINVAL) if the parsing fails.
-+ */
-+int av_get_extended_channel_layout(const char* name, uint64_t* channel_layout,
-+ int* nb_channels);
-+
-+/**
-+ * Return a description of a channel layout.
-+ * If nb_channels is <= 0, it is guessed from the channel_layout.
-+ *
-+ * @param buf put here the string containing the channel layout
-+ * @param buf_size size in bytes of the buffer
-+ */
-+void av_get_channel_layout_string(char* buf, int buf_size, int nb_channels,
-+ uint64_t channel_layout);
-+
-+struct AVBPrint;
-+/**
-+ * Append a description of a channel layout to a bprint buffer.
-+ */
-+void av_bprint_channel_layout(struct AVBPrint* bp, int nb_channels,
-+ uint64_t channel_layout);
-+
-+/**
-+ * Return the number of channels in the channel layout.
-+ */
-+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-+
-+/**
-+ * Return default channel layout for a given number of channels.
-+ */
-+int64_t av_get_default_channel_layout(int nb_channels);
-+
-+/**
-+ * Get the index of a channel in channel_layout.
-+ *
-+ * @param channel a channel layout describing exactly one channel which must be
-+ * present in channel_layout.
-+ *
-+ * @return index of channel in channel_layout on success, a negative AVERROR
-+ * on error.
-+ */
-+int av_get_channel_layout_channel_index(uint64_t channel_layout,
-+ uint64_t channel);
-+
-+/**
-+ * Get the channel with the given index in channel_layout.
-+ */
-+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-+
-+/**
-+ * Get the name of a given channel.
-+ *
-+ * @return channel name on success, NULL on error.
-+ */
-+const char* av_get_channel_name(uint64_t channel);
-+
-+/**
-+ * Get the description of a given channel.
-+ *
-+ * @param channel a channel layout with a single channel
-+ * @return channel description on success, NULL on error
-+ */
-+const char* av_get_channel_description(uint64_t channel);
-+
-+/**
-+ * Get the value and name of a standard channel layout.
-+ *
-+ * @param[in] index index in an internal list, starting at 0
-+ * @param[out] layout channel layout mask
-+ * @param[out] name name of the layout
-+ * @return 0 if the layout exists,
-+ * <0 if index is beyond the limits
-+ */
-+int av_get_standard_channel_layout(unsigned index, uint64_t* layout,
-+ const char** name);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-@@ -0,0 +1,590 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * common internal and external API header
-+ */
-+
-+#ifndef AVUTIL_COMMON_H
-+#define AVUTIL_COMMON_H
-+
-+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && \
-+ !defined(UINT64_C)
-+# error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-+#endif
-+
-+#include <errno.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+#include <math.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "attributes.h"
-+#include "macros.h"
-+#include "version.h"
-+
-+// rounded division & shift
-+#define RSHIFT(a, b) \
-+ ((a) > 0 ? ((a) + ((1 << (b)) >> 1)) >> (b) \
-+ : ((a) + ((1 << (b)) >> 1) - 1) >> (b))
-+/* assume b>0 */
-+#define ROUNDED_DIV(a, b) \
-+ (((a) >= 0 ? (a) + ((b) >> 1) : (a) - ((b) >> 1)) / (b))
-+/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
-+#define AV_CEIL_RSHIFT(a, b) \
-+ (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) : ((a) + (1 << (b)) - 1) >> (b))
-+/* Backwards compat. */
-+#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
-+
-+#define FFUDIV(a, b) (((a) > 0 ? (a) : (a) - (b) + 1) / (b))
-+#define FFUMOD(a, b) ((a) - (b)*FFUDIV(a, b))
-+
-+/**
-+ * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as
-+ * they are not representable as absolute values of their type. This is the same
-+ * as with *abs()
-+ * @see FFNABS()
-+ */
-+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-+
-+/**
-+ * Negative Absolute value.
-+ * this works for all integers of all types.
-+ * As with many macros, this evaluates its argument twice, it thus must not have
-+ * a sideeffect, that is FFNABS(x++) has undefined behavior.
-+ */
-+#define FFNABS(a) ((a) <= 0 ? (a) : (-(a)))
-+
-+/**
-+ * Unsigned Absolute value.
-+ * This takes the absolute value of a signed int and returns it as a unsigned.
-+ * This also works with INT_MIN which would otherwise not be representable
-+ * As with many macros, this evaluates its argument twice.
-+ */
-+#define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a))
-+#define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a))
-+
-+/* misc math functions */
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "config.h"
-+# include "intmath.h"
-+#endif
-+
-+#ifndef av_ceil_log2
-+# define av_ceil_log2 av_ceil_log2_c
-+#endif
-+#ifndef av_clip
-+# define av_clip av_clip_c
-+#endif
-+#ifndef av_clip64
-+# define av_clip64 av_clip64_c
-+#endif
-+#ifndef av_clip_uint8
-+# define av_clip_uint8 av_clip_uint8_c
-+#endif
-+#ifndef av_clip_int8
-+# define av_clip_int8 av_clip_int8_c
-+#endif
-+#ifndef av_clip_uint16
-+# define av_clip_uint16 av_clip_uint16_c
-+#endif
-+#ifndef av_clip_int16
-+# define av_clip_int16 av_clip_int16_c
-+#endif
-+#ifndef av_clipl_int32
-+# define av_clipl_int32 av_clipl_int32_c
-+#endif
-+#ifndef av_clip_intp2
-+# define av_clip_intp2 av_clip_intp2_c
-+#endif
-+#ifndef av_clip_uintp2
-+# define av_clip_uintp2 av_clip_uintp2_c
-+#endif
-+#ifndef av_mod_uintp2
-+# define av_mod_uintp2 av_mod_uintp2_c
-+#endif
-+#ifndef av_sat_add32
-+# define av_sat_add32 av_sat_add32_c
-+#endif
-+#ifndef av_sat_dadd32
-+# define av_sat_dadd32 av_sat_dadd32_c
-+#endif
-+#ifndef av_sat_sub32
-+# define av_sat_sub32 av_sat_sub32_c
-+#endif
-+#ifndef av_sat_dsub32
-+# define av_sat_dsub32 av_sat_dsub32_c
-+#endif
-+#ifndef av_sat_add64
-+# define av_sat_add64 av_sat_add64_c
-+#endif
-+#ifndef av_sat_sub64
-+# define av_sat_sub64 av_sat_sub64_c
-+#endif
-+#ifndef av_clipf
-+# define av_clipf av_clipf_c
-+#endif
-+#ifndef av_clipd
-+# define av_clipd av_clipd_c
-+#endif
-+#ifndef av_popcount
-+# define av_popcount av_popcount_c
-+#endif
-+#ifndef av_popcount64
-+# define av_popcount64 av_popcount64_c
-+#endif
-+#ifndef av_parity
-+# define av_parity av_parity_c
-+#endif
-+
-+#ifndef av_log2
-+av_const int av_log2(unsigned v);
-+#endif
-+
-+#ifndef av_log2_16bit
-+av_const int av_log2_16bit(unsigned v);
-+#endif
-+
-+/**
-+ * Clip a signed integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_c(int a, int amin, int amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64bit integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin,
-+ int64_t amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-255 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint8_t av_clip_uint8_c(int a) {
-+ if (a & (~0xFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -128,127 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int8_t av_clip_int8_c(int a) {
-+ if ((a + 0x80U) & ~0xFF)
-+ return (a >> 31) ^ 0x7F;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-65535 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint16_t av_clip_uint16_c(int a) {
-+ if (a & (~0xFFFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -32768,32767 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int16_t av_clip_int16_c(int a) {
-+ if ((a + 0x8000U) & ~0xFFFF)
-+ return (a >> 31) ^ 0x7FFF;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) {
-+ if ((a + 0x80000000u) & ~UINT64_C(0xFFFFFFFF))
-+ return (int32_t)((a >> 63) ^ 0x7FFFFFFF);
-+ else
-+ return (int32_t)a;
-+}
-+
-+/**
-+ * Clip a signed integer into the -(2^p),(2^p-1) range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_intp2_c(int a, int p) {
-+ if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
-+ return (a >> 31) ^ ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer to an unsigned power of two range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) {
-+ if (a & ~((1 << p) - 1))
-+ return (~a) >> 31 & ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clear high bits from an unsigned integer starting with specific bit position
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a,
-+ unsigned p) {
-+ return a & ((1U << p) - 1);
-+}
-+
-+/**
-+ * Add two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int av_sat_add32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a + b);
-+}
-+
-+/**
-+ * Add a doubled value to another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and added to a
-+ * @return sum sat(a + sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dadd32_c(int a, int b) {
-+ return av_sat_add32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Subtract two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int av_sat_sub32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a - b);
-+}
-+
-+/**
-+ * Subtract a doubled value from another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and subtracted from a
-+ * @return difference sat(a - sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dsub32_c(int a, int b) {
-+ return av_sat_sub32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Add two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_add64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_add_overflow)
-+ int64_t tmp;
-+ return !__builtin_add_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ int64_t s = a + (uint64_t)b;
-+ if ((int64_t)(a ^ b | ~s ^ b) >= 0) return INT64_MAX ^ (b >> 63);
-+ return s;
-+#endif
-+}
-+
-+/**
-+ * Subtract two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_sub64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_sub_overflow)
-+ int64_t tmp;
-+ return !__builtin_sub_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ if (b <= 0 && a >= INT64_MAX + b) return INT64_MAX;
-+ if (b >= 0 && a <= INT64_MIN + b) return INT64_MIN;
-+ return a - b;
-+#endif
-+}
-+
-+/**
-+ * Clip a float value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const float av_clipf_c(float a, float amin,
-+ float amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/**
-+ * Clip a double value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const double av_clipd_c(double a, double amin,
-+ double amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/** Compute ceil(log2(x)).
-+ * @param x value used to compute ceil(log2(x))
-+ * @return computed ceiling of log2(x)
-+ */
-+static av_always_inline av_const int av_ceil_log2_c(int x) {
-+ return av_log2((x - 1U) << 1);
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount_c(uint32_t x) {
-+ x -= (x >> 1) & 0x55555555;
-+ x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-+ x = (x + (x >> 4)) & 0x0F0F0F0F;
-+ x += x >> 8;
-+ return (x + (x >> 16)) & 0x3F;
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount64_c(uint64_t x) {
-+ return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-+}
-+
-+static av_always_inline av_const int av_parity_c(uint32_t v) {
-+ return av_popcount(v) & 1;
-+}
-+
-+/**
-+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_BYTE Expression reading one byte from the input.
-+ * Evaluated up to 7 times (4 for the currently
-+ * assigned Unicode range). With a memory buffer
-+ * input, this could be *ptr++, or if you want to make sure
-+ * that *ptr stops at the end of a NULL terminated string then
-+ * *ptr ? *ptr++ : 0
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ *
-+ * @warning ERROR should not contain a loop control statement which
-+ * could interact with the internal while loop, and should force an
-+ * exit from the macro code (e.g. through a goto or a return) in order
-+ * to prevent undefined results.
-+ */
-+#define GET_UTF8(val, GET_BYTE, ERROR) \
-+ val = (GET_BYTE); \
-+ { \
-+ uint32_t top = (val & 128) >> 1; \
-+ if ((val & 0xc0) == 0x80 || val >= 0xFE) { \
-+ ERROR \
-+ } \
-+ while (val & top) { \
-+ unsigned int tmp = (GET_BYTE)-128; \
-+ if (tmp >> 6) { \
-+ ERROR \
-+ } \
-+ val = (val << 6) + tmp; \
-+ top <<= 5; \
-+ } \
-+ val &= (top << 1) - 1; \
-+ }
-+
-+/**
-+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
-+ * to native byte order. Evaluated one or two times.
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ */
-+#define GET_UTF16(val, GET_16BIT, ERROR) \
-+ val = (GET_16BIT); \
-+ { \
-+ unsigned int hi = val - 0xD800; \
-+ if (hi < 0x800) { \
-+ val = (GET_16BIT)-0xDC00; \
-+ if (val > 0x3FFU || hi > 0x3FFU) { \
-+ ERROR \
-+ } \
-+ val += (hi << 10) + 0x10000; \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
-+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes
-+ * long).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint8_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_BYTE.
-+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
-+ * It could be a function or a statement, and uses tmp as the input byte.
-+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
-+ * executed up to 4 times for values in the valid UTF-8 range and up to
-+ * 7 times in the general case, depending on the length of the converted
-+ * Unicode character.
-+ */
-+#define PUT_UTF8(val, tmp, PUT_BYTE) \
-+ { \
-+ int bytes, shift; \
-+ uint32_t in = val; \
-+ if (in < 0x80) { \
-+ tmp = in; \
-+ PUT_BYTE \
-+ } else { \
-+ bytes = (av_log2(in) + 4) / 5; \
-+ shift = (bytes - 1) * 6; \
-+ tmp = (256 - (256 >> bytes)) | (in >> shift); \
-+ PUT_BYTE \
-+ while (shift >= 6) { \
-+ shift -= 6; \
-+ tmp = 0x80 | ((in >> shift) & 0x3f); \
-+ PUT_BYTE \
-+ } \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
-+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint16_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_16BIT.
-+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
-+ * in desired endianness. It could be a function or a statement, and uses tmp
-+ * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;"
-+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
-+ */
-+#define PUT_UTF16(val, tmp, PUT_16BIT) \
-+ { \
-+ uint32_t in = val; \
-+ if (in < 0x10000) { \
-+ tmp = in; \
-+ PUT_16BIT \
-+ } else { \
-+ tmp = 0xD800 | ((in - 0x10000) >> 10); \
-+ PUT_16BIT \
-+ tmp = 0xDC00 | ((in - 0x10000) & 0x3FF); \
-+ PUT_16BIT \
-+ } \
-+ }
-+
-+#include "mem.h"
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "internal.h"
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+#endif /* AVUTIL_COMMON_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-@@ -0,0 +1,138 @@
-+/*
-+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CPU_H
-+#define AVUTIL_CPU_H
-+
-+#include <stddef.h>
-+
-+#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
-+
-+/* lower 16 bits - CPU features */
-+#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
-+#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
-+#define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
-+#define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
-+#define AV_CPU_FLAG_SSE2SLOW \
-+ 0x40000000 ///< SSE2 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-+#define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
-+#define AV_CPU_FLAG_SSE3SLOW \
-+ 0x20000000 ///< SSE3 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
-+#define AV_CPU_FLAG_SSSE3SLOW \
-+ 0x4000000 ///< SSSE3 supported, but usually not faster
-+#define AV_CPU_FLAG_ATOM \
-+ 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-+#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
-+#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
-+#define AV_CPU_FLAG_AESNI 0x80000 ///< Advanced Encryption Standard functions
-+#define AV_CPU_FLAG_AVX \
-+ 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_AVXSLOW \
-+ 0x8000000 ///< AVX supported, but slow when using YMM registers (e.g.
-+ ///< Bulldozer)
-+#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
-+#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
-+#define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction
-+#define AV_CPU_FLAG_AVX2 \
-+ 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions
-+#define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1
-+#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
-+#define AV_CPU_FLAG_AVX512 \
-+ 0x100000 ///< AVX-512 functions: requires OS support even if YMM/ZMM
-+ ///< registers aren't used
-+#define AV_CPU_FLAG_SLOW_GATHER 0x2000000 ///< CPU has slow gathers.
-+
-+#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
-+#define AV_CPU_FLAG_VSX 0x0002 ///< ISA 2.06
-+#define AV_CPU_FLAG_POWER8 0x0004 ///< ISA 2.07
-+
-+#define AV_CPU_FLAG_ARMV5TE (1 << 0)
-+#define AV_CPU_FLAG_ARMV6 (1 << 1)
-+#define AV_CPU_FLAG_ARMV6T2 (1 << 2)
-+#define AV_CPU_FLAG_VFP (1 << 3)
-+#define AV_CPU_FLAG_VFPV3 (1 << 4)
-+#define AV_CPU_FLAG_NEON (1 << 5)
-+#define AV_CPU_FLAG_ARMV8 (1 << 6)
-+#define AV_CPU_FLAG_VFP_VM \
-+ (1 << 7) ///< VFPv2 vector mode, deprecated in ARMv7-A and unavailable in
-+ ///< various CPUs implementations
-+#define AV_CPU_FLAG_SETEND (1 << 16)
-+
-+#define AV_CPU_FLAG_MMI (1 << 0)
-+#define AV_CPU_FLAG_MSA (1 << 1)
-+
-+// Loongarch SIMD extension.
-+#define AV_CPU_FLAG_LSX (1 << 0)
-+#define AV_CPU_FLAG_LASX (1 << 1)
-+
-+/**
-+ * Return the flags which specify extensions supported by the CPU.
-+ * The returned value is affected by av_force_cpu_flags() if that was used
-+ * before. So av_get_cpu_flags() can easily be used in an application to
-+ * detect the enabled cpu flags.
-+ */
-+int av_get_cpu_flags(void);
-+
-+/**
-+ * Disables cpu detection and forces the specified flags.
-+ * -1 is a special case that disables forcing of specific flags.
-+ */
-+void av_force_cpu_flags(int flags);
-+
-+/**
-+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on
-+ * that.
-+ *
-+ * @return negative on error.
-+ */
-+int av_parse_cpu_caps(unsigned* flags, const char* s);
-+
-+/**
-+ * @return the number of logical CPU cores present.
-+ */
-+int av_cpu_count(void);
-+
-+/**
-+ * Overrides cpu count detection and forces the specified count.
-+ * Count < 1 disables forcing of specific count.
-+ */
-+void av_cpu_force_count(int count);
-+
-+/**
-+ * Get the maximum data alignment that may be required by FFmpeg.
-+ *
-+ * Note that this is affected by the build configuration and the CPU flags mask,
-+ * so e.g. if the CPU supports AVX, but libavutil has been built with
-+ * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
-+ * av_set_cpu_flags_mask(), then this function will behave as if AVX is not
-+ * present.
-+ */
-+size_t av_cpu_max_align(void);
-+
-+#endif /* AVUTIL_CPU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-@@ -0,0 +1,215 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Public dictionary API.
-+ * @deprecated
-+ * AVDictionary is provided for compatibility with libav. It is both in
-+ * implementation as well as API inefficient. It does not scale and is
-+ * extremely slow with large dictionaries.
-+ * It is recommended that new code uses our tree container from tree.c/h
-+ * where applicable, which uses AVL trees to achieve O(log n) performance.
-+ */
-+
-+#ifndef AVUTIL_DICT_H
-+#define AVUTIL_DICT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @addtogroup lavu_dict AVDictionary
-+ * @ingroup lavu_data
-+ *
-+ * @brief Simple key:value store
-+ *
-+ * @{
-+ * Dictionaries are used for storing key:value pairs. To create
-+ * an AVDictionary, simply pass an address of a NULL pointer to
-+ * av_dict_set(). NULL can be used as an empty dictionary wherever
-+ * a pointer to an AVDictionary is required.
-+ * Use av_dict_get() to retrieve an entry or iterate over all
-+ * entries and finally av_dict_free() to free the dictionary
-+ * and all its contents.
-+ *
-+ @code
-+ AVDictionary *d = NULL; // "create" an empty dictionary
-+ AVDictionaryEntry *t = NULL;
-+
-+ av_dict_set(&d, "foo", "bar", 0); // add an entry
-+
-+ char *k = av_strdup("key"); // if your strings are already allocated,
-+ char *v = av_strdup("value"); // you can avoid copying them like this
-+ av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
-+
-+ while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
-+ <....> // iterate over all entries in d
-+ }
-+ av_dict_free(&d);
-+ @endcode
-+ */
-+
-+#define AV_DICT_MATCH_CASE \
-+ 1 /**< Only get an entry with exact-case key match. Only relevant in \
-+ av_dict_get(). */
-+#define AV_DICT_IGNORE_SUFFIX \
-+ 2 /**< Return first entry in a dictionary whose first part corresponds to \
-+ the search key, ignoring the suffix of the found key string. Only \
-+ relevant in av_dict_get(). */
-+#define AV_DICT_DONT_STRDUP_KEY \
-+ 4 /**< Take ownership of a key that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_STRDUP_VAL \
-+ 8 /**< Take ownership of a value that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries.
-+#define AV_DICT_APPEND \
-+ 32 /**< If the entry already exists, append to it. Note that no \
-+ delimiter is added, the strings are simply concatenated. */
-+#define AV_DICT_MULTIKEY \
-+ 64 /**< Allow to store several equal keys in the dictionary */
-+
-+typedef struct AVDictionaryEntry {
-+ char* key;
-+ char* value;
-+} AVDictionaryEntry;
-+
-+typedef struct AVDictionary AVDictionary;
-+
-+/**
-+ * Get a dictionary entry with matching key.
-+ *
-+ * The returned entry key or value must not be changed, or it will
-+ * cause undefined behavior.
-+ *
-+ * To iterate through all the dictionary entries, you can set the matching key
-+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
-+ *
-+ * @param prev Set to the previous matching element to find the next.
-+ * If set to NULL the first matching element is returned.
-+ * @param key matching key
-+ * @param flags a collection of AV_DICT_* flags controlling how the entry is
-+ * retrieved
-+ * @return found entry or NULL in case no matching entry was found in the
-+ * dictionary
-+ */
-+AVDictionaryEntry* av_dict_get(const AVDictionary* m, const char* key,
-+ const AVDictionaryEntry* prev, int flags);
-+
-+/**
-+ * Get number of entries in dictionary.
-+ *
-+ * @param m dictionary
-+ * @return number of entries in dictionary
-+ */
-+int av_dict_count(const AVDictionary* m);
-+
-+/**
-+ * Set the given entry in *pm, overwriting an existing entry.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
-+ * these arguments will be freed on error.
-+ *
-+ * Warning: Adding a new entry to a dictionary invalidates all existing entries
-+ * previously returned with av_dict_get.
-+ *
-+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
-+ * a dictionary struct is allocated and put in *pm.
-+ * @param key entry key to add to *pm (will either be av_strduped or added as a
-+ * new key depending on flags)
-+ * @param value entry value to add to *pm (will be av_strduped or added as a new
-+ * key depending on flags). Passing a NULL value will cause an existing entry to
-+ * be deleted.
-+ * @return >= 0 on success otherwise an error code <0
-+ */
-+int av_dict_set(AVDictionary** pm, const char* key, const char* value,
-+ int flags);
-+
-+/**
-+ * Convenience wrapper for av_dict_set that converts the value to a string
-+ * and stores it.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
-+ */
-+int av_dict_set_int(AVDictionary** pm, const char* key, int64_t value,
-+ int flags);
-+
-+/**
-+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
-+ *
-+ * In case of failure, all the successfully set entries are stored in
-+ * *pm. You may need to manually free the created dictionary.
-+ *
-+ * @param key_val_sep a 0-terminated list of characters used to separate
-+ * key from value
-+ * @param pairs_sep a 0-terminated list of characters used to separate
-+ * two pairs from each other
-+ * @param flags flags to use when adding to dictionary.
-+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
-+ * are ignored since the key/value tokens will always
-+ * be duplicated.
-+ * @return 0 on success, negative AVERROR code on failure
-+ */
-+int av_dict_parse_string(AVDictionary** pm, const char* str,
-+ const char* key_val_sep, const char* pairs_sep,
-+ int flags);
-+
-+/**
-+ * Copy entries from one AVDictionary struct into another.
-+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
-+ * this function will allocate a struct for you and put it in *dst
-+ * @param src pointer to source AVDictionary struct
-+ * @param flags flags to use when setting entries in *dst
-+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
-+ * @return 0 on success, negative AVERROR code on failure. If dst was allocated
-+ * by this function, callers should free the associated memory.
-+ */
-+int av_dict_copy(AVDictionary** dst, const AVDictionary* src, int flags);
-+
-+/**
-+ * Free all the memory allocated for an AVDictionary struct
-+ * and all keys and values.
-+ */
-+void av_dict_free(AVDictionary** m);
-+
-+/**
-+ * Get dictionary entries as a string.
-+ *
-+ * Create a string containing dictionary's entries.
-+ * Such string may be passed back to av_dict_parse_string().
-+ * @note String is escaped with backslashes ('\').
-+ *
-+ * @param[in] m dictionary
-+ * @param[out] buffer Pointer to buffer that will be allocated with
-+ * string containg entries. Buffer must be freed by the caller when is no longer
-+ * needed.
-+ * @param[in] key_val_sep character used to separate key from value
-+ * @param[in] pairs_sep character used to separate two pairs from each
-+ * other
-+ * @return >= 0 on success, negative on error
-+ * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the
-+ * same.
-+ */
-+int av_dict_get_string(const AVDictionary* m, char** buffer,
-+ const char key_val_sep, const char pairs_sep);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_DICT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-@@ -0,0 +1,158 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * error code definitions
-+ */
-+
-+#ifndef AVUTIL_ERROR_H
-+#define AVUTIL_ERROR_H
-+
-+#include <errno.h>
-+#include <stddef.h>
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup lavu_error
-+ *
-+ * @{
-+ */
-+
-+/* error handling */
-+#if EDOM > 0
-+# define AVERROR(e) \
-+ (-(e)) ///< Returns a negative error code from a POSIX error code, to
-+ ///< return from library functions.
-+# define AVUNERROR(e) \
-+ (-(e)) ///< Returns a POSIX error code from a library function error return
-+ ///< value.
-+#else
-+/* Some platforms have E* and errno already negated. */
-+# define AVERROR(e) (e)
-+# define AVUNERROR(e) (e)
-+#endif
-+
-+#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
-+
-+#define AVERROR_BSF_NOT_FOUND \
-+ FFERRTAG(0xF8, 'B', 'S', 'F') ///< Bitstream filter not found
-+#define AVERROR_BUG \
-+ FFERRTAG('B', 'U', 'G', '!') ///< Internal bug, also see AVERROR_BUG2
-+#define AVERROR_BUFFER_TOO_SMALL \
-+ FFERRTAG('B', 'U', 'F', 'S') ///< Buffer too small
-+#define AVERROR_DECODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'C') ///< Decoder not found
-+#define AVERROR_DEMUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'M') ///< Demuxer not found
-+#define AVERROR_ENCODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'E', 'N', 'C') ///< Encoder not found
-+#define AVERROR_EOF FFERRTAG('E', 'O', 'F', ' ') ///< End of file
-+#define AVERROR_EXIT \
-+ FFERRTAG('E', 'X', 'I', 'T') ///< Immediate exit was requested; the called
-+ ///< function should not be restarted
-+#define AVERROR_EXTERNAL \
-+ FFERRTAG('E', 'X', 'T', ' ') ///< Generic error in an external library
-+#define AVERROR_FILTER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'F', 'I', 'L') ///< Filter not found
-+#define AVERROR_INVALIDDATA \
-+ FFERRTAG('I', 'N', 'D', 'A') ///< Invalid data found when processing input
-+#define AVERROR_MUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'M', 'U', 'X') ///< Muxer not found
-+#define AVERROR_OPTION_NOT_FOUND \
-+ FFERRTAG(0xF8, 'O', 'P', 'T') ///< Option not found
-+#define AVERROR_PATCHWELCOME \
-+ FFERRTAG('P', 'A', 'W', \
-+ 'E') ///< Not yet implemented in FFmpeg, patches welcome
-+#define AVERROR_PROTOCOL_NOT_FOUND \
-+ FFERRTAG(0xF8, 'P', 'R', 'O') ///< Protocol not found
-+
-+#define AVERROR_STREAM_NOT_FOUND \
-+ FFERRTAG(0xF8, 'S', 'T', 'R') ///< Stream not found
-+/**
-+ * This is semantically identical to AVERROR_BUG
-+ * it has been introduced in Libav after our AVERROR_BUG and with a modified
-+ * value.
-+ */
-+#define AVERROR_BUG2 FFERRTAG('B', 'U', 'G', ' ')
-+#define AVERROR_UNKNOWN \
-+ FFERRTAG('U', 'N', 'K', \
-+ 'N') ///< Unknown error, typically from an external library
-+#define AVERROR_EXPERIMENTAL \
-+ (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set
-+ ///< strict_std_compliance if you really want to use it.
-+#define AVERROR_INPUT_CHANGED \
-+ (-0x636e6701) ///< Input changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_OUTPUT_CHANGED)
-+#define AVERROR_OUTPUT_CHANGED \
-+ (-0x636e6702) ///< Output changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_INPUT_CHANGED)
-+/* HTTP & RTSP errors */
-+#define AVERROR_HTTP_BAD_REQUEST FFERRTAG(0xF8, '4', '0', '0')
-+#define AVERROR_HTTP_UNAUTHORIZED FFERRTAG(0xF8, '4', '0', '1')
-+#define AVERROR_HTTP_FORBIDDEN FFERRTAG(0xF8, '4', '0', '3')
-+#define AVERROR_HTTP_NOT_FOUND FFERRTAG(0xF8, '4', '0', '4')
-+#define AVERROR_HTTP_OTHER_4XX FFERRTAG(0xF8, '4', 'X', 'X')
-+#define AVERROR_HTTP_SERVER_ERROR FFERRTAG(0xF8, '5', 'X', 'X')
-+
-+#define AV_ERROR_MAX_STRING_SIZE 64
-+
-+/**
-+ * Put a description of the AVERROR code errnum in errbuf.
-+ * In case of failure the global variable errno is set to indicate the
-+ * error. Even in case of failure av_strerror() will print a generic
-+ * error message indicating the errnum provided to errbuf.
-+ *
-+ * @param errnum error code to describe
-+ * @param errbuf buffer to which description is written
-+ * @param errbuf_size the size in bytes of errbuf
-+ * @return 0 on success, a negative value if a description for errnum
-+ * cannot be found
-+ */
-+int av_strerror(int errnum, char* errbuf, size_t errbuf_size);
-+
-+/**
-+ * Fill the provided buffer with a string containing an error string
-+ * corresponding to the AVERROR code errnum.
-+ *
-+ * @param errbuf a buffer
-+ * @param errbuf_size size in bytes of errbuf
-+ * @param errnum error code to describe
-+ * @return the buffer in input, filled with the error description
-+ * @see av_strerror()
-+ */
-+static inline char* av_make_error_string(char* errbuf, size_t errbuf_size,
-+ int errnum) {
-+ av_strerror(errnum, errbuf, errbuf_size);
-+ return errbuf;
-+}
-+
-+/**
-+ * Convenience macro, the return value should be used only directly in
-+ * function arguments but never stand-alone.
-+ */
-+#define av_err2str(errnum) \
-+ av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, \
-+ AV_ERROR_MAX_STRING_SIZE, errnum)
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_ERROR_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-@@ -0,0 +1,927 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_frame
-+ * reference-counted frame API
-+ */
-+
-+#ifndef AVUTIL_FRAME_H
-+#define AVUTIL_FRAME_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "buffer.h"
-+#include "dict.h"
-+#include "rational.h"
-+#include "samplefmt.h"
-+#include "pixfmt.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup lavu_frame AVFrame
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVFrame is an abstraction for reference-counted raw multimedia data.
-+ */
-+
-+enum AVFrameSideDataType {
-+ /**
-+ * The data is the AVPanScan struct defined in libavcodec.
-+ */
-+ AV_FRAME_DATA_PANSCAN,
-+ /**
-+ * ATSC A53 Part 4 Closed Captions.
-+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
-+ * The number of bytes of CC data is AVFrameSideData.size.
-+ */
-+ AV_FRAME_DATA_A53_CC,
-+ /**
-+ * Stereoscopic 3d metadata.
-+ * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
-+ */
-+ AV_FRAME_DATA_STEREO3D,
-+ /**
-+ * The data is the AVMatrixEncoding enum defined in
-+ * libavutil/channel_layout.h.
-+ */
-+ AV_FRAME_DATA_MATRIXENCODING,
-+ /**
-+ * Metadata relevant to a downmix procedure.
-+ * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
-+ */
-+ AV_FRAME_DATA_DOWNMIX_INFO,
-+ /**
-+ * ReplayGain information in the form of the AVReplayGain struct.
-+ */
-+ AV_FRAME_DATA_REPLAYGAIN,
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the frame for correct
-+ * presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_FRAME_DATA_DISPLAYMATRIX,
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_FRAME_DATA_AFD,
-+ /**
-+ * Motion vectors exported by some codecs (on demand through the export_mvs
-+ * flag set in the libavcodec AVCodecContext flags2 option).
-+ * The data is the AVMotionVector struct defined in
-+ * libavutil/motion_vector.h.
-+ */
-+ AV_FRAME_DATA_MOTION_VECTORS,
-+ /**
-+ * Recommmends skipping the specified number of samples. This is exported
-+ * only if the "skip_manual" AVOption is set in libavcodec.
-+ * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_FRAME_DATA_SKIP_SAMPLES,
-+ /**
-+ * This side data must be associated with an audio frame and corresponds to
-+ * enum AVAudioServiceType defined in avcodec.h.
-+ */
-+ AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
-+ /**
-+ * Mastering display metadata associated with a video frame. The payload is
-+ * an AVMasteringDisplayMetadata type and contains information about the
-+ * mastering display color volume.
-+ */
-+ AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
-+ /**
-+ * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
-+ * This is set on the first frame of a GOP that has a temporal reference of 0.
-+ */
-+ AV_FRAME_DATA_GOP_TIMECODE,
-+
-+ /**
-+ * The data represents the AVSphericalMapping structure defined in
-+ * libavutil/spherical.h.
-+ */
-+ AV_FRAME_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This payload contains data in
-+ * the form of the AVContentLightMetadata struct.
-+ */
-+ AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * The data contains an ICC profile as an opaque octet buffer following the
-+ * format described by ISO 15076-1 with an optional name defined in the
-+ * metadata key entry "name".
-+ */
-+ AV_FRAME_DATA_ICC_PROFILE,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_FRAME_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR dynamic metadata associated with a video frame. The payload is
-+ * an AVDynamicHDRPlus type and contains information for color
-+ * volume transform - application 4 of SMPTE 2094-40:2016 standard.
-+ */
-+ AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
-+
-+ /**
-+ * Regions Of Interest, the data is an array of AVRegionOfInterest type, the
-+ * number of array element is implied by AVFrameSideData.size /
-+ * AVRegionOfInterest.self_size.
-+ */
-+ AV_FRAME_DATA_REGIONS_OF_INTEREST,
-+
-+ /**
-+ * Encoding parameters for a video frame, as described by AVVideoEncParams.
-+ */
-+ AV_FRAME_DATA_VIDEO_ENC_PARAMS,
-+
-+ /**
-+ * User data unregistered metadata associated with a video frame.
-+ * This is the H.26[45] UDU SEI message, and shouldn't be used for any other
-+ * purpose The data is stored as uint8_t in AVFrameSideData.data which is 16
-+ * bytes of uuid_iso_iec_11578 followed by AVFrameSideData.size - 16 bytes of
-+ * user_data_payload_byte.
-+ */
-+ AV_FRAME_DATA_SEI_UNREGISTERED,
-+
-+ /**
-+ * Film grain parameters for a frame, described by AVFilmGrainParams.
-+ * Must be present for every frame which should have film grain applied.
-+ */
-+ AV_FRAME_DATA_FILM_GRAIN_PARAMS,
-+
-+ /**
-+ * Bounding boxes for object detection and classification,
-+ * as described by AVDetectionBBoxHeader.
-+ */
-+ AV_FRAME_DATA_DETECTION_BBOXES,
-+
-+ /**
-+ * Dolby Vision RPU raw data, suitable for passing to x265
-+ * or other libraries. Array of uint8_t, with NAL emulation
-+ * bytes intact.
-+ */
-+ AV_FRAME_DATA_DOVI_RPU_BUFFER,
-+
-+ /**
-+ * Parsed Dolby Vision metadata, suitable for passing to a software
-+ * implementation. The payload is the AVDOVIMetadata struct defined in
-+ * libavutil/dovi_meta.h.
-+ */
-+ AV_FRAME_DATA_DOVI_METADATA,
-+};
-+
-+enum AVActiveFormatDescription {
-+ AV_AFD_SAME = 8,
-+ AV_AFD_4_3 = 9,
-+ AV_AFD_16_9 = 10,
-+ AV_AFD_14_9 = 11,
-+ AV_AFD_4_3_SP_14_9 = 13,
-+ AV_AFD_16_9_SP_14_9 = 14,
-+ AV_AFD_SP_4_3 = 15,
-+};
-+
-+/**
-+ * Structure to hold side data for an AVFrame.
-+ *
-+ * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be
-+ * added to the end with a minor bump.
-+ */
-+typedef struct AVFrameSideData {
-+ enum AVFrameSideDataType type;
-+ uint8_t* data;
-+ size_t size;
-+ AVDictionary* metadata;
-+ AVBufferRef* buf;
-+} AVFrameSideData;
-+
-+/**
-+ * Structure describing a single Region Of Interest.
-+ *
-+ * When multiple regions are defined in a single side-data block, they
-+ * should be ordered from most to least important - some encoders are only
-+ * capable of supporting a limited number of distinct regions, so will have
-+ * to truncate the list.
-+ *
-+ * When overlapping regions are defined, the first region containing a given
-+ * area of the frame applies.
-+ */
-+typedef struct AVRegionOfInterest {
-+ /**
-+ * Must be set to the size of this data structure (that is,
-+ * sizeof(AVRegionOfInterest)).
-+ */
-+ uint32_t self_size;
-+ /**
-+ * Distance in pixels from the top edge of the frame to the top and
-+ * bottom edges and from the left edge of the frame to the left and
-+ * right edges of the rectangle defining this region of interest.
-+ *
-+ * The constraints on a region are encoder dependent, so the region
-+ * actually affected may be slightly larger for alignment or other
-+ * reasons.
-+ */
-+ int top;
-+ int bottom;
-+ int left;
-+ int right;
-+ /**
-+ * Quantisation offset.
-+ *
-+ * Must be in the range -1 to +1. A value of zero indicates no quality
-+ * change. A negative value asks for better quality (less quantisation),
-+ * while a positive value asks for worse quality (greater quantisation).
-+ *
-+ * The range is calibrated so that the extreme values indicate the
-+ * largest possible offset - if the rest of the frame is encoded with the
-+ * worst possible quality, an offset of -1 indicates that this region
-+ * should be encoded with the best possible quality anyway. Intermediate
-+ * values are then interpolated in some codec-dependent way.
-+ *
-+ * For example, in 10-bit H.264 the quantisation parameter varies between
-+ * -12 and 51. A typical qoffset value of -1/10 therefore indicates that
-+ * this region should be encoded with a QP around one-tenth of the full
-+ * range better than the rest of the frame. So, if most of the frame
-+ * were to be encoded with a QP of around 30, this region would get a QP
-+ * of around 24 (an offset of approximately -1/10 * (51 - -12) = -6.3).
-+ * An extreme value of -1 would indicate that this region should be
-+ * encoded with the best possible quality regardless of the treatment of
-+ * the rest of the frame - that is, should be encoded at a QP of -12.
-+ */
-+ AVRational qoffset;
-+} AVRegionOfInterest;
-+
-+/**
-+ * This structure describes decoded (raw) audio or video data.
-+ *
-+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
-+ * allocates the AVFrame itself, the buffers for the data must be managed
-+ * through other means (see below).
-+ * AVFrame must be freed with av_frame_free().
-+ *
-+ * AVFrame is typically allocated once and then reused multiple times to hold
-+ * different data (e.g. a single AVFrame to hold frames received from a
-+ * decoder). In such a case, av_frame_unref() will free any references held by
-+ * the frame and reset it to its original clean state before it
-+ * is reused again.
-+ *
-+ * The data described by an AVFrame is usually reference counted through the
-+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
-+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
-+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
-+ * every single data plane must be contained in one of the buffers in
-+ * AVFrame.buf or AVFrame.extended_buf.
-+ * There may be a single buffer for all the data, or one separate buffer for
-+ * each plane, or anything in between.
-+ *
-+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
-+ * to the end with a minor bump.
-+ *
-+ * Fields can be accessed through AVOptions, the name string used, matches the
-+ * C structure field name for fields accessible through AVOptions. The AVClass
-+ * for AVFrame can be obtained from avcodec_get_frame_class()
-+ */
-+typedef struct AVFrame {
-+#define AV_NUM_DATA_POINTERS 8
-+ /**
-+ * pointer to the picture/channel planes.
-+ * This might be different from the first allocated byte. For video,
-+ * it could even point to the end of the image data.
-+ *
-+ * All pointers in data and extended_data must point into one of the
-+ * AVBufferRef in buf or extended_buf.
-+ *
-+ * Some decoders access areas outside 0,0 - width,height, please
-+ * see avcodec_align_dimensions2(). Some filters and swscale can read
-+ * up to 16 bytes beyond the planes, if these filters are to be used,
-+ * then 16 extra bytes must be allocated.
-+ *
-+ * NOTE: Pointers not needed by the format MUST be set to NULL.
-+ *
-+ * @attention In case of video, the data[] pointers can point to the
-+ * end of image data in order to reverse line order, when used in
-+ * combination with negative values in the linesize[] array.
-+ */
-+ uint8_t* data[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For video, a positive or negative value, which is typically indicating
-+ * the size in bytes of each picture line, but it can also be:
-+ * - the negative byte size of lines for vertical flipping
-+ * (with data[n] pointing to the end of the data
-+ * - a positive or negative multiple of the byte size as for accessing
-+ * even and odd fields of a frame (possibly flipped)
-+ *
-+ * For audio, only linesize[0] may be set. For planar audio, each channel
-+ * plane must be the same size.
-+ *
-+ * For video the linesizes should be multiples of the CPUs alignment
-+ * preference, this is 16 or 32 for modern desktop CPUs.
-+ * Some code requires such alignment other code can be slower without
-+ * correct alignment, for yet other it makes no difference.
-+ *
-+ * @note The linesize may be larger than the size of usable data -- there
-+ * may be extra padding present for performance reasons.
-+ *
-+ * @attention In case of video, line size values can be negative to achieve
-+ * a vertically inverted iteration over image lines.
-+ */
-+ int linesize[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * pointers to the data planes/channels.
-+ *
-+ * For video, this should simply point to data[].
-+ *
-+ * For planar audio, each channel has a separate data pointer, and
-+ * linesize[0] contains the size of each channel buffer.
-+ * For packed audio, there is just one data pointer, and linesize[0]
-+ * contains the total size of the buffer for all channels.
-+ *
-+ * Note: Both data and extended_data should always be set in a valid frame,
-+ * but for planar audio with more channels that can fit in data,
-+ * extended_data must be used in order to access all channels.
-+ */
-+ uint8_t** extended_data;
-+
-+ /**
-+ * @name Video dimensions
-+ * Video frames only. The coded dimensions (in pixels) of the video frame,
-+ * i.e. the size of the rectangle that contains some well-defined values.
-+ *
-+ * @note The part of the frame intended for display/presentation is further
-+ * restricted by the @ref cropping "Cropping rectangle".
-+ * @{
-+ */
-+ int width, height;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * number of audio samples (per channel) described by this frame
-+ */
-+ int nb_samples;
-+
-+ /**
-+ * format of the frame, -1 if unknown or unset
-+ * Values correspond to enum AVPixelFormat for video frames,
-+ * enum AVSampleFormat for audio)
-+ */
-+ int format;
-+
-+ /**
-+ * 1 -> keyframe, 0-> not
-+ */
-+ int key_frame;
-+
-+ /**
-+ * Picture type of the frame.
-+ */
-+ enum AVPictureType pict_type;
-+
-+ /**
-+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Presentation timestamp in time_base units (time when frame should be shown
-+ * to user).
-+ */
-+ int64_t pts;
-+
-+ /**
-+ * DTS copied from the AVPacket that triggered returning this frame. (if frame
-+ * threading isn't used) This is also the Presentation time of this AVFrame
-+ * calculated from only AVPacket.dts values without pts values.
-+ */
-+ int64_t pkt_dts;
-+
-+ /**
-+ * Time base for the timestamps in this frame.
-+ * In the future, this field may be set on frames output by decoders or
-+ * filters, but its value will be by default ignored on input to encoders
-+ * or filters.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * picture number in bitstream order
-+ */
-+ int coded_picture_number;
-+ /**
-+ * picture number in display order
-+ */
-+ int display_picture_number;
-+
-+ /**
-+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-+ */
-+ int quality;
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * When decoding, this signals how much the picture must be delayed.
-+ * extra_delay = repeat_pict / (2*fps)
-+ */
-+ int repeat_pict;
-+
-+ /**
-+ * The content of the picture is interlaced.
-+ */
-+ int interlaced_frame;
-+
-+ /**
-+ * If the content is interlaced, is top field displayed first.
-+ */
-+ int top_field_first;
-+
-+ /**
-+ * Tell user application that palette has changed from previous frame.
-+ */
-+ int palette_has_changed;
-+
-+ /**
-+ * reordered opaque 64 bits (generally an integer or a double precision float
-+ * PTS but can be anything).
-+ * The user sets AVCodecContext.reordered_opaque to represent the input at
-+ * that time,
-+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-+ * to exactly one of the values provided by the user through
-+ * AVCodecContext.reordered_opaque
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Sample rate of the audio data.
-+ */
-+ int sample_rate;
-+
-+ /**
-+ * Channel layout of the audio data.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * AVBuffer references backing the data for this frame. All the pointers in
-+ * data and extended_data must point inside one of the buffers in buf or
-+ * extended_buf. This array must be filled contiguously -- if buf[i] is
-+ * non-NULL then buf[j] must also be non-NULL for all j < i.
-+ *
-+ * There may be at most one AVBuffer per data plane, so for video this array
-+ * always contains all the references. For planar audio with more than
-+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
-+ * this array. Then the extra AVBufferRef pointers are stored in the
-+ * extended_buf array.
-+ */
-+ AVBufferRef* buf[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
-+ * AVBufferRef pointers, this array will hold all the references which
-+ * cannot fit into AVFrame.buf.
-+ *
-+ * Note that this is different from AVFrame.extended_data, which always
-+ * contains all the pointers. This array only contains the extra pointers,
-+ * which cannot fit into AVFrame.buf.
-+ *
-+ * This array is always allocated using av_malloc() by whoever constructs
-+ * the frame. It is freed in av_frame_unref().
-+ */
-+ AVBufferRef** extended_buf;
-+ /**
-+ * Number of elements in extended_buf.
-+ */
-+ int nb_extended_buf;
-+
-+ AVFrameSideData** side_data;
-+ int nb_side_data;
-+
-+/**
-+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
-+ * @ingroup lavu_frame
-+ * Flags describing additional frame properties.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * The frame data may be corrupted, e.g. due to decoding errors.
-+ */
-+#define AV_FRAME_FLAG_CORRUPT (1 << 0)
-+/**
-+ * A flag to mark the frames which need to be decoded, but shouldn't be output.
-+ */
-+#define AV_FRAME_FLAG_DISCARD (1 << 2)
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * Frame flags, a combination of @ref lavu_frame_flags
-+ */
-+ int flags;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ enum AVColorPrimaries color_primaries;
-+
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * frame timestamp estimated using various heuristics, in stream time base
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int64_t best_effort_timestamp;
-+
-+ /**
-+ * reordered pos from the last AVPacket that has been input into the decoder
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_pos;
-+
-+ /**
-+ * duration of the corresponding packet, expressed in
-+ * AVStream->time_base units, 0 if unknown.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_duration;
-+
-+ /**
-+ * metadata.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVDictionary* metadata;
-+
-+ /**
-+ * decode error flags of the frame, set to a combination of
-+ * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
-+ * were errors during the decoding.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int decode_error_flags;
-+#define FF_DECODE_ERROR_INVALID_BITSTREAM 1
-+#define FF_DECODE_ERROR_MISSING_REFERENCE 2
-+#define FF_DECODE_ERROR_CONCEALMENT_ACTIVE 4
-+#define FF_DECODE_ERROR_DECODE_SLICES 8
-+
-+ /**
-+ * number of audio channels, only used for audio.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int channels;
-+
-+ /**
-+ * size of the corresponding packet containing the compressed
-+ * frame.
-+ * It is set to a negative value if unknown.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int pkt_size;
-+
-+ /**
-+ * For hwaccel-format frames, this should be a reference to the
-+ * AVHWFramesContext describing the frame.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the frame is unreferenced. av_frame_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target frame's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * @anchor cropping
-+ * @name Cropping
-+ * Video frames only. The number of pixels to discard from the the
-+ * top/bottom/left/right border of the frame to obtain the sub-rectangle of
-+ * the frame intended for presentation.
-+ * @{
-+ */
-+ size_t crop_top;
-+ size_t crop_bottom;
-+ size_t crop_left;
-+ size_t crop_right;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * AVBufferRef for internal use by a single libav* library.
-+ * Must not be used to transfer data between libraries.
-+ * Has to be NULL when ownership of the frame leaves the respective library.
-+ *
-+ * Code outside the FFmpeg libs should never check or change the contents of
-+ * the buffer ref.
-+ *
-+ * FFmpeg calls av_buffer_unref() on it when the frame is unreferenced.
-+ * av_frame_copy_props() calls create a new reference with av_buffer_ref()
-+ * for the target frame's private_ref field.
-+ */
-+ AVBufferRef* private_ref;
-+} AVFrame;
-+
-+#if FF_API_COLORSPACE_NAME
-+/**
-+ * Get the name of a colorspace.
-+ * @return a static string identifying the colorspace; can be NULL.
-+ * @deprecated use av_color_space_name()
-+ */
-+attribute_deprecated const char* av_get_colorspace_name(enum AVColorSpace val);
-+#endif
-+/**
-+ * Allocate an AVFrame and set its fields to default values. The resulting
-+ * struct must be freed using av_frame_free().
-+ *
-+ * @return An AVFrame filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVFrame itself, not the data buffers. Those
-+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
-+ * manually.
-+ */
-+AVFrame* av_frame_alloc(void);
-+
-+/**
-+ * Free the frame and any dynamically allocated objects in it,
-+ * e.g. extended_data. If the frame is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param frame frame to be freed. The pointer will be set to NULL.
-+ */
-+void av_frame_free(AVFrame** frame);
-+
-+/**
-+ * Set up a new reference to the data described by the source frame.
-+ *
-+ * Copy frame properties from src to dst and create a new reference for each
-+ * AVBufferRef from src.
-+ *
-+ * If src is not reference counted, new buffers are allocated and the data is
-+ * copied.
-+ *
-+ * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
-+ * or newly allocated with av_frame_alloc() before calling this
-+ * function, or undefined behavior will occur.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_frame_ref(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Create a new frame that references the same data as src.
-+ *
-+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
-+ *
-+ * @return newly created AVFrame on success, NULL on error.
-+ */
-+AVFrame* av_frame_clone(const AVFrame* src);
-+
-+/**
-+ * Unreference all the buffers referenced by frame and reset the frame fields.
-+ */
-+void av_frame_unref(AVFrame* frame);
-+
-+/**
-+ * Move everything contained in src to dst and reset src.
-+ *
-+ * @warning: dst is not unreferenced, but directly overwritten without reading
-+ * or deallocating its contents. Call av_frame_unref(dst) manually
-+ * before calling this function to ensure that no memory is leaked.
-+ */
-+void av_frame_move_ref(AVFrame* dst, AVFrame* src);
-+
-+/**
-+ * Allocate new buffer(s) for audio or video data.
-+ *
-+ * The following fields must be set on frame before calling this function:
-+ * - format (pixel format for video, sample format for audio)
-+ * - width and height for video
-+ * - nb_samples and channel_layout for audio
-+ *
-+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
-+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
-+ * For planar formats, one buffer will be allocated for each plane.
-+ *
-+ * @warning: if frame already has been allocated, calling this function will
-+ * leak memory. In addition, undefined behavior can occur in certain
-+ * cases.
-+ *
-+ * @param frame frame in which to store the new buffers.
-+ * @param align Required buffer size alignment. If equal to 0, alignment will be
-+ * chosen automatically for the current CPU. It is highly
-+ * recommended to pass 0 here unless you know what you are doing.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_get_buffer(AVFrame* frame, int align);
-+
-+/**
-+ * Check if the frame data is writable.
-+ *
-+ * @return A positive value if the frame data is writable (which is true if and
-+ * only if each of the underlying buffers has only one reference, namely the one
-+ * stored in this frame). Return 0 otherwise.
-+ *
-+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
-+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
-+ *
-+ * @see av_frame_make_writable(), av_buffer_is_writable()
-+ */
-+int av_frame_is_writable(AVFrame* frame);
-+
-+/**
-+ * Ensure that the frame data is writable, avoiding data copy if possible.
-+ *
-+ * Do nothing if the frame is writable, allocate new buffers and copy the data
-+ * if it is not.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ *
-+ * @see av_frame_is_writable(), av_buffer_is_writable(),
-+ * av_buffer_make_writable()
-+ */
-+int av_frame_make_writable(AVFrame* frame);
-+
-+/**
-+ * Copy the frame data from src to dst.
-+ *
-+ * This function does not allocate anything, dst must be already initialized and
-+ * allocated with the same parameters as src.
-+ *
-+ * This function only copies the frame data (i.e. the contents of the data /
-+ * extended data arrays), not any other properties.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_copy(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Copy only "metadata" fields from src to dst.
-+ *
-+ * Metadata for the purpose of this function are those fields that do not affect
-+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
-+ * aspect ratio (for video), but not width/height or channel layout.
-+ * Side data is also copied.
-+ */
-+int av_frame_copy_props(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Get the buffer reference a given data plane is stored in.
-+ *
-+ * @param plane index of the data plane of interest in frame->extended_data.
-+ *
-+ * @return the buffer reference that contains the plane or NULL if the input
-+ * frame is not valid.
-+ */
-+AVBufferRef* av_frame_get_plane_buffer(AVFrame* frame, int plane);
-+
-+/**
-+ * Add a new side data to a frame.
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type type of the added side data
-+ * @param size size of the side data
-+ *
-+ * @return newly added side data on success, NULL on error
-+ */
-+AVFrameSideData* av_frame_new_side_data(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Add a new side data to a frame from an existing AVBufferRef
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type the type of the added side data
-+ * @param buf an AVBufferRef to add as side data. The ownership of
-+ * the reference is transferred to the frame.
-+ *
-+ * @return newly added side data on success, NULL on error. On failure
-+ * the frame is unchanged and the AVBufferRef remains owned by
-+ * the caller.
-+ */
-+AVFrameSideData* av_frame_new_side_data_from_buf(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ AVBufferRef* buf);
-+
-+/**
-+ * @return a pointer to the side data of a given type on success, NULL if there
-+ * is no side data with such type in this frame.
-+ */
-+AVFrameSideData* av_frame_get_side_data(const AVFrame* frame,
-+ enum AVFrameSideDataType type);
-+
-+/**
-+ * Remove and free all side data instances of the given type.
-+ */
-+void av_frame_remove_side_data(AVFrame* frame, enum AVFrameSideDataType type);
-+
-+/**
-+ * Flags for frame cropping.
-+ */
-+enum {
-+ /**
-+ * Apply the maximum possible cropping, even if it requires setting the
-+ * AVFrame.data[] entries to unaligned pointers. Passing unaligned data
-+ * to FFmpeg API is generally not allowed, and causes undefined behavior
-+ * (such as crashes). You can pass unaligned data only to FFmpeg APIs that
-+ * are explicitly documented to accept it. Use this flag only if you
-+ * absolutely know what you are doing.
-+ */
-+ AV_FRAME_CROP_UNALIGNED = 1 << 0,
-+};
-+
-+/**
-+ * Crop the given video AVFrame according to its crop_left/crop_top/crop_right/
-+ * crop_bottom fields. If cropping is successful, the function will adjust the
-+ * data pointers and the width/height fields, and set the crop fields to 0.
-+ *
-+ * In all cases, the cropping boundaries will be rounded to the inherent
-+ * alignment of the pixel format. In some cases, such as for opaque hwaccel
-+ * formats, the left/top cropping is ignored. The crop fields are set to 0 even
-+ * if the cropping was rounded or ignored.
-+ *
-+ * @param frame the frame which should be cropped
-+ * @param flags Some combination of AV_FRAME_CROP_* flags, or 0.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error. If the cropping fields
-+ * were invalid, AVERROR(ERANGE) is returned, and nothing is changed.
-+ */
-+int av_frame_apply_cropping(AVFrame* frame, int flags);
-+
-+/**
-+ * @return a string identifying the side data type
-+ */
-+const char* av_frame_side_data_name(enum AVFrameSideDataType type);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_FRAME_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-@@ -0,0 +1,601 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_H
-+#define AVUTIL_HWCONTEXT_H
-+
-+#include "buffer.h"
-+#include "frame.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+enum AVHWDeviceType {
-+ AV_HWDEVICE_TYPE_NONE,
-+ AV_HWDEVICE_TYPE_VDPAU,
-+ AV_HWDEVICE_TYPE_CUDA,
-+ AV_HWDEVICE_TYPE_VAAPI,
-+ AV_HWDEVICE_TYPE_DXVA2,
-+ AV_HWDEVICE_TYPE_QSV,
-+ AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-+ AV_HWDEVICE_TYPE_D3D11VA,
-+ AV_HWDEVICE_TYPE_DRM,
-+ AV_HWDEVICE_TYPE_OPENCL,
-+ AV_HWDEVICE_TYPE_MEDIACODEC,
-+ AV_HWDEVICE_TYPE_VULKAN,
-+};
-+
-+typedef struct AVHWDeviceInternal AVHWDeviceInternal;
-+
-+/**
-+ * This struct aggregates all the (hardware/vendor-specific) "high-level" state,
-+ * i.e. state that is not tied to a concrete processing configuration.
-+ * E.g., in an API that supports hardware-accelerated encoding and decoding,
-+ * this struct will (if possible) wrap the state that is common to both encoding
-+ * and decoding and from which specific instances of encoders or decoders can be
-+ * derived.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism. The
-+ * av_hwdevice_ctx_alloc() constructor yields a reference, whose data field
-+ * points to the actual AVHWDeviceContext. Further objects derived from
-+ * AVHWDeviceContext (such as AVHWFramesContext, describing a frame pool with
-+ * specific properties) will hold an internal reference to it. After all the
-+ * references are released, the AVHWDeviceContext itself will be freed,
-+ * optionally invoking a user-specified callback for uninitializing the hardware
-+ * state.
-+ */
-+typedef struct AVHWDeviceContext {
-+ /**
-+ * A class for logging. Set by av_hwdevice_ctx_alloc().
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWDeviceInternal* internal;
-+
-+ /**
-+ * This field identifies the underlying API used for hardware access.
-+ *
-+ * This field is set when this struct is allocated and never changed
-+ * afterwards.
-+ */
-+ enum AVHWDeviceType type;
-+
-+ /**
-+ * The format-specific data, allocated and freed by libavutil along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwcontext_*.h) and filled as described in the
-+ * documentation before calling av_hwdevice_ctx_init().
-+ *
-+ * After calling av_hwdevice_ctx_init() this struct should not be modified
-+ * by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwdevice_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ *
-+ * @note when other objects (e.g an AVHWFramesContext) are derived from this
-+ * struct, this callback will be invoked after all such child objects
-+ * are fully uninitialized and their respective destructors invoked.
-+ */
-+ void (*free)(struct AVHWDeviceContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+} AVHWDeviceContext;
-+
-+typedef struct AVHWFramesInternal AVHWFramesInternal;
-+
-+/**
-+ * This struct describes a set or pool of "hardware" frames (i.e. those with
-+ * data not located in normal system memory). All the frames in the pool are
-+ * assumed to be allocated in the same way and interchangeable.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism and tied to a
-+ * given AVHWDeviceContext instance. The av_hwframe_ctx_alloc() constructor
-+ * yields a reference, whose data field points to the actual AVHWFramesContext
-+ * struct.
-+ */
-+typedef struct AVHWFramesContext {
-+ /**
-+ * A class for logging.
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWFramesInternal* internal;
-+
-+ /**
-+ * A reference to the parent AVHWDeviceContext. This reference is owned and
-+ * managed by the enclosing AVHWFramesContext, but the caller may derive
-+ * additional references from it.
-+ */
-+ AVBufferRef* device_ref;
-+
-+ /**
-+ * The parent AVHWDeviceContext. This is simply a pointer to
-+ * device_ref->data provided for convenience.
-+ *
-+ * Set by libavutil in av_hwframe_ctx_init().
-+ */
-+ AVHWDeviceContext* device_ctx;
-+
-+ /**
-+ * The format-specific data, allocated and freed automatically along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwframe_*.h) and filled as described in the
-+ * documentation before calling av_hwframe_ctx_init().
-+ *
-+ * After any frames using this context are created, the contents of this
-+ * struct should not be modified by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ */
-+ void (*free)(struct AVHWFramesContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+
-+ /**
-+ * A pool from which the frames are allocated by av_hwframe_get_buffer().
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ * The buffers returned by calling av_buffer_pool_get() on this pool must
-+ * have the properties described in the documentation in the corresponding hw
-+ * type's header (hwcontext_*.h). The pool will be freed strictly before
-+ * this struct's free() callback is invoked.
-+ *
-+ * This field may be NULL, then libavutil will attempt to allocate a pool
-+ * internally. Note that certain device types enforce pools allocated at
-+ * fixed size (frame count), which cannot be extended dynamically. In such a
-+ * case, initial_pool_size must be set appropriately.
-+ */
-+ AVBufferPool* pool;
-+
-+ /**
-+ * Initial size of the frame pool. If a device type does not support
-+ * dynamically resizing the pool, then this is also the maximum pool size.
-+ *
-+ * May be set by the caller before calling av_hwframe_ctx_init(). Must be
-+ * set if pool is NULL and the device type does not support dynamic pools.
-+ */
-+ int initial_pool_size;
-+
-+ /**
-+ * The pixel format identifying the underlying HW surface type.
-+ *
-+ * Must be a hwaccel format, i.e. the corresponding descriptor must have the
-+ * AV_PIX_FMT_FLAG_HWACCEL flag set.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ enum AVPixelFormat format;
-+
-+ /**
-+ * The pixel format identifying the actual data layout of the hardware
-+ * frames.
-+ *
-+ * Must be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * @note when the underlying API does not provide the exact data layout, but
-+ * only the colorspace/bit depth, this field should be set to the fully
-+ * planar version of that format (e.g. for 8-bit 420 YUV it should be
-+ * AV_PIX_FMT_YUV420P, not AV_PIX_FMT_NV12 or anything else).
-+ */
-+ enum AVPixelFormat sw_format;
-+
-+ /**
-+ * The allocated dimensions of the frames in this pool.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ int width, height;
-+} AVHWFramesContext;
-+
-+/**
-+ * Look up an AVHWDeviceType by name.
-+ *
-+ * @param name String name of the device type (case-insensitive).
-+ * @return The type from enum AVHWDeviceType, or AV_HWDEVICE_TYPE_NONE if
-+ * not found.
-+ */
-+enum AVHWDeviceType av_hwdevice_find_type_by_name(const char* name);
-+
-+/** Get the string name of an AVHWDeviceType.
-+ *
-+ * @param type Type from enum AVHWDeviceType.
-+ * @return Pointer to a static string containing the name, or NULL if the type
-+ * is not valid.
-+ */
-+const char* av_hwdevice_get_type_name(enum AVHWDeviceType type);
-+
-+/**
-+ * Iterate over supported device types.
-+ *
-+ * @param type AV_HWDEVICE_TYPE_NONE initially, then the previous type
-+ * returned by this function in subsequent iterations.
-+ * @return The next usable device type from enum AVHWDeviceType, or
-+ * AV_HWDEVICE_TYPE_NONE if there are no more.
-+ */
-+enum AVHWDeviceType av_hwdevice_iterate_types(enum AVHWDeviceType prev);
-+
-+/**
-+ * Allocate an AVHWDeviceContext for a given hardware type.
-+ *
-+ * @param type the type of the hardware device to allocate.
-+ * @return a reference to the newly created AVHWDeviceContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwdevice_ctx_alloc(enum AVHWDeviceType type);
-+
-+/**
-+ * Finalize the device context before use. This function must be called after
-+ * the context is filled with all the required information and before it is
-+ * used in any way.
-+ *
-+ * @param ref a reference to the AVHWDeviceContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwdevice_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Open a device of the specified type and create an AVHWDeviceContext for it.
-+ *
-+ * This is a convenience function intended to cover the simple cases. Callers
-+ * who need to fine-tune device creation/management should open the device
-+ * manually and then wrap it in an AVHWDeviceContext using
-+ * av_hwdevice_ctx_alloc()/av_hwdevice_ctx_init().
-+ *
-+ * The returned context is already initialized and ready for use, the caller
-+ * should not call av_hwdevice_ctx_init() on it. The user_opaque/free fields of
-+ * the created AVHWDeviceContext are set by this function and should not be
-+ * touched by the caller.
-+ *
-+ * @param device_ctx On success, a reference to the newly-created device context
-+ * will be written here. The reference is owned by the caller
-+ * and must be released with av_buffer_unref() when no longer
-+ * needed. On failure, NULL will be written to this pointer.
-+ * @param type The type of the device to create.
-+ * @param device A type-specific string identifying the device to open.
-+ * @param opts A dictionary of additional (type-specific) options to use in
-+ * opening the device. The dictionary remains owned by the caller.
-+ * @param flags currently unused
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create(AVBufferRef** device_ctx, enum AVHWDeviceType type,
-+ const char* device, AVDictionary* opts, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * If the source device is a device of the target type or was originally
-+ * derived from such a device (possibly through one or more intermediate
-+ * devices of other types), then this will return a reference to the
-+ * existing device of the same type as is requested.
-+ *
-+ * Otherwise, it will attempt to derive a new device from the given source
-+ * device. If direct derivation to the new type is not implemented, it will
-+ * attempt the same derivation from each ancestor of the source device in
-+ * turn looking for an implemented derivation method.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * This function performs the same action as av_hwdevice_ctx_create_derived,
-+ * however, it is able to set options for the new device to be derived.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param options Options for the new device to create, same format as in
-+ * av_hwdevice_ctx_create.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived_opts(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx,
-+ AVDictionary* options, int flags);
-+
-+/**
-+ * Allocate an AVHWFramesContext tied to a given device context.
-+ *
-+ * @param device_ctx a reference to a AVHWDeviceContext. This function will make
-+ * a new reference for internal use, the one passed to the
-+ * function remains owned by the caller.
-+ * @return a reference to the newly created AVHWFramesContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwframe_ctx_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Finalize the context before use. This function must be called after the
-+ * context is filled with all the required information and before it is attached
-+ * to any frames.
-+ *
-+ * @param ref a reference to the AVHWFramesContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Allocate a new frame attached to the given AVHWFramesContext.
-+ *
-+ * @param hwframe_ctx a reference to an AVHWFramesContext
-+ * @param frame an empty (freshly allocated or unreffed) frame to be filled with
-+ * newly allocated buffers.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_get_buffer(AVBufferRef* hwframe_ctx, AVFrame* frame, int flags);
-+
-+/**
-+ * Copy data to or from a hw surface. At least one of dst/src must have an
-+ * AVHWFramesContext attached.
-+ *
-+ * If src has an AVHWFramesContext attached, then the format of dst (if set)
-+ * must use one of the formats returned by av_hwframe_transfer_get_formats(src,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_FROM).
-+ * If dst has an AVHWFramesContext attached, then the format of src must use one
-+ * of the formats returned by av_hwframe_transfer_get_formats(dst,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_TO)
-+ *
-+ * dst may be "clean" (i.e. with data/buf pointers unset), in which case the
-+ * data buffers will be allocated by this function using av_frame_get_buffer().
-+ * If dst->format is set, then this format will be used, otherwise (when
-+ * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
-+ *
-+ * The two frames must have matching allocated dimensions (i.e. equal to
-+ * AVHWFramesContext.width/height), since not all device types support
-+ * transferring a sub-rectangle of the whole surface. The display dimensions
-+ * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
-+ * also have to be equal for both frames. When the display dimensions are
-+ * smaller than the allocated dimensions, the content of the padding in the
-+ * destination frame is unspecified.
-+ *
-+ * @param dst the destination frame. dst is not touched on failure.
-+ * @param src the source frame.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR error code on failure.
-+ */
-+int av_hwframe_transfer_data(AVFrame* dst, const AVFrame* src, int flags);
-+
-+enum AVHWFrameTransferDirection {
-+ /**
-+ * Transfer the data from the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_FROM,
-+
-+ /**
-+ * Transfer the data to the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_TO,
-+};
-+
-+/**
-+ * Get a list of possible source or target formats usable in
-+ * av_hwframe_transfer_data().
-+ *
-+ * @param hwframe_ctx the frame context to obtain the information for
-+ * @param dir the direction of the transfer
-+ * @param formats the pointer to the output format list will be written here.
-+ * The list is terminated with AV_PIX_FMT_NONE and must be freed
-+ * by the caller when no longer needed using av_free().
-+ * If this function returns successfully, the format list will
-+ * have at least one item (not counting the terminator).
-+ * On failure, the contents of this pointer are unspecified.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwframe_transfer_get_formats(AVBufferRef* hwframe_ctx,
-+ enum AVHWFrameTransferDirection dir,
-+ enum AVPixelFormat** formats, int flags);
-+
-+/**
-+ * This struct describes the constraints on hardware frames attached to
-+ * a given device with a hardware-specific configuration. This is returned
-+ * by av_hwdevice_get_hwframe_constraints() and must be freed by
-+ * av_hwframe_constraints_free() after use.
-+ */
-+typedef struct AVHWFramesConstraints {
-+ /**
-+ * A list of possible values for format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. This member will always be filled.
-+ */
-+ enum AVPixelFormat* valid_hw_formats;
-+
-+ /**
-+ * A list of possible values for sw_format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. Can be NULL if this information is
-+ * not known.
-+ */
-+ enum AVPixelFormat* valid_sw_formats;
-+
-+ /**
-+ * The minimum size of frames in this hw_frames_ctx.
-+ * (Zero if not known.)
-+ */
-+ int min_width;
-+ int min_height;
-+
-+ /**
-+ * The maximum size of frames in this hw_frames_ctx.
-+ * (INT_MAX if not known / no limit.)
-+ */
-+ int max_width;
-+ int max_height;
-+} AVHWFramesConstraints;
-+
-+/**
-+ * Allocate a HW-specific configuration structure for a given HW device.
-+ * After use, the user must free all members as required by the specific
-+ * hardware structure being used, then free the structure itself with
-+ * av_free().
-+ *
-+ * @param device_ctx a reference to the associated AVHWDeviceContext.
-+ * @return The newly created HW-specific configuration structure on
-+ * success or NULL on failure.
-+ */
-+void* av_hwdevice_hwconfig_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Get the constraints on HW frames given a device and the HW-specific
-+ * configuration to be used with that device. If no HW-specific
-+ * configuration is provided, returns the maximum possible capabilities
-+ * of the device.
-+ *
-+ * @param ref a reference to the associated AVHWDeviceContext.
-+ * @param hwconfig a filled HW-specific configuration structure, or NULL
-+ * to return the maximum possible capabilities of the device.
-+ * @return AVHWFramesConstraints structure describing the constraints
-+ * on the device, or NULL if not available.
-+ */
-+AVHWFramesConstraints* av_hwdevice_get_hwframe_constraints(
-+ AVBufferRef* ref, const void* hwconfig);
-+
-+/**
-+ * Free an AVHWFrameConstraints structure.
-+ *
-+ * @param constraints The (filled or unfilled) AVHWFrameConstraints structure.
-+ */
-+void av_hwframe_constraints_free(AVHWFramesConstraints** constraints);
-+
-+/**
-+ * Flags to apply to frame mappings.
-+ */
-+enum {
-+ /**
-+ * The mapping must be readable.
-+ */
-+ AV_HWFRAME_MAP_READ = 1 << 0,
-+ /**
-+ * The mapping must be writeable.
-+ */
-+ AV_HWFRAME_MAP_WRITE = 1 << 1,
-+ /**
-+ * The mapped frame will be overwritten completely in subsequent
-+ * operations, so the current frame data need not be loaded. Any values
-+ * which are not overwritten are unspecified.
-+ */
-+ AV_HWFRAME_MAP_OVERWRITE = 1 << 2,
-+ /**
-+ * The mapping must be direct. That is, there must not be any copying in
-+ * the map or unmap steps. Note that performance of direct mappings may
-+ * be much lower than normal memory.
-+ */
-+ AV_HWFRAME_MAP_DIRECT = 1 << 3,
-+};
-+
-+/**
-+ * Map a hardware frame.
-+ *
-+ * This has a number of different possible effects, depending on the format
-+ * and origin of the src and dst frames. On input, src should be a usable
-+ * frame with valid buffers and dst should be blank (typically as just created
-+ * by av_frame_alloc()). src should have an associated hwframe context, and
-+ * dst may optionally have a format and associated hwframe context.
-+ *
-+ * If src was created by mapping a frame from the hwframe context of dst,
-+ * then this function undoes the mapping - dst is replaced by a reference to
-+ * the frame that src was originally mapped from.
-+ *
-+ * If both src and dst have an associated hwframe context, then this function
-+ * attempts to map the src frame from its hardware context to that of dst and
-+ * then fill dst with appropriate data to be usable there. This will only be
-+ * possible if the hwframe contexts and associated devices are compatible -
-+ * given compatible devices, av_hwframe_ctx_create_derived() can be used to
-+ * create a hwframe context for dst in which mapping should be possible.
-+ *
-+ * If src has a hwframe context but dst does not, then the src frame is
-+ * mapped to normal memory and should thereafter be usable as a normal frame.
-+ * If the format is set on dst, then the mapping will attempt to create dst
-+ * with that format and fail if it is not possible. If format is unset (is
-+ * AV_PIX_FMT_NONE) then dst will be mapped with whatever the most appropriate
-+ * format to use is (probably the sw_format of the src hwframe context).
-+ *
-+ * A return value of AVERROR(ENOSYS) indicates that the mapping is not
-+ * possible with the given arguments and hwframe setup, while other return
-+ * values indicate that it failed somehow.
-+ *
-+ * @param dst Destination frame, to contain the mapping.
-+ * @param src Source frame, to be mapped.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_map(AVFrame* dst, const AVFrame* src, int flags);
-+
-+/**
-+ * Create and initialise an AVHWFramesContext as a mapping of another existing
-+ * AVHWFramesContext on a different device.
-+ *
-+ * av_hwframe_ctx_init() should not be called after this.
-+ *
-+ * @param derived_frame_ctx On success, a reference to the newly created
-+ * AVHWFramesContext.
-+ * @param derived_device_ctx A reference to the device to create the new
-+ * AVHWFramesContext on.
-+ * @param source_frame_ctx A reference to an existing AVHWFramesContext
-+ * which will be mapped to the derived context.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags, defining the
-+ * mapping parameters to apply to frames which are allocated
-+ * in the derived device.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_ctx_create_derived(AVBufferRef** derived_frame_ctx,
-+ enum AVPixelFormat format,
-+ AVBufferRef* derived_device_ctx,
-+ AVBufferRef* source_frame_ctx, int flags);
-+
-+#endif /* AVUTIL_HWCONTEXT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-@@ -0,0 +1,117 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_VAAPI_H
-+#define AVUTIL_HWCONTEXT_VAAPI_H
-+
-+#include <va/va.h>
-+
-+/**
-+ * @file
-+ * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
-+ *
-+ * Dynamic frame pools are supported, but note that any pool used as a render
-+ * target is required to be of fixed size in order to be be usable as an
-+ * argument to vaCreateContext().
-+ *
-+ * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
-+ * with the data pointer set to a VASurfaceID.
-+ */
-+
-+enum {
-+ /**
-+ * The quirks field has been set by the user and should not be detected
-+ * automatically by av_hwdevice_ctx_init().
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
-+ /**
-+ * The driver does not destroy parameter buffers when they are used by
-+ * vaRenderPicture(). Additional code will be required to destroy them
-+ * separately afterwards.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
-+
-+ /**
-+ * The driver does not support the VASurfaceAttribMemoryType attribute,
-+ * so the surface allocation code will not try to use it.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
-+
-+ /**
-+ * The driver does not support surface attributes at all.
-+ * The surface allocation code will never pass them to surface allocation,
-+ * and the results of the vaQuerySurfaceAttributes() call will be faked.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
-+};
-+
-+/**
-+ * VAAPI connection details.
-+ *
-+ * Allocated as AVHWDeviceContext.hwctx
-+ */
-+typedef struct AVVAAPIDeviceContext {
-+ /**
-+ * The VADisplay handle, to be filled by the user.
-+ */
-+ VADisplay display;
-+ /**
-+ * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
-+ * with reference to a table of known drivers, unless the
-+ * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present. The user
-+ * may need to refer to this field when performing any later
-+ * operations using VAAPI with the same VADisplay.
-+ */
-+ unsigned int driver_quirks;
-+} AVVAAPIDeviceContext;
-+
-+/**
-+ * VAAPI-specific data associated with a frame pool.
-+ *
-+ * Allocated as AVHWFramesContext.hwctx.
-+ */
-+typedef struct AVVAAPIFramesContext {
-+ /**
-+ * Set by the user to apply surface attributes to all surfaces in
-+ * the frame pool. If null, default settings are used.
-+ */
-+ VASurfaceAttrib* attributes;
-+ int nb_attributes;
-+ /**
-+ * The surfaces IDs of all surfaces in the pool after creation.
-+ * Only valid if AVHWFramesContext.initial_pool_size was positive.
-+ * These are intended to be used as the render_targets arguments to
-+ * vaCreateContext().
-+ */
-+ VASurfaceID* surface_ids;
-+ int nb_surfaces;
-+} AVVAAPIFramesContext;
-+
-+/**
-+ * VAAPI hardware pipeline configuration details.
-+ *
-+ * Allocated with av_hwdevice_hwconfig_alloc().
-+ */
-+typedef struct AVVAAPIHWConfig {
-+ /**
-+ * ID of a VAAPI pipeline configuration.
-+ */
-+ VAConfigID config_id;
-+} AVVAAPIHWConfig;
-+
-+#endif /* AVUTIL_HWCONTEXT_VAAPI_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2011 Mans Rullgard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_INTFLOAT_H
-+#define AVUTIL_INTFLOAT_H
-+
-+#include <stdint.h>
-+#include "attributes.h"
-+
-+union av_intfloat32 {
-+ uint32_t i;
-+ float f;
-+};
-+
-+union av_intfloat64 {
-+ uint64_t i;
-+ double f;
-+};
-+
-+/**
-+ * Reinterpret a 32-bit integer as a float.
-+ */
-+static av_always_inline float av_int2float(uint32_t i) {
-+ union av_intfloat32 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a float as a 32-bit integer.
-+ */
-+static av_always_inline uint32_t av_float2int(float f) {
-+ union av_intfloat32 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+/**
-+ * Reinterpret a 64-bit integer as a double.
-+ */
-+static av_always_inline double av_int2double(uint64_t i) {
-+ union av_intfloat64 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a double as a 64-bit integer.
-+ */
-+static av_always_inline uint64_t av_double2int(double f) {
-+ union av_intfloat64 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+#endif /* AVUTIL_INTFLOAT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-@@ -0,0 +1,388 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_LOG_H
-+#define AVUTIL_LOG_H
-+
-+#include <stdarg.h>
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+typedef enum {
-+ AV_CLASS_CATEGORY_NA = 0,
-+ AV_CLASS_CATEGORY_INPUT,
-+ AV_CLASS_CATEGORY_OUTPUT,
-+ AV_CLASS_CATEGORY_MUXER,
-+ AV_CLASS_CATEGORY_DEMUXER,
-+ AV_CLASS_CATEGORY_ENCODER,
-+ AV_CLASS_CATEGORY_DECODER,
-+ AV_CLASS_CATEGORY_FILTER,
-+ AV_CLASS_CATEGORY_BITSTREAM_FILTER,
-+ AV_CLASS_CATEGORY_SWSCALER,
-+ AV_CLASS_CATEGORY_SWRESAMPLER,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_INPUT,
-+ AV_CLASS_CATEGORY_NB ///< not part of ABI/API
-+} AVClassCategory;
-+
-+#define AV_IS_INPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT))
-+
-+#define AV_IS_OUTPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT))
-+
-+struct AVOptionRanges;
-+
-+/**
-+ * Describe the class of an AVClass context structure. That is an
-+ * arbitrary struct of which the first field is a pointer to an
-+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
-+ */
-+typedef struct AVClass {
-+ /**
-+ * The name of the class; usually it is the same name as the
-+ * context structure type to which the AVClass is associated.
-+ */
-+ const char* class_name;
-+
-+ /**
-+ * A pointer to a function which returns the name of a context
-+ * instance ctx associated with the class.
-+ */
-+ const char* (*item_name)(void* ctx);
-+
-+ /**
-+ * a pointer to the first option specified in the class if any or NULL
-+ *
-+ * @see av_set_default_options()
-+ */
-+ const struct AVOption* option;
-+
-+ /**
-+ * LIBAVUTIL_VERSION with which this structure was created.
-+ * This is used to allow fields to be added without requiring major
-+ * version bumps everywhere.
-+ */
-+
-+ int version;
-+
-+ /**
-+ * Offset in the structure where log_level_offset is stored.
-+ * 0 means there is no such variable
-+ */
-+ int log_level_offset_offset;
-+
-+ /**
-+ * Offset in the structure where a pointer to the parent context for
-+ * logging is stored. For example a decoder could pass its AVCodecContext
-+ * to eval as such a parent context, which an av_log() implementation
-+ * could then leverage to display the parent context.
-+ * The offset can be NULL.
-+ */
-+ int parent_log_context_offset;
-+
-+ /**
-+ * Category used for visualization (like color)
-+ * This is only set if the category is equal for all objects using this class.
-+ * available since version (51 << 16 | 56 << 8 | 100)
-+ */
-+ AVClassCategory category;
-+
-+ /**
-+ * Callback to return the category.
-+ * available since version (51 << 16 | 59 << 8 | 100)
-+ */
-+ AVClassCategory (*get_category)(void* ctx);
-+
-+ /**
-+ * Callback to return the supported/allowed ranges.
-+ * available since version (52.12)
-+ */
-+ int (*query_ranges)(struct AVOptionRanges**, void* obj, const char* key,
-+ int flags);
-+
-+ /**
-+ * Return next AVOptions-enabled child or NULL
-+ */
-+ void* (*child_next)(void* obj, void* prev);
-+
-+ /**
-+ * Iterate over the AVClasses corresponding to potential AVOptions-enabled
-+ * children.
-+ *
-+ * @param iter pointer to opaque iteration state. The caller must initialize
-+ * *iter to NULL before the first call.
-+ * @return AVClass for the next AVOptions-enabled child or NULL if there are
-+ * no more such children.
-+ *
-+ * @note The difference between child_next and this is that child_next
-+ * iterates over _already existing_ objects, while child_class_iterate
-+ * iterates over _all possible_ children.
-+ */
-+ const struct AVClass* (*child_class_iterate)(void** iter);
-+} AVClass;
-+
-+/**
-+ * @addtogroup lavu_log
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_log_constants Logging Constants
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Print no output.
-+ */
-+#define AV_LOG_QUIET -8
-+
-+/**
-+ * Something went really wrong and we will crash now.
-+ */
-+#define AV_LOG_PANIC 0
-+
-+/**
-+ * Something went wrong and recovery is not possible.
-+ * For example, no header was found for a format which depends
-+ * on headers or an illegal combination of parameters is used.
-+ */
-+#define AV_LOG_FATAL 8
-+
-+/**
-+ * Something went wrong and cannot losslessly be recovered.
-+ * However, not all future data is affected.
-+ */
-+#define AV_LOG_ERROR 16
-+
-+/**
-+ * Something somehow does not look correct. This may or may not
-+ * lead to problems. An example would be the use of '-vstrict -2'.
-+ */
-+#define AV_LOG_WARNING 24
-+
-+/**
-+ * Standard information.
-+ */
-+#define AV_LOG_INFO 32
-+
-+/**
-+ * Detailed information.
-+ */
-+#define AV_LOG_VERBOSE 40
-+
-+/**
-+ * Stuff which is only useful for libav* developers.
-+ */
-+#define AV_LOG_DEBUG 48
-+
-+/**
-+ * Extremely verbose debugging, useful for libav* development.
-+ */
-+#define AV_LOG_TRACE 56
-+
-+#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * Sets additional colors for extended debugging sessions.
-+ * @code
-+ av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n");
-+ @endcode
-+ * Requires 256color terminal support. Uses outside debugging is not
-+ * recommended.
-+ */
-+#define AV_LOG_C(x) ((x) << 8)
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ */
-+void av_log(void* avcl, int level, const char* fmt, ...) av_printf_format(3, 4);
-+
-+/**
-+ * Send the specified message to the log once with the initial_level and then
-+ * with the subsequent_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param initial_level importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant" for the first occurance.
-+ * @param subsequent_level importance level of the message expressed using a
-+ * @ref lavu_log_constants "Logging Constant" after the first occurance.
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param state a variable to keep trak of if a message has already been printed
-+ * this must be initialized to 0 before the first use. The same state
-+ * must not be accessed by 2 Threads simultaneously.
-+ */
-+void av_log_once(void* avcl, int initial_level, int subsequent_level,
-+ int* state, const char* fmt, ...) av_printf_format(5, 6);
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_vlog(void* avcl, int level, const char* fmt, va_list vl);
-+
-+/**
-+ * Get the current log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @return Current log level
-+ */
-+int av_log_get_level(void);
-+
-+/**
-+ * Set the log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @param level Logging level
-+ */
-+void av_log_set_level(int level);
-+
-+/**
-+ * Set the logging callback
-+ *
-+ * @note The callback must be thread safe, even if the application does not use
-+ * threads itself as some codecs are multithreaded.
-+ *
-+ * @see av_log_default_callback
-+ *
-+ * @param callback A logging function with a compatible signature.
-+ */
-+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
-+
-+/**
-+ * Default logging callback
-+ *
-+ * It prints the message to stderr, optionally colorizing it.
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_log_default_callback(void* avcl, int level, const char* fmt,
-+ va_list vl);
-+
-+/**
-+ * Return the context name
-+ *
-+ * @param ctx The AVClass context
-+ *
-+ * @return The AVClass class_name
-+ */
-+const char* av_default_item_name(void* ctx);
-+AVClassCategory av_default_get_category(void* ptr);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line
-+ * @param line_size size of the buffer
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ */
-+void av_log_format_line(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line;
-+ * may be NULL if line_size is 0
-+ * @param line_size size of the buffer; at most line_size-1 characters will
-+ * be written to the buffer, plus one null terminator
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ * @return Returns a negative value if an error occurred, otherwise returns
-+ * the number of characters that would have been written for a
-+ * sufficiently large buffer, not including the terminating null
-+ * character. If the return value is not less than line_size, it means
-+ * that the log message was truncated to fit the buffer.
-+ */
-+int av_log_format_line2(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Skip repeated messages, this requires the user app to use av_log() instead of
-+ * (f)printf as the 2 would otherwise interfere and lead to
-+ * "Last message repeated x times" messages below (f)printf messages with some
-+ * bad luck.
-+ * Also to receive the last, "last repeated" line if any, the user app must
-+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
-+ */
-+#define AV_LOG_SKIP_REPEATED 1
-+
-+/**
-+ * Include the log severity in messages originating from codecs.
-+ *
-+ * Results in messages such as:
-+ * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts
-+ */
-+#define AV_LOG_PRINT_LEVEL 2
-+
-+void av_log_set_flags(int arg);
-+int av_log_get_flags(void);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_LOG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-@@ -0,0 +1,87 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Utility Preprocessor macros
-+ */
-+
-+#ifndef AVUTIL_MACROS_H
-+#define AVUTIL_MACROS_H
-+
-+#include "libavutil/avconfig.h"
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_NE(be, le) (be)
-+#else
-+# define AV_NE(be, le) (le)
-+#endif
-+
-+/**
-+ * Comparator.
-+ * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0
-+ * if x == y. This is useful for instance in a qsort comparator callback.
-+ * Furthermore, compilers are able to optimize this to branchless code, and
-+ * there is no risk of overflow with signed types.
-+ * As with many macros, this evaluates its argument multiple times, it thus
-+ * must not have a side-effect.
-+ */
-+#define FFDIFFSIGN(x, y) (((x) > (y)) - ((x) < (y)))
-+
-+#define FFMAX(a, b) ((a) > (b) ? (a) : (b))
-+#define FFMAX3(a, b, c) FFMAX(FFMAX(a, b), c)
-+#define FFMIN(a, b) ((a) > (b) ? (b) : (a))
-+#define FFMIN3(a, b, c) FFMIN(FFMIN(a, b), c)
-+
-+#define FFSWAP(type, a, b) \
-+ do { \
-+ type SWAP_tmp = b; \
-+ b = a; \
-+ a = SWAP_tmp; \
-+ } while (0)
-+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-+
-+#define MKTAG(a, b, c, d) \
-+ ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-+#define MKBETAG(a, b, c, d) \
-+ ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-+
-+/**
-+ * @addtogroup preproc_misc Preprocessor String Macros
-+ *
-+ * String manipulation macros
-+ *
-+ * @{
-+ */
-+
-+#define AV_STRINGIFY(s) AV_TOSTRING(s)
-+#define AV_TOSTRING(s) #s
-+
-+#define AV_GLUE(a, b) a##b
-+#define AV_JOIN(a, b) AV_GLUE(a, b)
-+
-+/**
-+ * @}
-+ */
-+
-+#define AV_PRAGMA(s) _Pragma(#s)
-+
-+#define FFALIGN(x, a) (((x) + (a)-1) & ~((a)-1))
-+
-+#endif /* AVUTIL_MACROS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-@@ -0,0 +1,247 @@
-+/*
-+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @addtogroup lavu_math
-+ * Mathematical utilities for working with timestamp and time base.
-+ */
-+
-+#ifndef AVUTIL_MATHEMATICS_H
-+#define AVUTIL_MATHEMATICS_H
-+
-+#include <stdint.h>
-+#include <math.h>
-+#include "attributes.h"
-+#include "rational.h"
-+#include "intfloat.h"
-+
-+#ifndef M_E
-+# define M_E 2.7182818284590452354 /* e */
-+#endif
-+#ifndef M_LN2
-+# define M_LN2 0.69314718055994530942 /* log_e 2 */
-+#endif
-+#ifndef M_LN10
-+# define M_LN10 2.30258509299404568402 /* log_e 10 */
-+#endif
-+#ifndef M_LOG2_10
-+# define M_LOG2_10 3.32192809488736234787 /* log_2 10 */
-+#endif
-+#ifndef M_PHI
-+# define M_PHI 1.61803398874989484820 /* phi / golden ratio */
-+#endif
-+#ifndef M_PI
-+# define M_PI 3.14159265358979323846 /* pi */
-+#endif
-+#ifndef M_PI_2
-+# define M_PI_2 1.57079632679489661923 /* pi/2 */
-+#endif
-+#ifndef M_SQRT1_2
-+# define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
-+#endif
-+#ifndef M_SQRT2
-+# define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
-+#endif
-+#ifndef NAN
-+# define NAN av_int2float(0x7fc00000)
-+#endif
-+#ifndef INFINITY
-+# define INFINITY av_int2float(0x7f800000)
-+#endif
-+
-+/**
-+ * @addtogroup lavu_math
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rounding methods.
-+ */
-+enum AVRounding {
-+ AV_ROUND_ZERO = 0, ///< Round toward zero.
-+ AV_ROUND_INF = 1, ///< Round away from zero.
-+ AV_ROUND_DOWN = 2, ///< Round toward -infinity.
-+ AV_ROUND_UP = 3, ///< Round toward +infinity.
-+ AV_ROUND_NEAR_INF =
-+ 5, ///< Round to nearest and halfway cases away from zero.
-+ /**
-+ * Flag telling rescaling functions to pass `INT64_MIN`/`MAX` through
-+ * unchanged, avoiding special cases for #AV_NOPTS_VALUE.
-+ *
-+ * Unlike other values of the enumeration AVRounding, this value is a
-+ * bitmask that must be used in conjunction with another value of the
-+ * enumeration through a bitwise OR, in order to set behavior for normal
-+ * cases.
-+ *
-+ * @code{.c}
-+ * av_rescale_rnd(3, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling 3:
-+ * // Calculating 3 * 1 / 2
-+ * // 3 / 2 is rounded up to 2
-+ * // => 2
-+ *
-+ * av_rescale_rnd(AV_NOPTS_VALUE, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling AV_NOPTS_VALUE:
-+ * // AV_NOPTS_VALUE == INT64_MIN
-+ * // AV_NOPTS_VALUE is passed through
-+ * // => AV_NOPTS_VALUE
-+ * @endcode
-+ */
-+ AV_ROUND_PASS_MINMAX = 8192,
-+};
-+
-+/**
-+ * Compute the greatest common divisor of two integer operands.
-+ *
-+ * @param a,b Operands
-+ * @return GCD of a and b up to sign; if a >= 0 and b >= 0, return value is >=
-+ * 0; if a == 0 and b == 0, returns 0.
-+ */
-+int64_t av_const av_gcd(int64_t a, int64_t b);
-+
-+/**
-+ * Rescale a 64-bit integer with rounding to nearest.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow.
-+ *
-+ * This function is equivalent to av_rescale_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale_rnd(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow, and does not support different rounding methods.
-+ * If the result is not representable then INT64_MIN is returned.
-+ *
-+ * @see av_rescale(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * This function is equivalent to av_rescale_q_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q()
-+ */
-+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Compare two timestamps each in its own time base.
-+ *
-+ * @return One of the following values:
-+ * - -1 if `ts_a` is before `ts_b`
-+ * - 1 if `ts_a` is after `ts_b`
-+ * - 0 if they represent the same position
-+ *
-+ * @warning
-+ * The result of the function is undefined if one of the timestamps is outside
-+ * the `int64_t` range when represented in the other's timebase.
-+ */
-+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-+
-+/**
-+ * Compare the remainders of two integer operands divided by a common divisor.
-+ *
-+ * In other words, compare the least significant `log2(mod)` bits of integers
-+ * `a` and `b`.
-+ *
-+ * @code{.c}
-+ * av_compare_mod(0x11, 0x02, 0x10) < 0 // since 0x11 % 0x10 (0x1) < 0x02 %
-+ * 0x10 (0x2) av_compare_mod(0x11, 0x02, 0x20) > 0 // since 0x11 % 0x20 (0x11)
-+ * > 0x02 % 0x20 (0x02)
-+ * @endcode
-+ *
-+ * @param a,b Operands
-+ * @param mod Divisor; must be a power of 2
-+ * @return
-+ * - a negative value if `a % mod < b % mod`
-+ * - a positive value if `a % mod > b % mod`
-+ * - zero if `a % mod == b % mod`
-+ */
-+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-+
-+/**
-+ * Rescale a timestamp while preserving known durations.
-+ *
-+ * This function is designed to be called per audio packet to scale the input
-+ * timestamp to a different time base. Compared to a simple av_rescale_q()
-+ * call, this function is robust against possible inconsistent frame durations.
-+ *
-+ * The `last` parameter is a state variable that must be preserved for all
-+ * subsequent calls for the same stream. For the first call, `*last` should be
-+ * initialized to #AV_NOPTS_VALUE.
-+ *
-+ * @param[in] in_tb Input time base
-+ * @param[in] in_ts Input timestamp
-+ * @param[in] fs_tb Duration time base; typically this is finer-grained
-+ * (greater) than `in_tb` and `out_tb`
-+ * @param[in] duration Duration till the next call to this function (i.e.
-+ * duration of the current packet/frame)
-+ * @param[in,out] last Pointer to a timestamp expressed in terms of
-+ * `fs_tb`, acting as a state variable
-+ * @param[in] out_tb Output timebase
-+ * @return Timestamp expressed in terms of `out_tb`
-+ *
-+ * @note In the context of this function, "duration" is in term of samples, not
-+ * seconds.
-+ */
-+int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb,
-+ int duration, int64_t* last, AVRational out_tb);
-+
-+/**
-+ * Add a value to a timestamp.
-+ *
-+ * This function guarantees that when the same value is repeatly added that
-+ * no accumulation of rounding errors occurs.
-+ *
-+ * @param[in] ts Input timestamp
-+ * @param[in] ts_tb Input timestamp time base
-+ * @param[in] inc Value to be added
-+ * @param[in] inc_tb Time base of `inc`
-+ */
-+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb,
-+ int64_t inc);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MATHEMATICS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-@@ -0,0 +1,708 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_mem
-+ * Memory handling functions
-+ */
-+
-+#ifndef AVUTIL_MEM_H
-+#define AVUTIL_MEM_H
-+
-+#include <limits.h>
-+#include <stdint.h>
-+
-+#include "attributes.h"
-+#include "avutil.h"
-+#include "version.h"
-+
-+/**
-+ * @addtogroup lavu_mem
-+ * Utilities for manipulating memory.
-+ *
-+ * FFmpeg has several applications of memory that are not required of a typical
-+ * program. For example, the computing-heavy components like video decoding and
-+ * encoding can be sped up significantly through the use of aligned memory.
-+ *
-+ * However, for each of FFmpeg's applications of memory, there might not be a
-+ * recognized or standardized API for that specific use. Memory alignment, for
-+ * instance, varies wildly depending on operating systems, architectures, and
-+ * compilers. Hence, this component of @ref libavutil is created to make
-+ * dealing with memory consistently possible on all platforms.
-+ *
-+ * @{
-+ */
-+
-+#if FF_API_DECLARE_ALIGNED
-+/**
-+ *
-+ * @defgroup lavu_mem_macros Alignment Macros
-+ * Helper macros for declaring aligned variables.
-+ * @{
-+ */
-+
-+/**
-+ * @def DECLARE_ALIGNED(n,t,v)
-+ * Declare a variable that is aligned in memory.
-+ *
-+ * @code{.c}
-+ * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
-+ * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
-+ *
-+ * // The default-alignment equivalent would be
-+ * uint16_t aligned_int = 42;
-+ * uint8_t aligned_array[128];
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_ALIGNED(n,t,v)
-+ * Declare an aligned variable appropriate for use in inline assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_ALIGNED(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_CONST(n,t,v)
-+ * Declare a static constant aligned variable appropriate for use in inline
-+ * assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+# if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || \
-+ defined(__SUNPRO_C)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) const t __attribute__((aligned(n))) v
-+# elif defined(__DJGPP__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) \
-+ t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# elif defined(__GNUC__) || defined(__clang__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t av_used __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(n))) v
-+# elif defined(_MSC_VER)
-+# define DECLARE_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_CONST(n, t, v) __declspec(align(n)) static const t v
-+# else
-+# define DECLARE_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_CONST(n, t, v) static const t v
-+# endif
-+
-+/**
-+ * @}
-+ */
-+#endif
-+
-+/**
-+ * @defgroup lavu_mem_attrs Function Attributes
-+ * Function attributes applicable to memory handling functions.
-+ *
-+ * These function attributes can help compilers emit more useful warnings, or
-+ * generate better code.
-+ * @{
-+ */
-+
-+/**
-+ * @def av_malloc_attrib
-+ * Function attribute denoting a malloc-like function.
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `malloc` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_malloc_attrib __attribute__((__malloc__))
-+#else
-+# define av_malloc_attrib
-+#endif
-+
-+/**
-+ * @def av_alloc_size(...)
-+ * Function attribute used on a function that allocates memory, whose size is
-+ * given by the specified parameter(s).
-+ *
-+ * @code{.c}
-+ * void *av_malloc(size_t size) av_alloc_size(1);
-+ * void *av_calloc(size_t nmemb, size_t size) av_alloc_size(1, 2);
-+ * @endcode
-+ *
-+ * @param ... One or two parameter indexes, separated by a comma
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `alloc_size` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3)
-+# define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-+#else
-+# define av_alloc_size(...)
-+#endif
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_funcs Heap Management
-+ * Functions responsible for allocating, freeing, and copying memory.
-+ *
-+ * All memory allocation functions have a built-in upper limit of `INT_MAX`
-+ * bytes. This may be changed with av_max_alloc(), although exercise extreme
-+ * caution when doing so.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU).
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_mallocz()
-+ */
-+void* av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU) and zero all the bytes of the
-+ * block.
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if it cannot be allocated
-+ * @see av_malloc()
-+ */
-+void* av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block for an array with av_malloc().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of element
-+ * @param size Size of a single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_malloc()
-+ */
-+av_alloc_size(1, 2) void* av_malloc_array(size_t nmemb, size_t size);
-+
-+/**
-+ * Allocate a memory block for an array with av_mallocz().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of elements
-+ * @param size Size of the single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ *
-+ * @see av_mallocz()
-+ * @see av_malloc_array()
-+ */
-+void* av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2);
-+
-+#if FF_API_AV_MALLOCZ_ARRAY
-+/**
-+ * @deprecated use av_calloc()
-+ */
-+attribute_deprecated void* av_mallocz_array(size_t nmemb,
-+ size_t size) av_malloc_attrib
-+ av_alloc_size(1, 2);
-+#endif
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * If `ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param size Size in bytes of the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Pointer to a newly-reallocated block or `NULL` if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the returned pointer is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_fast_realloc()
-+ * @see av_reallocp()
-+ */
-+void* av_realloc(void* ptr, size_t size) av_alloc_size(2);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory through a pointer to a
-+ * pointer.
-+ *
-+ * If `*ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `*ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already allocated
-+ * with av_realloc(), or a pointer to `NULL`. The pointer
-+ * is updated on success, or freed on failure.
-+ * @param[in] size Size in bytes for the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+av_warn_unused_result int av_reallocp(void* ptr, size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * This function does the same thing as av_realloc(), except:
-+ * - It takes two size arguments and allocates `nelem * elsize` bytes,
-+ * after checking the result of the multiplication for integer overflow.
-+ * - It frees the input block in case of failure, thus avoiding the memory
-+ * leak with the classic
-+ * @code{.c}
-+ * buf = realloc(buf);
-+ * if (!buf)
-+ * return -1;
-+ * @endcode
-+ * pattern.
-+ */
-+void* av_realloc_f(void* ptr, size_t nelem, size_t elsize);
-+
-+/**
-+ * Allocate, reallocate, or free an array.
-+ *
-+ * If `ptr` is `NULL` and `nmemb` > 0, allocate a new block. If
-+ * `nmemb` is zero, free the memory block pointed to by `ptr`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param nmemb Number of elements in the array
-+ * @param size Size of the single element of the array
-+ *
-+ * @return Pointer to a newly-reallocated block or NULL if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_reallocp_array()
-+ */
-+av_alloc_size(2, 3) void* av_realloc_array(void* ptr, size_t nmemb,
-+ size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free an array through a pointer to a pointer.
-+ *
-+ * If `*ptr` is `NULL` and `nmemb` > 0, allocate a new block. If `nmemb` is
-+ * zero, free the memory block pointed to by `*ptr`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already
-+ * allocated with av_realloc(), or a pointer to `NULL`.
-+ * The pointer is updated on success, or freed on failure.
-+ * @param[in] nmemb Number of elements
-+ * @param[in] size Size of the single element
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+int av_reallocp_array(void* ptr, size_t nmemb, size_t size);
-+
-+/**
-+ * Reallocate the given buffer if it is not large enough, otherwise do nothing.
-+ *
-+ * If the given buffer is `NULL`, then a new uninitialized buffer is allocated.
-+ *
-+ * If the given buffer is not large enough, and reallocation fails, `NULL` is
-+ * returned and `*size` is set to 0, but the original buffer is not changed or
-+ * freed.
-+ *
-+ * A typical use pattern follows:
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * uint8_t *new_buf = av_fast_realloc(buf, ¤t_size, size_needed);
-+ * if (!new_buf) {
-+ * // Allocation failed; clean up original buffer
-+ * av_freep(&buf);
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Already allocated buffer, or `NULL`
-+ * @param[in,out] size Pointer to the size of buffer `ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `ptr`
-+ * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
-+ * buffer if the buffer was not large enough, or `NULL` in case of
-+ * error
-+ * @see av_realloc()
-+ * @see av_fast_malloc()
-+ */
-+void* av_fast_realloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate a buffer, reusing the given one if large enough.
-+ *
-+ * Contrary to av_fast_realloc(), the current buffer contents might not be
-+ * preserved and on error the old buffer is freed, thus no special handling to
-+ * avoid memleaks is necessary.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * av_fast_malloc(&buf, ¤t_size, size_needed);
-+ * if (!buf) {
-+ * // Allocation failed; buf already freed
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_realloc()
-+ * @see av_fast_mallocz()
-+ */
-+void av_fast_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate and clear a buffer, reusing the given one if large enough.
-+ *
-+ * Like av_fast_malloc(), but all newly allocated space is initially cleared.
-+ * Reused buffer is not cleared.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_fast_malloc()
-+ */
-+void av_fast_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family.
-+ *
-+ * @param ptr Pointer to the memory block which should be freed.
-+ *
-+ * @note `ptr = NULL` is explicitly allowed.
-+ * @note It is recommended that you use av_freep() instead, to prevent leaving
-+ * behind dangling pointers.
-+ * @see av_freep()
-+ */
-+void av_free(void* ptr);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family, and set the pointer pointing to it to `NULL`.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = av_malloc(16);
-+ * av_free(buf);
-+ * // buf now contains a dangling pointer to freed memory, and accidental
-+ * // dereference of buf will result in a use-after-free, which may be a
-+ * // security risk.
-+ *
-+ * uint8_t *buf = av_malloc(16);
-+ * av_freep(&buf);
-+ * // buf is now NULL, and accidental dereference will only result in a
-+ * // NULL-pointer dereference.
-+ * @endcode
-+ *
-+ * @param ptr Pointer to the pointer to the memory block which should be freed
-+ * @note `*ptr = NULL` is safe and leads to no action.
-+ * @see av_free()
-+ */
-+void av_freep(void* ptr);
-+
-+/**
-+ * Duplicate a string.
-+ *
-+ * @param s String to be duplicated
-+ * @return Pointer to a newly-allocated string containing a
-+ * copy of `s` or `NULL` if the string cannot be allocated
-+ * @see av_strndup()
-+ */
-+char* av_strdup(const char* s) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a substring of a string.
-+ *
-+ * @param s String to be duplicated
-+ * @param len Maximum length of the resulting string (not counting the
-+ * terminating byte)
-+ * @return Pointer to a newly-allocated string containing a
-+ * substring of `s` or `NULL` if the string cannot be allocated
-+ */
-+char* av_strndup(const char* s, size_t len) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a buffer with av_malloc().
-+ *
-+ * @param p Buffer to be duplicated
-+ * @param size Size in bytes of the buffer copied
-+ * @return Pointer to a newly allocated buffer containing a
-+ * copy of `p` or `NULL` if the buffer cannot be allocated
-+ */
-+void* av_memdup(const void* p, size_t size);
-+
-+/**
-+ * Overlapping memcpy() implementation.
-+ *
-+ * @param dst Destination buffer
-+ * @param back Number of bytes back to start copying (i.e. the initial size of
-+ * the overlapping window); must be > 0
-+ * @param cnt Number of bytes to copy; must be >= 0
-+ *
-+ * @note `cnt > back` is valid, this will copy the bytes we just copied,
-+ * thus creating a repeating pattern with a period length of `back`.
-+ */
-+void av_memcpy_backptr(uint8_t* dst, int back, int cnt);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_dynarray Dynamic Array
-+ *
-+ * Utilities to make an array grow when needed.
-+ *
-+ * Sometimes, the programmer would want to have an array that can grow when
-+ * needed. The libavutil dynamic array utilities fill that need.
-+ *
-+ * libavutil supports two systems of appending elements onto a dynamically
-+ * allocated array, the first one storing the pointer to the value in the
-+ * array, and the second storing the value directly. In both systems, the
-+ * caller is responsible for maintaining a variable containing the length of
-+ * the array, as well as freeing of the array after use.
-+ *
-+ * The first system stores pointers to values in a block of dynamically
-+ * allocated memory. Since only pointers are stored, the function does not need
-+ * to know the size of the type. Both av_dynarray_add() and
-+ * av_dynarray_add_nofree() implement this system.
-+ *
-+ * @code
-+ * type **array = NULL; //< an array of pointers to values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added2);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // &to_be_added == array[0]
-+ * // &to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * The second system stores the value directly in a block of memory. As a
-+ * result, the function has to know the size of the type. av_dynarray2_add()
-+ * implements this mechanism.
-+ *
-+ * @code
-+ * type *array = NULL; //< an array of values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array), NULL);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ * memcpy(addr, &to_be_added, sizeof(to_be_added));
-+ *
-+ * // Shortcut of the above.
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array),
-+ * (const void *)&to_be_added2);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // to_be_added == array[0]
-+ * // to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Add the pointer to an element to a dynamic array.
-+ *
-+ * The array to grow is supposed to be an array of pointers to
-+ * structures, and the element to add must be a pointer to an already
-+ * allocated structure.
-+ *
-+ * The array is reallocated when its size reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem Element to add
-+ * @see av_dynarray_add_nofree(), av_dynarray2_add()
-+ */
-+void av_dynarray_add(void* tab_ptr, int* nb_ptr, void* elem);
-+
-+/**
-+ * Add an element to a dynamic array.
-+ *
-+ * Function has the same functionality as av_dynarray_add(),
-+ * but it doesn't free memory on fails. It returns error code
-+ * instead and leave current buffer untouched.
-+ *
-+ * @return >=0 on success, negative otherwise
-+ * @see av_dynarray_add(), av_dynarray2_add()
-+ */
-+av_warn_unused_result int av_dynarray_add_nofree(void* tab_ptr, int* nb_ptr,
-+ void* elem);
-+
-+/**
-+ * Add an element of size `elem_size` to a dynamic array.
-+ *
-+ * The array is reallocated when its number of elements reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem_size Size in bytes of an element in the array
-+ * @param[in] elem_data Pointer to the data of the element to add. If
-+ * `NULL`, the space of the newly added element is
-+ * allocated but left uninitialized.
-+ *
-+ * @return Pointer to the data of the element to copy in the newly allocated
-+ * space
-+ * @see av_dynarray_add(), av_dynarray_add_nofree()
-+ */
-+void* av_dynarray2_add(void** tab_ptr, int* nb_ptr, size_t elem_size,
-+ const uint8_t* elem_data);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_misc Miscellaneous Functions
-+ *
-+ * Other functions related to memory allocation.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Multiply two `size_t` values checking for overflow.
-+ *
-+ * @param[in] a,b Operands of multiplication
-+ * @param[out] r Pointer to the result of the operation
-+ * @return 0 on success, AVERROR(EINVAL) on overflow
-+ */
-+int av_size_mult(size_t a, size_t b, size_t* r);
-+
-+/**
-+ * Set the maximum size that may be allocated in one block.
-+ *
-+ * The value specified with this function is effective for all libavutil's @ref
-+ * lavu_mem_funcs "heap management functions."
-+ *
-+ * By default, the max value is defined as `INT_MAX`.
-+ *
-+ * @param max Value to be set as the new maximum size
-+ *
-+ * @warning Exercise extreme caution when using this function. Don't touch
-+ * this if you do not understand the full consequence of doing so.
-+ */
-+void av_max_alloc(size_t max);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MEM_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-@@ -0,0 +1,808 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_PIXFMT_H
-+#define AVUTIL_PIXFMT_H
-+
-+/**
-+ * @file
-+ * pixel format definitions
-+ */
-+
-+#include "libavutil/avconfig.h"
-+#include "version.h"
-+
-+#define AVPALETTE_SIZE 1024
-+#define AVPALETTE_COUNT 256
-+
-+/**
-+ * Pixel format.
-+ *
-+ * @note
-+ * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
-+ * color is put together as:
-+ * (A << 24) | (R << 16) | (G << 8) | B
-+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
-+ * big-endian CPUs.
-+ *
-+ * @note
-+ * If the resolution is not a multiple of the chroma subsampling factor
-+ * then the chroma plane resolution must be rounded up.
-+ *
-+ * @par
-+ * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
-+ * image data is stored in AVFrame.data[0]. The palette is transported in
-+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
-+ * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
-+ * also endian-specific). Note also that the individual RGB32 palette
-+ * components stored in AVFrame.data[1] should be in the range 0..255.
-+ * This is important as many custom PAL8 video codecs that were designed
-+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
-+ *
-+ * @par
-+ * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
-+ * for pal8. This palette is filled in automatically by the function
-+ * allocating the picture.
-+ */
-+enum AVPixelFormat {
-+ AV_PIX_FMT_NONE = -1,
-+ AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-+ AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-+ AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-+ AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_GRAY8, ///< Y , 8bpp
-+ AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_PAL8, ///< 8 bits with AV_PIX_FMT_RGB32 palette
-+ AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV420P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV422P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV444P and
-+ ///< setting color_range
-+ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-+ AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-+ AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
-+ AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
-+ AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
-+ AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
-+ AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
-+
-+ AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-+ AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-+ AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-+ AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-+
-+ AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
-+ AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
-+ AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in
-+ ///< favor of AV_PIX_FMT_YUV440P and setting color_range
-+ AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2
-+ ///< Y & A samples)
-+ AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ /**
-+ * Hardware acceleration through VA-API, data[3] contains a
-+ * VASurfaceID.
-+ */
-+ AV_PIX_FMT_VAAPI,
-+
-+ AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3]
-+ ///< contains a LPDIRECT3DSURFACE9 pointer
-+
-+ AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_YA8, ///< 8 bits gray, 8 bits alpha
-+
-+ AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+ AV_PIX_FMT_GRAY8A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+
-+ AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ /**
-+ * The following 12 formats have the disadvantage of needing 1 format for each
-+ * bit depth. Notice that each 9/10 bits sample is stored in 16 bits with
-+ * extra padding. If you want to support multiple bit depths, then using
-+ * AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
-+ */
-+ AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P10BE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P10LE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P10BE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P10LE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P10BE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P10LE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
-+ AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
-+ AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
-+ AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian
-+ AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian
-+ AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian
-+ AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian
-+ AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+
-+ AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3]
-+ ///< contains a VdpVideoSurface
-+
-+ AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< little-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< big-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample
-+ ///< per 2x1 Y samples)
-+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), little-endian
-+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), big-endian
-+
-+ AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+ AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+
-+ AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
-+
-+ AV_PIX_FMT_YA16BE, ///< 16 bits gray, 16 bits alpha (big-endian)
-+ AV_PIX_FMT_YA16LE, ///< 16 bits gray, 16 bits alpha (little-endian)
-+
-+ AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
-+ AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
-+ AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
-+ /**
-+ * HW acceleration through QSV, data[3] contains a pointer to the
-+ * mfxFrameSurface1 structure.
-+ */
-+ AV_PIX_FMT_QSV,
-+ /**
-+ * HW acceleration though MMAL, data[3] contains a pointer to the
-+ * MMAL_BUFFER_HEADER_T structure.
-+ */
-+ AV_PIX_FMT_MMAL,
-+
-+ AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11 via old API,
-+ ///< Picture.data[3] contains a
-+ ///< ID3D11VideoDecoderOutputView pointer
-+
-+ /**
-+ * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
-+ * exactly as for system memory frames.
-+ */
-+ AV_PIX_FMT_CUDA,
-+
-+ AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined
-+ AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined
-+ AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined
-+ AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined
-+
-+ AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian
-+ AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
-+ AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
-+ AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
-+ AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1
-+ ///< Y samples) full scale (JPEG), deprecated in favor
-+ ///< of AV_PIX_FMT_YUV411P and setting color_range
-+
-+ AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, big-endian
-+
-+ AV_PIX_FMT_XVMC, ///< XVideo Motion Acceleration via common packet passing
-+
-+ AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_AYUV64LE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), little-endian
-+ AV_PIX_FMT_AYUV64BE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), big-endian
-+
-+ AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
-+
-+ AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, little-endian
-+ AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, big-endian
-+
-+ AV_PIX_FMT_GBRAP12BE, ///< planar GBR 4:4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRAP12LE, ///< planar GBR 4:4:4:4 48bpp, little-endian
-+
-+ AV_PIX_FMT_GBRAP10BE, ///< planar GBR 4:4:4:4 40bpp, big-endian
-+ AV_PIX_FMT_GBRAP10LE, ///< planar GBR 4:4:4:4 40bpp, little-endian
-+
-+ AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec
-+
-+ AV_PIX_FMT_GRAY12BE, ///< Y , 12bpp, big-endian
-+ AV_PIX_FMT_GRAY12LE, ///< Y , 12bpp, little-endian
-+ AV_PIX_FMT_GRAY10BE, ///< Y , 10bpp, big-endian
-+ AV_PIX_FMT_GRAY10LE, ///< Y , 10bpp, little-endian
-+
-+ AV_PIX_FMT_P016LE, ///< like NV12, with 16bpp per component, little-endian
-+ AV_PIX_FMT_P016BE, ///< like NV12, with 16bpp per component, big-endian
-+
-+ /**
-+ * Hardware surfaces for Direct3D11.
-+ *
-+ * This is preferred over the legacy AV_PIX_FMT_D3D11VA_VLD. The new D3D11
-+ * hwaccel API and filtering support AV_PIX_FMT_D3D11 only.
-+ *
-+ * data[0] contains a ID3D11Texture2D pointer, and data[1] contains the
-+ * texture array index of the frame as intptr_t if the ID3D11Texture2D is
-+ * an array texture (or always 0 if it's a normal texture).
-+ */
-+ AV_PIX_FMT_D3D11,
-+
-+ AV_PIX_FMT_GRAY9BE, ///< Y , 9bpp, big-endian
-+ AV_PIX_FMT_GRAY9LE, ///< Y , 9bpp, little-endian
-+
-+ AV_PIX_FMT_GBRPF32BE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< big-endian
-+ AV_PIX_FMT_GBRPF32LE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< little-endian
-+ AV_PIX_FMT_GBRAPF32BE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, big-endian
-+ AV_PIX_FMT_GBRAPF32LE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, little-endian
-+
-+ /**
-+ * DRM-managed buffers exposed through PRIME buffer sharing.
-+ *
-+ * data[0] points to an AVDRMFrameDescriptor.
-+ */
-+ AV_PIX_FMT_DRM_PRIME,
-+ /**
-+ * Hardware surfaces for OpenCL.
-+ *
-+ * data[i] contain 2D image objects (typed in C as cl_mem, used
-+ * in OpenCL as image2d_t) for each plane of the surface.
-+ */
-+ AV_PIX_FMT_OPENCL,
-+
-+ AV_PIX_FMT_GRAY14BE, ///< Y , 14bpp, big-endian
-+ AV_PIX_FMT_GRAY14LE, ///< Y , 14bpp, little-endian
-+
-+ AV_PIX_FMT_GRAYF32BE, ///< IEEE-754 single precision Y, 32bpp, big-endian
-+ AV_PIX_FMT_GRAYF32LE, ///< IEEE-754 single precision Y, 32bpp, little-endian
-+
-+ AV_PIX_FMT_YUVA422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, little-endian
-+ AV_PIX_FMT_YUVA444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, little-endian
-+
-+ AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
-+
-+ /**
-+ * Vulkan hardware images.
-+ *
-+ * data[0] points to an AVVkFrame
-+ */
-+ AV_PIX_FMT_VULKAN,
-+
-+ AV_PIX_FMT_Y210BE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, big-endian
-+ AV_PIX_FMT_Y210LE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, little-endian
-+
-+ AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), big-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), big-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_P210BE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P210LE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P410BE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P410LE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P216BE, ///< interleaved chroma YUV 4:2:2, 32bpp, big-endian
-+ AV_PIX_FMT_P216LE, ///< interleaved chroma YUV 4:2:2, 32bpp, liddle-endian
-+
-+ AV_PIX_FMT_P416BE, ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian
-+ AV_PIX_FMT_P416LE, ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian
-+
-+ AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to
-+ ///< link with shared libav* because the number of formats
-+ ///< might differ between versions
-+};
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-+#else
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-+#endif
-+
-+#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA)
-+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-+#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA)
-+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-+#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0)
-+#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0)
-+
-+#define AV_PIX_FMT_GRAY9 AV_PIX_FMT_NE(GRAY9BE, GRAY9LE)
-+#define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
-+#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
-+#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
-+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-+#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE)
-+#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE)
-+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-+#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-+#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE)
-+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-+#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
-+
-+#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE, YUV420P9LE)
-+#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE, YUV422P9LE)
-+#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE, YUV444P9LE)
-+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-+#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE)
-+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-+#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
-+#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
-+#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE)
-+#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
-+#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
-+#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
-+#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
-+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-+
-+#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE, GBRP9LE)
-+#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE)
-+#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE)
-+#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE)
-+#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE)
-+#define AV_PIX_FMT_GBRAP10 AV_PIX_FMT_NE(GBRAP10BE, GBRAP10LE)
-+#define AV_PIX_FMT_GBRAP12 AV_PIX_FMT_NE(GBRAP12BE, GBRAP12LE)
-+#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE)
-+
-+#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE)
-+#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE)
-+#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE)
-+#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE)
-+
-+#define AV_PIX_FMT_GBRPF32 AV_PIX_FMT_NE(GBRPF32BE, GBRPF32LE)
-+#define AV_PIX_FMT_GBRAPF32 AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
-+
-+#define AV_PIX_FMT_GRAYF32 AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
-+
-+#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE, YUVA420P9LE)
-+#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE, YUVA422P9LE)
-+#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE, YUVA444P9LE)
-+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-+#define AV_PIX_FMT_YUVA422P12 AV_PIX_FMT_NE(YUVA422P12BE, YUVA422P12LE)
-+#define AV_PIX_FMT_YUVA444P12 AV_PIX_FMT_NE(YUVA444P12BE, YUVA444P12LE)
-+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-+
-+#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
-+#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
-+#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE)
-+#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)
-+
-+#define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE)
-+#define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE)
-+#define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE)
-+
-+#define AV_PIX_FMT_P210 AV_PIX_FMT_NE(P210BE, P210LE)
-+#define AV_PIX_FMT_P410 AV_PIX_FMT_NE(P410BE, P410LE)
-+#define AV_PIX_FMT_P216 AV_PIX_FMT_NE(P216BE, P216LE)
-+#define AV_PIX_FMT_P416 AV_PIX_FMT_NE(P416BE, P416LE)
-+
-+/**
-+ * Chromaticity coordinates of the source primaries.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.1 and
-+ * ITU-T H.273.
-+ */
-+enum AVColorPrimaries {
-+ AVCOL_PRI_RESERVED0 = 0,
-+ AVCOL_PRI_BT709 =
-+ 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP 177 Annex B
-+ AVCOL_PRI_UNSPECIFIED = 2,
-+ AVCOL_PRI_RESERVED = 3,
-+ AVCOL_PRI_BT470M =
-+ 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+
-+ AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM
-+ AVCOL_PRI_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-+ AVCOL_PRI_SMPTE240M =
-+ 7, ///< identical to above, also called "SMPTE C" even though it uses D65
-+ AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C
-+ AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
-+ AVCOL_PRI_SMPTE428 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
-+ AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428,
-+ AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
-+ AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
-+ AVCOL_PRI_EBU3213 = 22, ///< EBU Tech. 3213-E (nothing there) / one of JEDEC
-+ ///< P22 group phosphors
-+ AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213,
-+ AVCOL_PRI_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Color Transfer Characteristic.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.2.
-+ */
-+enum AVColorTransferCharacteristic {
-+ AVCOL_TRC_RESERVED0 = 0,
-+ AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
-+ AVCOL_TRC_UNSPECIFIED = 2,
-+ AVCOL_TRC_RESERVED = 3,
-+ AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-+ AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
-+ AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358
-+ ///< 525 or 625 / ITU-R BT1700 NTSC
-+ AVCOL_TRC_SMPTE240M = 7,
-+ AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
-+ AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
-+ AVCOL_TRC_LOG_SQRT =
-+ 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
-+ AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-+ AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
-+ AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-+ AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10-bit system
-+ AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12-bit system
-+ AVCOL_TRC_SMPTE2084 =
-+ 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
-+ AVCOL_TRC_SMPTEST2084 = AVCOL_TRC_SMPTE2084,
-+ AVCOL_TRC_SMPTE428 = 17, ///< SMPTE ST 428-1
-+ AVCOL_TRC_SMPTEST428_1 = AVCOL_TRC_SMPTE428,
-+ AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma"
-+ AVCOL_TRC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * YUV colorspace type.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.3.
-+ */
-+enum AVColorSpace {
-+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC
-+ ///< 61966-2-1 (sRGB), YZX and ST 428-1
-+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 /
-+ ///< derived in SMPTE RP 177 Annex B
-+ AVCOL_SPC_UNSPECIFIED = 2,
-+ AVCOL_SPC_RESERVED =
-+ 3, ///< reserved for future use by ITU-T and ISO/IEC just like 15-255 are
-+ AVCOL_SPC_FCC =
-+ 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+ AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-+ AVCOL_SPC_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC /
-+ ///< functionally identical to above
-+ AVCOL_SPC_SMPTE240M =
-+ 7, ///< derived from 170M primaries and D65 white point, 170M is derived
-+ ///< from BT470 System M's primaries
-+ AVCOL_SPC_YCGCO =
-+ 8, ///< used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-+ AVCOL_SPC_YCOCG = AVCOL_SPC_YCGCO,
-+ AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
-+ AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
-+ AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x
-+ AVCOL_SPC_CHROMA_DERIVED_NCL =
-+ 12, ///< Chromaticity-derived non-constant luminance system
-+ AVCOL_SPC_CHROMA_DERIVED_CL =
-+ 13, ///< Chromaticity-derived constant luminance system
-+ AVCOL_SPC_ICTCP = 14, ///< ITU-R BT.2100-0, ICtCp
-+ AVCOL_SPC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Visual content value range.
-+ *
-+ * These values are based on definitions that can be found in multiple
-+ * specifications, such as ITU-T BT.709 (3.4 - Quantization of RGB, luminance
-+ * and colour-difference signals), ITU-T BT.2020 (Table 5 - Digital
-+ * Representation) as well as ITU-T BT.2100 (Table 9 - Digital 10- and 12-bit
-+ * integer representation). At the time of writing, the BT.2100 one is
-+ * recommended, as it also defines the full range representation.
-+ *
-+ * Common definitions:
-+ * - For RGB and luma planes such as Y in YCbCr and I in ICtCp,
-+ * 'E' is the original value in range of 0.0 to 1.0.
-+ * - For chroma planes such as Cb,Cr and Ct,Cp, 'E' is the original
-+ * value in range of -0.5 to 0.5.
-+ * - 'n' is the output bit depth.
-+ * - For additional definitions such as rounding and clipping to valid n
-+ * bit unsigned integer range, please refer to BT.2100 (Table 9).
-+ */
-+enum AVColorRange {
-+ AVCOL_RANGE_UNSPECIFIED = 0,
-+
-+ /**
-+ * Narrow or limited range content.
-+ *
-+ * - For luma planes:
-+ *
-+ * (219 * E + 16) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-235 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (224 * E + 128) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-240 for 8 bits
-+ */
-+ AVCOL_RANGE_MPEG = 1,
-+
-+ /**
-+ * Full range content.
-+ *
-+ * - For RGB and luma planes:
-+ *
-+ * (2^n - 1) * E
-+ *
-+ * F.ex. the range of 0-255 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (2^n - 1) * E + 2^(n - 1)
-+ *
-+ * F.ex. the range of 1-255 for 8 bits
-+ */
-+ AVCOL_RANGE_JPEG = 2,
-+ AVCOL_RANGE_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Location of chroma samples.
-+ *
-+ * Illustration showing the location of the first (top left) chroma sample of
-+ *the image, the left shows only luma, the right shows the location of the
-+ *chroma sample, the 2 could be imagined to overlay each other but are drawn
-+ *separately due to limitations of ASCII
-+ *
-+ * 1st 2nd 1st 2nd horizontal luma sample positions
-+ * v v v v
-+ * ______ ______
-+ *1st luma line > |X X ... |3 4 X ... X are luma samples,
-+ * | |1 2 1-6 are possible chroma positions
-+ *2nd luma line > |X X ... |5 6 X ... 0 is undefined/unknown position
-+ */
-+enum AVChromaLocation {
-+ AVCHROMA_LOC_UNSPECIFIED = 0,
-+ AVCHROMA_LOC_LEFT = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0
-+ AVCHROMA_LOC_CENTER = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0
-+ AVCHROMA_LOC_TOPLEFT =
-+ 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2
-+ AVCHROMA_LOC_TOP = 4,
-+ AVCHROMA_LOC_BOTTOMLEFT = 5,
-+ AVCHROMA_LOC_BOTTOM = 6,
-+ AVCHROMA_LOC_NB ///< Not part of ABI
-+};
-+
-+#endif /* AVUTIL_PIXFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-@@ -0,0 +1,221 @@
-+/*
-+ * rational numbers
-+ * Copyright (c) 2003 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_math_rational
-+ * Utilties for rational number calculation.
-+ * @author Michael Niedermayer <michaelni(a)gmx.at>
-+ */
-+
-+#ifndef AVUTIL_RATIONAL_H
-+#define AVUTIL_RATIONAL_H
-+
-+#include <stdint.h>
-+#include <limits.h>
-+#include "attributes.h"
-+
-+/**
-+ * @defgroup lavu_math_rational AVRational
-+ * @ingroup lavu_math
-+ * Rational number calculation.
-+ *
-+ * While rational numbers can be expressed as floating-point numbers, the
-+ * conversion process is a lossy one, so are floating-point operations. On the
-+ * other hand, the nature of FFmpeg demands highly accurate calculation of
-+ * timestamps. This set of rational number utilities serves as a generic
-+ * interface for manipulating rational numbers as pairs of numerators and
-+ * denominators.
-+ *
-+ * Many of the functions that operate on AVRational's have the suffix `_q`, in
-+ * reference to the mathematical symbol "ℚ" (Q) which denotes the set of all
-+ * rational numbers.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rational number (pair of numerator and denominator).
-+ */
-+typedef struct AVRational {
-+ int num; ///< Numerator
-+ int den; ///< Denominator
-+} AVRational;
-+
-+/**
-+ * Create an AVRational.
-+ *
-+ * Useful for compilers that do not support compound literals.
-+ *
-+ * @note The return value is not reduced.
-+ * @see av_reduce()
-+ */
-+static inline AVRational av_make_q(int num, int den) {
-+ AVRational r = {num, den};
-+ return r;
-+}
-+
-+/**
-+ * Compare two rationals.
-+ *
-+ * @param a First rational
-+ * @param b Second rational
-+ *
-+ * @return One of the following values:
-+ * - 0 if `a == b`
-+ * - 1 if `a > b`
-+ * - -1 if `a < b`
-+ * - `INT_MIN` if one of the values is of the form `0 / 0`
-+ */
-+static inline int av_cmp_q(AVRational a, AVRational b) {
-+ const int64_t tmp = a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-+
-+ if (tmp)
-+ return (int)((tmp ^ a.den ^ b.den) >> 63) | 1;
-+ else if (b.den && a.den)
-+ return 0;
-+ else if (a.num && b.num)
-+ return (a.num >> 31) - (b.num >> 31);
-+ else
-+ return INT_MIN;
-+}
-+
-+/**
-+ * Convert an AVRational to a `double`.
-+ * @param a AVRational to convert
-+ * @return `a` in floating-point form
-+ * @see av_d2q()
-+ */
-+static inline double av_q2d(AVRational a) { return a.num / (double)a.den; }
-+
-+/**
-+ * Reduce a fraction.
-+ *
-+ * This is useful for framerate calculations.
-+ *
-+ * @param[out] dst_num Destination numerator
-+ * @param[out] dst_den Destination denominator
-+ * @param[in] num Source numerator
-+ * @param[in] den Source denominator
-+ * @param[in] max Maximum allowed values for `dst_num` & `dst_den`
-+ * @return 1 if the operation is exact, 0 otherwise
-+ */
-+int av_reduce(int* dst_num, int* dst_den, int64_t num, int64_t den,
-+ int64_t max);
-+
-+/**
-+ * Multiply two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b*c
-+ */
-+AVRational av_mul_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Divide one rational by another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b/c
-+ */
-+AVRational av_div_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Add two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b+c
-+ */
-+AVRational av_add_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Subtract one rational from another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b-c
-+ */
-+AVRational av_sub_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Invert a rational.
-+ * @param q value
-+ * @return 1 / q
-+ */
-+static av_always_inline AVRational av_inv_q(AVRational q) {
-+ AVRational r = {q.den, q.num};
-+ return r;
-+}
-+
-+/**
-+ * Convert a double precision floating point number to a rational.
-+ *
-+ * In case of infinity, the returned value is expressed as `{1, 0}` or
-+ * `{-1, 0}` depending on the sign.
-+ *
-+ * @param d `double` to convert
-+ * @param max Maximum allowed numerator and denominator
-+ * @return `d` in AVRational form
-+ * @see av_q2d()
-+ */
-+AVRational av_d2q(double d, int max) av_const;
-+
-+/**
-+ * Find which of the two rationals is closer to another rational.
-+ *
-+ * @param q Rational to be compared against
-+ * @param q1,q2 Rationals to be tested
-+ * @return One of the following values:
-+ * - 1 if `q1` is nearer to `q` than `q2`
-+ * - -1 if `q2` is nearer to `q` than `q1`
-+ * - 0 if they have the same distance
-+ */
-+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-+
-+/**
-+ * Find the value in a list of rationals nearest a given reference rational.
-+ *
-+ * @param q Reference rational
-+ * @param q_list Array of rationals terminated by `{0, 0}`
-+ * @return Index of the nearest value found in the array
-+ */
-+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-+
-+/**
-+ * Convert an AVRational to a IEEE 32-bit `float` expressed in fixed-point
-+ * format.
-+ *
-+ * @param q Rational to be converted
-+ * @return Equivalent floating-point value, expressed as an unsigned 32-bit
-+ * integer.
-+ * @note The returned value is platform-indepedant.
-+ */
-+uint32_t av_q2intfloat(AVRational q);
-+
-+/**
-+ * Return the best rational so that a and b are multiple of it.
-+ * If the resulting denominator is larger than max_den, return def.
-+ */
-+AVRational av_gcd_q(AVRational a, AVRational b, int max_den, AVRational def);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_RATIONAL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-@@ -0,0 +1,276 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_SAMPLEFMT_H
-+#define AVUTIL_SAMPLEFMT_H
-+
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ *
-+ * @defgroup lavu_sampfmts Audio sample formats
-+ *
-+ * Audio sample format enumeration and related convenience functions.
-+ * @{
-+ */
-+
-+/**
-+ * Audio sample formats
-+ *
-+ * - The data described by the sample format is always in native-endian order.
-+ * Sample values can be expressed by native C types, hence the lack of a
-+ * signed 24-bit sample format even though it is a common raw audio data format.
-+ *
-+ * - The floating-point formats are based on full volume being in the range
-+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
-+ *
-+ * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
-+ * (such as AVFrame in libavcodec) is as follows:
-+ *
-+ * @par
-+ * For planar sample formats, each audio channel is in a separate data plane,
-+ * and linesize is the buffer size, in bytes, for a single plane. All data
-+ * planes must be the same size. For packed sample formats, only the first data
-+ * plane is used, and samples for each channel are interleaved. In this case,
-+ * linesize is the buffer size, in bytes, for the 1 plane.
-+ *
-+ */
-+enum AVSampleFormat {
-+ AV_SAMPLE_FMT_NONE = -1,
-+ AV_SAMPLE_FMT_U8, ///< unsigned 8 bits
-+ AV_SAMPLE_FMT_S16, ///< signed 16 bits
-+ AV_SAMPLE_FMT_S32, ///< signed 32 bits
-+ AV_SAMPLE_FMT_FLT, ///< float
-+ AV_SAMPLE_FMT_DBL, ///< double
-+
-+ AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
-+ AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
-+ AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
-+ AV_SAMPLE_FMT_FLTP, ///< float, planar
-+ AV_SAMPLE_FMT_DBLP, ///< double, planar
-+ AV_SAMPLE_FMT_S64, ///< signed 64 bits
-+ AV_SAMPLE_FMT_S64P, ///< signed 64 bits, planar
-+
-+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking
-+ ///< dynamically
-+};
-+
-+/**
-+ * Return the name of sample_fmt, or NULL if sample_fmt is not
-+ * recognized.
-+ */
-+const char* av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
-+ * on error.
-+ */
-+enum AVSampleFormat av_get_sample_fmt(const char* name);
-+
-+/**
-+ * Return the planar<->packed alternative form of the given sample format, or
-+ * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
-+ * requested planar/packed format, the format returned is the same as the
-+ * input.
-+ */
-+enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt,
-+ int planar);
-+
-+/**
-+ * Get the packed alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in packed format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the packed alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the planar alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in planar format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the planar alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Generate a string corresponding to the sample format with
-+ * sample_fmt, or a header if sample_fmt is negative.
-+ *
-+ * @param buf the buffer where to write the string
-+ * @param buf_size the size of buf
-+ * @param sample_fmt the number of the sample format to print the
-+ * corresponding info string, or a negative value to print the
-+ * corresponding header.
-+ * @return the pointer to the filled buffer or NULL if sample_fmt is
-+ * unknown or in case of other errors
-+ */
-+char* av_get_sample_fmt_string(char* buf, int buf_size,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return number of bytes per sample.
-+ *
-+ * @param sample_fmt the sample format
-+ * @return number of bytes per sample or zero if unknown for the given
-+ * sample format
-+ */
-+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Check if the sample format is planar.
-+ *
-+ * @param sample_fmt the sample format to inspect
-+ * @return 1 if the sample format is planar, 0 if it is interleaved
-+ */
-+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the required buffer size for the given audio parameters.
-+ *
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return required buffer size, or negative error code on failure
-+ */
-+int av_samples_get_buffer_size(int* linesize, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * @}
-+ *
-+ * @defgroup lavu_sampmanip Samples manipulation
-+ *
-+ * Functions that manipulate audio samples
-+ * @{
-+ */
-+
-+/**
-+ * Fill plane data pointers and linesize for samples with sample
-+ * format sample_fmt.
-+ *
-+ * The audio_data array is filled with the pointers to the samples data planes:
-+ * for planar, set the start point of each channel's data within the buffer,
-+ * for packed, set the start point of the entire buffer only.
-+ *
-+ * The value pointed to by linesize is set to the aligned size of each
-+ * channel's data buffer for planar layout, or to the aligned size of the
-+ * buffer for all channels for packed layout.
-+ *
-+ * The buffer in buf must be big enough to contain all the samples
-+ * (use av_samples_get_buffer_size() to compute its minimum size),
-+ * otherwise the audio_data pointers will point to invalid data.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param buf the pointer to a buffer containing the samples
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return minimum size in bytes required for the buffer on
-+ * success, or a negative error code on failure
-+ */
-+int av_samples_fill_arrays(uint8_t** audio_data, int* linesize,
-+ const uint8_t* buf, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
-+ * linesize accordingly.
-+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
-+ * Allocated data will be initialized to silence.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize aligned size for audio buffer(s), may be NULL
-+ * @param nb_channels number of audio channels
-+ * @param nb_samples number of samples per channel
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return >=0 on success or a negative error code on failure
-+ * @todo return the size of the allocated buffer in case of success at the next
-+ * bump
-+ * @see av_samples_fill_arrays()
-+ * @see av_samples_alloc_array_and_samples()
-+ */
-+int av_samples_alloc(uint8_t** audio_data, int* linesize, int nb_channels,
-+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a data pointers array, samples buffer for nb_samples
-+ * samples, and fill data pointers and linesize accordingly.
-+ *
-+ * This is the same as av_samples_alloc(), but also allocates the data
-+ * pointers array.
-+ *
-+ * @see av_samples_alloc()
-+ */
-+int av_samples_alloc_array_and_samples(uint8_t*** audio_data, int* linesize,
-+ int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt,
-+ int align);
-+
-+/**
-+ * Copy samples from src to dst.
-+ *
-+ * @param dst destination array of pointers to data planes
-+ * @param src source array of pointers to data planes
-+ * @param dst_offset offset in samples at which the data will be written to dst
-+ * @param src_offset offset in samples at which the data will be read from src
-+ * @param nb_samples number of samples to be copied
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_copy(uint8_t** dst, uint8_t* const* src, int dst_offset,
-+ int src_offset, int nb_samples, int nb_channels,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Fill an audio buffer with silence.
-+ *
-+ * @param audio_data array of pointers to data planes
-+ * @param offset offset in samples at which to start filling
-+ * @param nb_samples number of samples to fill
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_set_silence(uint8_t** audio_data, int offset, int nb_samples,
-+ int nb_channels, enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+#endif /* AVUTIL_SAMPLEFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-@@ -0,0 +1,118 @@
-+/*
-+ * copyright (c) 2003 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Libavutil version macros
-+ */
-+
-+#ifndef AVUTIL_VERSION_H
-+#define AVUTIL_VERSION_H
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup version_utils
-+ *
-+ * Useful to check and match library version in order to maintain
-+ * backward compatibility.
-+ *
-+ * The FFmpeg libraries follow a versioning sheme very similar to
-+ * Semantic Versioning (http://semver.org/)
-+ * The difference is that the component called PATCH is called MICRO in FFmpeg
-+ * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
-+ * Also we do not increase MICRO for every bugfix or change in git master.
-+ *
-+ * Prior to FFmpeg 3.2 point releases did not change any lib version number to
-+ * avoid aliassing different git master checkouts.
-+ * Starting with FFmpeg 3.2, the released library versions will occupy
-+ * a separate MAJOR.MINOR that is not used on the master development branch.
-+ * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
-+ * for the release and master will continue at 55.12.100 after it. Each new
-+ * point release will then bump the MICRO improving the usefulness of the lib
-+ * versions.
-+ *
-+ * @{
-+ */
-+
-+#define AV_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c))
-+#define AV_VERSION_DOT(a, b, c) a##.##b##.##c
-+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-+
-+/**
-+ * Extract version components from the full ::AV_VERSION_INT int as returned
-+ * by functions like ::avformat_version() and ::avcodec_version()
-+ */
-+#define AV_VERSION_MAJOR(a) ((a) >> 16)
-+#define AV_VERSION_MINOR(a) (((a)&0x00FF00) >> 8)
-+#define AV_VERSION_MICRO(a) ((a)&0xFF)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_ver Version and Build diagnostics
-+ *
-+ * Macros and function useful to check at compiletime and at runtime
-+ * which version of libavutil is in use.
-+ *
-+ * @{
-+ */
-+
-+#define LIBAVUTIL_VERSION_MAJOR 57
-+#define LIBAVUTIL_VERSION_MINOR 17
-+#define LIBAVUTIL_VERSION_MICRO 100
-+
-+#define LIBAVUTIL_VERSION_INT \
-+ AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_VERSION \
-+ AV_VERSION(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
-+
-+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-+
-+/**
-+ * @defgroup lavu_depr_guards Deprecation Guards
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ *
-+ * @{
-+ */
-+
-+#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -0,0 +1,36 @@
-+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-+# vim: set filetype=python:
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+UNIFIED_SOURCES += [
-+ '../FFmpegAudioDecoder.cpp',
-+ '../FFmpegDataDecoder.cpp',
-+ '../FFmpegDecoderModule.cpp',
-+ '../FFmpegVideoDecoder.cpp',
-+]
-+LOCAL_INCLUDES += [
-+ '..',
-+ '/media/mozva',
-+ 'include',
-+]
-+
-+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-+ CXXFLAGS += [ '-Wno-deprecated-declarations' ]
-+if CONFIG['CC_TYPE'] == 'clang':
-+ CXXFLAGS += [
-+ '-Wno-unknown-attributes',
-+ ]
-+if CONFIG['CC_TYPE'] == 'gcc':
-+ CXXFLAGS += [
-+ '-Wno-attributes',
-+ ]
-+if CONFIG['MOZ_WAYLAND']:
-+ CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
-+ DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-+ USE_LIBS += ['mozva']
-+
-+include("/ipc/chromium/chromium-config.mozbuild")
-+
-+FINAL_LIBRARY = 'xul'
-diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build
---- a/dom/media/platforms/ffmpeg/moz.build
-+++ b/dom/media/platforms/ffmpeg/moz.build
-@@ -14,6 +14,7 @@
- "libav55",
- "ffmpeg57",
- "ffmpeg58",
-+ "ffmpeg59",
- ]
-
- UNIFIED_SOURCES += [
-
diff --git a/D139697.diff b/D139697.diff
deleted file mode 100644
index 2b9dc32..0000000
--- a/D139697.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -29,9 +29,6 @@
- if CONFIG['MOZ_WAYLAND']:
- CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
- DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-- UNIFIED_SOURCES += [
-- '../FFmpegVideoFramePool.cpp',
-- ]
- USE_LIBS += ['mozva']
-
- include("/ipc/chromium/chromium-config.mozbuild")
-diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-@@ -41,6 +41,9 @@
- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
- DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
- USE_LIBS += ["mozva"]
-+ UNIFIED_SOURCES += [
-+ "../FFmpegVideoFramePool.cpp",
-+ ]
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-
diff --git a/D139698.diff b/D139698.diff
deleted file mode 100644
index 7bf7af9..0000000
--- a/D139698.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-@@ -64,14 +64,16 @@
- AV_FUNC_56 = 1 << 3,
- AV_FUNC_57 = 1 << 4,
- AV_FUNC_58 = 1 << 5,
-+ AV_FUNC_59 = 1 << 6,
- AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_56 = AV_FUNC_56 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_57 = AV_FUNC_57 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_58 = AV_FUNC_58 | AV_FUNC_AVUTIL_MASK,
-+ AV_FUNC_AVUTIL_59 = AV_FUNC_59 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 |
-- AV_FUNC_57 | AV_FUNC_58,
-+ AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59,
- AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK
- };
-
-@@ -94,6 +96,9 @@
- case 58:
- version = AV_FUNC_58;
- break;
-+ case 59:
-+ version = AV_FUNC_59;
-+ break;
- default:
- FFMPEG_LOG("Unknown avcodec version");
- Unlink();
-@@ -128,15 +133,19 @@
- : LinkResult::MissingLibAVFunction; \
- }
-
-- AV_FUNC(av_lockmgr_register, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(av_lockmgr_register, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_alloc_context3, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_close, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_audio4, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_video2, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_decode_audio4, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
-+ AV_FUNC(avcodec_decode_video2, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_find_decoder, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_flush_buffers, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_open2, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_register_all, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_register_all, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(av_init_packet, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_close, AV_FUNC_AVCODEC_ALL)
-@@ -145,49 +154,56 @@
- AV_FUNC(avcodec_alloc_frame, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_get_frame_defaults, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_free_frame, AV_FUNC_54)
-- AV_FUNC(avcodec_send_packet, AV_FUNC_58)
-- AV_FUNC(avcodec_receive_frame, AV_FUNC_58)
-+ AV_FUNC(avcodec_send_packet, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC(avcodec_receive_frame, AV_FUNC_58 | AV_FUNC_59)
- AV_FUNC(avcodec_default_get_buffer2,
-- (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58))
-+ (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59))
- AV_FUNC_OPTION(av_rdft_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_calc, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_end, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_freep, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC(av_frame_alloc,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_free,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_unref,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC(av_image_check_size, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_image_get_buffer_size, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC_OPTION(av_buffer_get_opaque,
-- (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_buffer_create, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC_OPTION(av_buffer_get_opaque, (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_buffer_create,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL)
- AV_FUNC_OPTION(av_frame_get_color_range, AV_FUNC_AVUTIL_ALL)
-
- #ifdef MOZ_WAYLAND
-- AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string, AV_FUNC_AVUTIL_58)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string,
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59)
- #endif
- #undef AV_FUNC
- #undef AV_FUNC_OPTION
-@@ -219,7 +235,9 @@
- # undef VAD_FUNC_OPTION_SILENT
- #endif
-
-- avcodec_register_all();
-+ if (avcodec_register_all) {
-+ avcodec_register_all();
-+ }
- if (MOZ_LOG_TEST(sPDMLog, LogLevel::Debug)) {
- av_log_set_level(AV_LOG_DEBUG);
- } else if (MOZ_LOG_TEST(sPDMLog, LogLevel::Info)) {
-diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-@@ -27,6 +27,7 @@
- static const char* sLibs[] = {
- // clang-format off
- #if defined(XP_DARWIN)
-+ "libavcodec.59.dylib",
- "libavcodec.58.dylib",
- "libavcodec.57.dylib",
- "libavcodec.56.dylib",
-@@ -34,6 +35,7 @@
- "libavcodec.54.dylib",
- "libavcodec.53.dylib",
- #else
-+ "libavcodec.so.59",
- "libavcodec.so.58",
- "libavcodec-ffmpeg.so.58",
- "libavcodec-ffmpeg.so.57",
-@@ -76,7 +78,6 @@
- sLinkStatusLibraryName = lib;
- return true;
- case FFmpegLibWrapper::LinkResult::NoProvidedLib:
-- MOZ_ASSERT_UNREACHABLE("Incorrectly-setup sLibAV");
- break;
- case FFmpegLibWrapper::LinkResult::NoAVCodecVersion:
- if (sLinkStatus > LinkStatus_INVALID_CANDIDATE) {
-@@ -152,6 +153,9 @@
- case 58:
- module = FFmpegDecoderModule<58>::Create(&sLibAV);
- break;
-+ case 59:
-+ module = FFmpegDecoderModule<59>::Create(&sLibAV);
-+ break;
- default:
- module = nullptr;
- }
-
diff --git a/D139699.diff b/D139699.diff
deleted file mode 100644
index a4be4c5..0000000
--- a/D139699.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-@@ -206,15 +206,49 @@
- media::TimeUnit pts = aSample->mTime;
-
- while (packet.size > 0) {
-- int decoded;
-- int bytesConsumed =
-+ int decoded = false;
-+ int bytesConsumed = -1;
-+#if LIBAVCODEC_VERSION_MAJOR < 59
-+ bytesConsumed =
- mLib->avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
--
- if (bytesConsumed < 0) {
- NS_WARNING("FFmpeg audio decoder error.");
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
- RESULT_DETAIL("FFmpeg audio error:%d", bytesConsumed));
- }
-+#else
-+# define AVERROR_OK 0
-+
-+ int ret = mLib->avcodec_receive_frame(mCodecContext, mFrame);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ decoded = true;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF): {
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ }
-+ }
-+ ret = mLib->avcodec_send_packet(mCodecContext, &packet);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ bytesConsumed = packet.size;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF):
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ default:
-+ NS_WARNING("FFmpeg audio decoder error.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-+ RESULT_DETAIL("FFmpeg audio error"));
-+ }
-+#endif
-
- if (decoded) {
- if (mFrame->format != AV_SAMPLE_FMT_FLT &&
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -39,6 +39,9 @@
- # define AV_PIX_FMT_YUV444P10LE PIX_FMT_YUV444P10LE
- # define AV_PIX_FMT_NONE PIX_FMT_NONE
- #endif
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+# define AV_PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI
-+#endif
- #include "mozilla/PodOperations.h"
- #include "mozilla/StaticPrefs_media.h"
- #include "mozilla/TaskQueue.h"
-@@ -766,6 +769,14 @@
- }
- #endif
-
-+static int64_t GetFramePts(AVFrame* aFrame) {
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+ return aFrame->pts;
-+#else
-+ return aFrame->pkt_pts;
-+#endif
-+}
-+
- MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- MediaRawData* aSample, uint8_t* aData, int aSize, bool* aGotFrame,
- MediaDataDecoder::DecodedData& aResults) {
-@@ -831,7 +842,7 @@
- MediaResult rv;
- # ifdef MOZ_WAYLAND_USE_VAAPI
- if (IsHardwareAccelerated()) {
-- rv = CreateImageVAAPI(mFrame->pkt_pos, mFrame->pkt_pts,
-+ rv = CreateImageVAAPI(mFrame->pkt_pos, GetFramePts(mFrame),
- mFrame->pkt_duration, aResults);
- // If VA-API playback failed, just quit. Decoder is going to be restarted
- // without VA-API.
-@@ -844,8 +855,8 @@
- } else
- # endif
- {
-- rv = CreateImage(mFrame->pkt_pos, mFrame->pkt_pts, mFrame->pkt_duration,
-- aResults);
-+ rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame),
-+ mFrame->pkt_duration, aResults);
- }
- if (NS_FAILED(rv)) {
- return rv;
-@@ -879,9 +890,9 @@
- "DoDecodeFrame:decode_video: rv=%d decoded=%d "
- "(Input: pts(%" PRId64 ") dts(%" PRId64 ") Output: pts(%" PRId64
- ") "
-- "opaque(%" PRId64 ") pkt_pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
-+ "opaque(%" PRId64 ") pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
- bytesConsumed, decoded, packet.pts, packet.dts, mFrame->pts,
-- mFrame->reordered_opaque, mFrame->pkt_pts, mFrame->pkt_dts);
-+ mFrame->reordered_opaque, mFrame->pts, mFrame->pkt_dts);
-
- if (bytesConsumed < 0) {
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-@@ -896,7 +907,8 @@
- }
-
- // If we've decoded a frame then we need to output it
-- int64_t pts = mPtsContext.GuessCorrectPts(mFrame->pkt_pts, mFrame->pkt_dts);
-+ int64_t pts =
-+ mPtsContext.GuessCorrectPts(GetFramePts(mFrame), mFrame->pkt_dts);
- // Retrieve duration from dts.
- // We use the first entry found matching this dts (this is done to
- // handle damaged file with multiple frames with the same dts)
-
diff --git a/D139703.diff b/D139703.diff
deleted file mode 100644
index 4c929fd..0000000
--- a/D139703.diff
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -10,6 +10,7 @@
-
- is_64bit = "JS_64BIT" in buildconfig.defines
- cpu_arch = buildconfig.substs["CPU_ARCH"]
-+is_gcc = buildconfig.substs["CC_TYPE"] == "gcc"
-
-
- def fmt_insn(s):
-@@ -19,21 +20,21 @@
- def gen_seqcst(fun_name):
- if cpu_arch in ("x86", "x86_64"):
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("mfence\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "aarch64":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb ish\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "arm":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb sy\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
-@@ -63,7 +64,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -91,7 +92,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -117,7 +118,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -154,7 +155,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -180,7 +181,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -204,7 +205,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -235,7 +236,7 @@
- assert size == 64
- insns += fmt_insn("xchgq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+r" (val)
- : [addr] "r" (addr)
-@@ -266,7 +267,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -297,7 +298,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -321,7 +322,7 @@
- # Use a +A constraint to load `oldval` into EDX:EAX as input/output.
- # `newval` is loaded into ECX:EBX.
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile ("lock; cmpxchg8b (%%[addr])\n\t"
-@@ -337,7 +338,7 @@
- }
- if cpu_arch == "arm" and size == 64:
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- uint32_t oldval0 = oldval & 0xffff'ffff;
-@@ -380,7 +381,7 @@
- assert size == 64
- insns += fmt_insn("lock; cmpxchgq %[newval], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile (%(insns)s
-@@ -425,7 +426,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("1: dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -466,7 +467,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("1: dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -501,7 +502,7 @@
- assert size == 64
- insns += fmt_insn("lock; xaddq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+&r" (val)
- : [addr] "r" (addr)
-@@ -539,7 +540,7 @@
- insns = insns.replace("OP", op)
- insns += fmt_insn("jnz 0b")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res, scratch;
- asm volatile (%(insns)s
- : [res] "=&a" (res), [scratch] "=&r" (scratch)
-@@ -581,7 +582,7 @@
- insns += fmt_insn("cbnz %w[scratch2], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -621,7 +622,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -681,7 +682,7 @@
- offset -= 1
-
- return """
-- inline void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
-+ INLINE_ATTR void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
- %(cpp_type)s* dst_ = reinterpret_cast<%(cpp_type)s*>(dst);
- const %(cpp_type)s* src_ = reinterpret_cast<const %(cpp_type)s*>(src);
- %(cpp_type)s scratch;
-@@ -853,6 +854,13 @@
- "constexpr size_t JS_GENERATED_ATOMICS_WORDSIZE = " + str(wordsize) + ";\n"
- )
-
-+ # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
-+ # See bug 1756347.
-+ if is_gcc and cpu_arch == "x86":
-+ contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline")
-+ else:
-+ contents = contents.replace("INLINE_ATTR", "inline")
-+
- c_out.write(
- HEADER_TEMPLATE
- % {
-
diff --git a/D139704.diff b/D139704.diff
deleted file mode 100644
index ab1ea42..0000000
--- a/D139704.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -666,12 +666,12 @@
- insns += fmt_insn("str %x[scratch], [%x[dst], OFFSET]")
- elif cpu_arch == "arm":
- if size == 1:
-- insns += fmt_insn("ldrb %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("strb %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldrb %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("strb %[scratch], [%[dst], #OFFSET]")
- else:
- assert size == 4
-- insns += fmt_insn("ldr %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("str %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldr %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("str %[scratch], [%[dst], #OFFSET]")
- else:
- raise Exception("Unexpected arch")
- insns = insns.replace("OFFSET", str(offset * size))
-
diff --git a/D142257.diff b/D142257.diff
new file mode 100644
index 0000000..5779e41
--- /dev/null
+++ b/D142257.diff
@@ -0,0 +1,313 @@
+diff -up firefox-99.0/gfx/gl/GLContextEGL.h.D142257 firefox-99.0/gfx/gl/GLContextEGL.h
+--- firefox-99.0/gfx/gl/GLContextEGL.h.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextEGL.h 2022-04-06 10:32:53.287145554 +0200
+@@ -21,11 +21,9 @@ class CompositorWidget;
+ } // namespace widget
+ namespace gl {
+
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId);
+-
+ inline std::shared_ptr<EglDisplay> DefaultEglDisplay(
+ nsACString* const out_failureId) {
+- const auto lib = DefaultEglLibrary(out_failureId);
++ const auto lib = GLLibraryEGL::Get(out_failureId);
+ if (!lib) {
+ return nullptr;
+ }
+diff -up firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 firefox-99.0/gfx/gl/GLContextProviderEGL.cpp
+--- firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextProviderEGL.cpp 2022-04-06 10:34:20.468017966 +0200
+@@ -237,7 +237,7 @@ class GLContextEGLFactory {
+ already_AddRefed<GLContext> GLContextEGLFactory::CreateImpl(
+ EGLNativeWindowType aWindow, bool aHardwareWebRender, bool aUseGles) {
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ gfxCriticalNote << "Failed[3] to load EGL library: " << failureId.get();
+ return nullptr;
+@@ -1209,32 +1209,8 @@ already_AddRefed<GLContext> GLContextPro
+ /*static*/
+ GLContext* GLContextProviderEGL::GetGlobalContext() { return nullptr; }
+
+-// -
+-
+-static StaticMutex sMutex;
+-static StaticRefPtr<GLLibraryEGL> gDefaultEglLibrary;
+-
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId) {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- gDefaultEglLibrary = GLLibraryEGL::Create(out_failureId);
+- if (!gDefaultEglLibrary) {
+- NS_WARNING("GLLibraryEGL::Create failed");
+- }
+- }
+- return gDefaultEglLibrary.get();
+-}
+-
+-// -
+-
+ /*static*/
+-void GLContextProviderEGL::Shutdown() {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- return;
+- }
+- gDefaultEglLibrary = nullptr;
+-}
++void GLContextProviderEGL::Shutdown() { GLLibraryEGL::Shutdown(); }
+
+ } /* namespace gl */
+ } /* namespace mozilla */
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.cpp
+--- firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -48,6 +48,9 @@
+ namespace mozilla {
+ namespace gl {
+
++StaticMutex GLLibraryEGL::sMutex;
++StaticRefPtr<GLLibraryEGL> GLLibraryEGL::sInstance;
++
+ // should match the order of EGLExtensions, and be null-terminated.
+ static const char* sEGLLibraryExtensionNames[] = {
+ "EGL_ANDROID_get_native_client_buffer", "EGL_ANGLE_device_creation",
+@@ -140,15 +143,17 @@ static PRLibrary* LoadLibraryForEGLOnWin
+
+ #endif // XP_WIN
+
+-static std::shared_ptr<EglDisplay> GetAndInitDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const auto display = egl.fGetDisplay(displayType);
+ if (!display) return nullptr;
+- return EglDisplay::Create(egl, display, false);
++ return EglDisplay::Create(egl, display, false, aProofOfLock);
+ }
+
+-static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const EGLAttrib attrib_list[] = {
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
+@@ -167,11 +172,12 @@ static std::shared_ptr<EglDisplay> GetAn
+ return nullptr;
+ }
+
+- return EglDisplay::Create(egl, display, true);
++ return EglDisplay::Create(egl, display, true, aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ ID3D11Device* const d3d11Device) {
++ StaticMutexAutoLock lock(sMutex);
+ EGLDeviceEXT eglDevice =
+ fCreateDeviceANGLE(LOCAL_EGL_D3D11_DEVICE_ANGLE, d3d11Device, nullptr);
+ if (!eglDevice) {
+@@ -199,7 +205,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ return nullptr;
+ }
+
+- const auto ret = EglDisplay::Create(*this, display, false);
++ const auto ret = EglDisplay::Create(*this, display, false, lock);
+
+ if (!ret) {
+ const EGLint err = fGetError();
+@@ -263,7 +269,8 @@ class AngleErrorReporting {
+ AngleErrorReporting gAngleErrorReporter;
+
+ static std::shared_ptr<EglDisplay> GetAndInitDisplayForAccelANGLE(
+- GLLibraryEGL& egl, nsACString* const out_failureId) {
++ GLLibraryEGL& egl, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ gfx::FeatureState& d3d11ANGLE =
+ gfx::gfxConfig::GetFeature(gfx::Feature::D3D11_HW_ANGLE);
+
+@@ -285,16 +292,18 @@ static std::shared_ptr<EglDisplay> GetAn
+ });
+
+ if (gfx::gfxConfig::IsForcedOnByUser(gfx::Feature::D3D11_HW_ANGLE)) {
+- return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE);
++ return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> ret;
+ if (d3d11ANGLE.IsEnabled()) {
+- ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
++ ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ if (!ret) {
+- ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ }
+
+ if (!ret && out_failureId->IsEmpty()) {
+@@ -326,12 +335,20 @@ Maybe<SymbolLoader> GLLibraryEGL::GetSym
+ // -
+
+ /* static */
+-RefPtr<GLLibraryEGL> GLLibraryEGL::Create(nsACString* const out_failureId) {
+- RefPtr<GLLibraryEGL> ret = new GLLibraryEGL;
+- if (!ret->Init(out_failureId)) {
+- return nullptr;
++RefPtr<GLLibraryEGL> GLLibraryEGL::Get(nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ if (!sInstance) {
++ sInstance = new GLLibraryEGL;
++ if (NS_WARN_IF(!sInstance->Init(out_failureId))) {
++ sInstance = nullptr;
++ }
+ }
+- return ret;
++ return sInstance;
++}
++
++/* static */ void GLLibraryEGL::Shutdown() {
++ StaticMutexAutoLock lock(sMutex);
++ sInstance = nullptr;
+ }
+
+ bool GLLibraryEGL::Init(nsACString* const out_failureId) {
+@@ -640,9 +657,9 @@ static void MarkExtensions(const char* r
+ // -
+
+ // static
+-std::shared_ptr<EglDisplay> EglDisplay::Create(GLLibraryEGL& lib,
+- const EGLDisplay display,
+- const bool isWarp) {
++std::shared_ptr<EglDisplay> EglDisplay::Create(
++ GLLibraryEGL& lib, const EGLDisplay display, const bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock) {
+ // Retrieve the EglDisplay if it already exists
+ {
+ const auto itr = lib.mActiveDisplays.find(display);
+@@ -710,6 +727,7 @@ EglDisplay::EglDisplay(const PrivateUseO
+ }
+
+ EglDisplay::~EglDisplay() {
++ StaticMutexAutoLock lock(GLLibraryEGL::sMutex);
+ fTerminate();
+ mLib->mActiveDisplays.erase(mDisplay);
+ }
+@@ -718,16 +736,24 @@ EglDisplay::~EglDisplay() {
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::DefaultDisplay(
+ nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
+ auto ret = mDefaultDisplay.lock();
+ if (ret) return ret;
+
+- ret = CreateDisplay(false, out_failureId);
++ ret = CreateDisplayLocked(false, out_failureId, lock);
+ mDefaultDisplay = ret;
+ return ret;
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ const bool forceAccel, nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ return CreateDisplayLocked(forceAccel, out_failureId, lock);
++}
++
++std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplayLocked(
++ const bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ std::shared_ptr<EglDisplay> ret;
+
+ if (IsExtensionSupported(EGLLibExtension::ANGLE_platform_angle_d3d)) {
+@@ -747,7 +773,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Hardware accelerated ANGLE path (supported or force accel)
+ if (shouldTryAccel) {
+- ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId);
++ ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId, aProofOfLock);
+ }
+
+ // Report the acceleration status to telemetry
+@@ -766,7 +792,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Fallback to a WARP display if ANGLE fails, or if WARP is forced
+ if (!ret && shouldTryWARP) {
+- ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ if (!ret) {
+ if (out_failureId->IsEmpty()) {
+ *out_failureId = "FEATURE_FAILURE_WARP_FALLBACK"_ns;
+@@ -788,7 +814,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ }
+ }
+ #endif
+- ret = GetAndInitDisplay(*this, nativeDisplay);
++ ret = GetAndInitDisplay(*this, nativeDisplay, aProofOfLock);
+ }
+
+ if (!ret) {
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.h
+--- firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.h 2022-04-06 10:32:53.288145587 +0200
+@@ -13,6 +13,8 @@
+ #include "mozilla/EnumTypeTraits.h"
+ #include "mozilla/Maybe.h"
+ #include "mozilla/RefPtr.h"
++#include "mozilla/StaticMutex.h"
++#include "mozilla/StaticPtr.h"
+ #include "nsISupports.h"
+ #include "prlink.h"
+
+@@ -125,14 +127,22 @@ class GLLibraryEGL final {
+ std::unordered_map<EGLDisplay, std::weak_ptr<EglDisplay>> mActiveDisplays;
+
+ public:
+- static RefPtr<GLLibraryEGL> Create(nsACString* const out_failureId);
++ static RefPtr<GLLibraryEGL> Get(nsACString* const out_failureId);
++ static void Shutdown();
+
+ private:
+ ~GLLibraryEGL() = default;
+
++ static StaticMutex sMutex;
++ static StaticRefPtr<GLLibraryEGL> sInstance GUARDED_BY(sMutex);
++
+ bool Init(nsACString* const out_failureId);
+ void InitLibExtensions();
+
++ std::shared_ptr<EglDisplay> CreateDisplayLocked(
++ bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock);
++
+ public:
+ Maybe<SymbolLoader> GetSymbolLoader() const;
+
+@@ -599,8 +609,9 @@ class EglDisplay final {
+ struct PrivateUseOnly final {};
+
+ public:
+- static std::shared_ptr<EglDisplay> Create(GLLibraryEGL&, EGLDisplay,
+- bool isWarp);
++ static std::shared_ptr<EglDisplay> Create(
++ GLLibraryEGL&, EGLDisplay, bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock);
+
+ // Only `public` for make_shared.
+ EglDisplay(const PrivateUseOnly&, GLLibraryEGL&, EGLDisplay, bool isWarp);
+diff -up firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 firefox-99.0/gfx/webrender_bindings/RenderThread.cpp
+--- firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 2022-03-31 01:24:51.000000000 +0200
++++ firefox-99.0/gfx/webrender_bindings/RenderThread.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -1163,7 +1163,7 @@ static already_AddRefed<gl::GLContext> C
+ }
+
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = gl::GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ aError.Assign(
+ nsPrintfCString("RcANGLE(load EGL lib failed: %s)", failureId.get()));
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
deleted file mode 100644
index 3ecdbed..0000000
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:27:07.808429721 +0200
-@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
- CreateAndStartupPDM<AppleDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled() &&
-- StaticPrefs::media_rdd_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled() &&
-+ StaticPrefs::media_rdd_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- CreateAndStartupPDM<AgnosticDecoderModule>();
- }
-
-@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
-@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
diff --git a/firefox.spec b/firefox.spec
index abb7a07..238bca8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -126,7 +126,7 @@ ExcludeArch: aarch64
%if %{?system_nss}
%global nspr_version 4.26
%global nspr_build_version %{nspr_version}
-%global nss_version 3.74
+%global nss_version 3.76
%global nss_build_version %{nss_version}
%endif
@@ -162,7 +162,7 @@ ExcludeArch: aarch64
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 98.0.2
+Version: 99.0
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -214,16 +214,8 @@ Patch49: build-arm-libaom.patch
Patch53: firefox-gcc-build.patch
Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
-Patch57: firefox-disable-ffvpx-with-vapi.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-#Patch64: mozilla-1753402.patch
-# GCC12 build fixes
-Patch65: D139022.diff
-Patch66: D139078.diff
-Patch67: D139088.diff
-Patch68: D139703.diff
-Patch69: D139704.diff
Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
@@ -250,11 +242,7 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch
-# ffmpeg50
-Patch500: D139696.diff
-Patch501: D139697.diff
-Patch502: D139698.diff
-Patch503: D139699.diff
+Patch416: D142257.diff
# PGO/LTO patches
Patch600: pgo.patch
@@ -471,14 +459,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-#%patch55 -p1 -b .testing
-%patch57 -p1 -b .ffvpx-with-vapi
-#%patch64 -p1 -b .1753402
-%patch65 -p1 -b .D139022
-%patch66 -p1 -b .D139078
-%patch67 -p1 -b .D139088
-%patch68 -p1 -b .D139703
-%patch69 -p1 -b .D139704
%ifarch aarch64
%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
%endif
@@ -505,14 +485,7 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333
-
-# ffmpeg50
-%ifnarch ppc64le
-%patch500 -p1 -b .D139696
-%patch501 -p1 -b .D139697
-%patch502 -p1 -b .D139698
-%patch503 -p1 -b .D139699
-%endif
+%patch416 -p1 -b .D142257
# PGO patches
%if %{build_with_pgo}
@@ -1079,6 +1052,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Apr 6 2022 Martin Stransky <stransky(a)redhat.com> - 99.0-1
+- Updated to 99.0
+
* Thu Mar 31 2022 Martin Stransky <stransky(a)redhat.com> - 98.0.2-1
- Updated to 98.0.2
diff --git a/mozilla-1670333.patch b/mozilla-1670333.patch
index 19e64c0..1c5c476 100644
--- a/mozilla-1670333.patch
+++ b/mozilla-1670333.patch
@@ -1,6 +1,6 @@
-diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/media/mp4/MP4Demuxer.cpp
---- firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/mp4/MP4Demuxer.cpp 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp 2022-04-04 09:58:35.606351546 +0200
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
__func__, ##__VA_ARGS__)
@@ -23,9 +23,9 @@ diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/medi
if (sample->mKeyframe != keyframe) {
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
"@ pts:%" PRId64 " dur:%" PRId64
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 2021-04-19 13:36:44.087761790 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:39:52.676433734 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.cpp 2022-04-04 10:09:57.383419125 +0200
@@ -58,6 +58,8 @@
#include <functional>
@@ -35,22 +35,16 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
namespace mozilla {
#define PDM_INIT_LOG(msg, ...) \
-@@ -572,10 +574,10 @@ void PDMFactory::CreateDefaultPDMs() {
- }
- #endif
+@@ -495,7 +497,7 @@ void PDMFactory::CreateRddPDMs() {
#ifdef MOZ_FFMPEG
-- if (StaticPrefs::media_ffmpeg_enabled() &&
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ StaticPrefs::media_rdd_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
-- FFmpegRuntimeLinker::LinkStatusCode());
-+ if (StaticPrefs::media_ffmpeg_enabled()) {
-+ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
-+ if (!mFFmpegUsed) {
-+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(FFmpegRuntimeLinker::LinkStatusCode()); }
++ !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+ FFmpegRuntimeLinker::LinkStatusCode());
}
- #endif
- #ifdef MOZ_FFVPX
-@@ -592,8 +594,9 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
CreateAndStartupPDM<AgnosticDecoderModule>();
@@ -61,9 +55,9 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
}
}
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 firefox-88.0/dom/media/platforms/PDMFactory.h
---- firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.h 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
+--- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.h 2022-04-04 09:58:35.606351546 +0200
@@ -121,6 +121,7 @@ class PDMFactory final {
RefPtr<PlatformDecoderModule> mNullPDM;
diff --git a/pgo.patch b/pgo.patch
index e7e715b..eec103c 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,7 +1,7 @@
-diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/build/moz.configure/lto-pgo.configure
---- firefox-96.0/build/moz.configure/lto-pgo.configure.pgo 2022-01-06 19:32:35.000000000 +0100
-+++ firefox-96.0/build/moz.configure/lto-pgo.configure 2022-01-11 15:43:02.193378698 +0100
-@@ -248,8 +248,8 @@ def lto(
+diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
+--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/moz.configure/lto-pgo.configure 2022-04-04 10:15:45.387694143 +0200
+@@ -247,8 +247,8 @@ def lto(
cflags.append("-flto")
ldflags.append("-flto")
else:
@@ -12,7 +12,7 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
if target.os == "Android" and value == "cross":
# Work around https://github.com/rust-lang/rust/issues/90088
-@@ -265,7 +265,7 @@ def lto(
+@@ -264,7 +264,7 @@ def lto(
if value == "full":
cflags.append("-flto")
else:
@@ -21,9 +21,9 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
# AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
cflags.append("-fuse-ld=lld")
-diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/profileserver.py
---- firefox-96.0/build/pgo/profileserver.py.pgo 2022-01-06 16:56:23.000000000 +0100
-+++ firefox-96.0/build/pgo/profileserver.py 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
+--- firefox-99.0/build/pgo/profileserver.py.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/pgo/profileserver.py 2022-04-04 10:15:45.387694143 +0200
@@ -11,7 +11,7 @@ import glob
import subprocess
@@ -70,9 +70,9 @@ diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/prof
llvm_profdata = env.get("LLVM_PROFDATA")
if llvm_profdata:
profraw_files = glob.glob("*.profraw")
-diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozconfig.unix
---- firefox-96.0/build/unix/mozconfig.unix.pgo 2022-01-06 16:56:24.000000000 +0100
-+++ firefox-96.0/build/unix/mozconfig.unix 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
+--- firefox-99.0/build/unix/mozconfig.unix.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/unix/mozconfig.unix 2022-04-04 10:15:45.387694143 +0200
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -89,18 +89,18 @@ diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozc
# We want to make sure we use binutils and other binaries in the tooltool
# package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-96.0/extensions/spellcheck/src/moz.build.pgo firefox-96.0/extensions/spellcheck/src/moz.build
---- firefox-96.0/extensions/spellcheck/src/moz.build.pgo 2022-01-11 15:43:02.193378698 +0100
-+++ firefox-96.0/extensions/spellcheck/src/moz.build 2022-01-11 15:49:52.929362701 +0100
+diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
+--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/extensions/spellcheck/src/moz.build 2022-04-04 10:15:45.387694143 +0200
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
"mozInlineSpellChecker.h",
"mozSpellChecker.h",
]
+
+CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-96.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-01-06 16:58:15.000000000 +0100
-+++ firefox-96.0/toolkit/components/terminator/nsTerminator.cpp 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-04-04 10:15:45.387694143 +0200
++++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp 2022-04-04 10:19:07.022239556 +0200
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
}
#endif
@@ -111,5 +111,5 @@ diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox
+ crashAfterMS = INT32_MAX;
+
UniquePtr<Options> options(new Options());
- const PRIntervalTime ticksDuration =
- PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
+ // crashAfterTicks is guaranteed to be > 0 as
+ // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
diff --git a/sources b/sources
index 67b7300..302967c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520
SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2
-SHA512 (firefox-98.0.2.source.tar.xz) = b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e
-SHA512 (firefox-langpacks-98.0.2-20220331.tar.xz) = eba580d5dcef421f2a4e3be62a2fdf0788328cc065ae8019062e5d524f5d49b15709892e5846b9fa63148278983c8e627ad85d8a4656502c9f6543474bb94bc6
+SHA512 (firefox-99.0.source.tar.xz) = 08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c
+SHA512 (firefox-langpacks-99.0-20220331.tar.xz) = 9ab5d8989644da67cacfe729c13309ed4f42b654b9b9113bcdb7155b59fcb12fc816de8a3fdea709c9d91f2d5b168eebec5ada6f7637e111ea374adc9eb9c984
2 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=c7aece4788...
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=35a5afbafa....
Change:
-%ifarch aarch64
-%ifnarch ppc64le
Thanks.
Full change:
============
commit c7aece478831dbb673b452b9a73c43f62a5efabc
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:55:42 2022 +0200
removed aarch64 unused patch
diff --git a/crossbeam-downgrade-rhbz2063961.patch b/crossbeam-downgrade-rhbz2063961.patch
deleted file mode 100644
index 428c3ec..0000000
--- a/crossbeam-downgrade-rhbz2063961.patch
+++ /dev/null
@@ -1,5110 +0,0 @@
-diff -up firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/Cargo.lock
---- firefox-98.0/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 01:15:33.000000000 +0100
-+++ firefox-98.0/Cargo.lock 2022-03-16 09:35:09.020396771 +0100
-@@ -65,9 +65,9 @@ dependencies = [
-
- [[package]]
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
-+checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
-
- [[package]]
- name = "app_services_logger"
-@@ -148,9 +148,9 @@ source = "git+https://github.com/smol-rs
-
- [[package]]
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
-+checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
- dependencies = [
- "proc-macro2",
- "quote",
-@@ -443,9 +443,9 @@ dependencies = [
-
- [[package]]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"
-+checksum = "9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"
- dependencies = [
- "cfg-if 1.0.0",
- ]
-@@ -482,7 +482,7 @@ version = "0.1.0"
- dependencies = [
- "bits_client",
- "comedy",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "libc",
- "log",
- "moz_task",
-@@ -493,9 +493,9 @@ dependencies = [
-
- [[package]]
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-+checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
- dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
-@@ -553,16 +553,16 @@ version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "jobserver",
- "num_cpus",
- ]
-
- [[package]]
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
-
- [[package]]
- name = "byte-tools"
-@@ -600,9 +600,9 @@ checksum = "c4872d67bab6358e59559027aa3b
-
- [[package]]
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
-
- [[package]]
- name = "cascade_bloom_filter"
-@@ -628,7 +628,7 @@ version = "0.0.1"
- dependencies = [
- "base64 0.10.1",
- "byteorder",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "log",
- "malloc_size_of_derive",
-@@ -977,12 +977,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
-+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1003,8 +1003,8 @@ source = "registry+https://github.com/ru
- checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-epoch 0.9.6",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-epoch 0.9.5",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -1024,12 +1024,12 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
-+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
- dependencies = [
- "cfg-if 1.0.0",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "memoffset 0.6.5",
- "scopeguard",
-@@ -1067,9 +1067,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-@@ -2728,7 +2728,7 @@ name = "kvstore"
- version = "0.1.0"
- dependencies = [
- "atomic_refcell",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "lazy_static",
- "libc",
-@@ -4216,7 +4216,7 @@ checksum = "d78120e2c850279833f1dd3582f7
- dependencies = [
- "crossbeam-channel",
- "crossbeam-deque 0.8.1",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "lazy_static",
- "num_cpus",
- ]
-@@ -4400,7 +4400,7 @@ dependencies = [
- "base64 0.13.0",
- "blake2b_simd",
- "constant_time_eq",
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- ]
-
- [[package]]
-@@ -6020,7 +6020,7 @@ dependencies = [
- name = "xulstore"
- version = "0.1.0"
- dependencies = [
-- "crossbeam-utils 0.8.6",
-+ "crossbeam-utils 0.8.5",
- "cstr",
- "libc",
- "log",
-diff -up firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json
---- firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/.cargo-checksum.json 2022-03-16 09:33:31.989159760 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"ce2fb7f23073f4f0bd58bae44baab86fa6c3d3595f32d28b410ec52394b3f64c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"5a60bd1fe1717c044c7ab34c062ce6651c0cb08596a5878e391c2755ecac07f9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"330286a28b4d4da255db38bc267da17fb03f2333ea26684f82124973ffcaea43","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"f8bc5174219da947e6292891864f35307d5c400fd5690f51d574edaa5e39b8a4","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"5e3414ce23940106f95102f85e643cb5bed5e8ed9027557963c728d5f46d5586","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"a1a52f9874f0aa1382fb404f029c6fa88e53afe38fb2417877d5711f1f2b90c9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"f39d4684ce6ce473b585d2f9bc8b7a355cf28e5b5c936431d8072ac5c4fe94fd","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"382956f4bd3dcd1f6036efb8f11193595a7c60e0a5dbf5f2da149f1f25183abf","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"45331ef18c4c69acf4b80f5f55d2cefb55cc82f00e854b81d54c3df36a639003","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/Cargo.toml
---- firefox-98.0/third_party/rust/anyhow/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/Cargo.toml 2022-03-16 09:33:31.989159760 +0100
-@@ -13,7 +13,7 @@
- edition = "2018"
- rust-version = "1.38"
- name = "anyhow"
--version = "1.0.52"
-+version = "1.0.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Flexible concrete Error type built on std::error::Error"
- documentation = "https://docs.rs/anyhow"
-@@ -32,7 +32,7 @@ version = "0.3"
- default-features = false
-
- [dev-dependencies.rustversion]
--version = "1.0.6"
-+version = "1.0"
-
- [dev-dependencies.syn]
- version = "1.0"
-diff -up firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/backtrace.rs
---- firefox-98.0/third_party/rust/anyhow/src/backtrace.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/backtrace.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -182,7 +182,7 @@ mod capture {
- impl Backtrace {
- fn enabled() -> bool {
- static ENABLED: AtomicUsize = AtomicUsize::new(0);
-- match ENABLED.load(Ordering::Relaxed) {
-+ match ENABLED.load(Ordering::SeqCst) {
- 0 => {}
- 1 => return false,
- _ => return true,
-@@ -194,7 +194,7 @@ mod capture {
- None => false,
- },
- };
-- ENABLED.store(enabled as usize + 1, Ordering::Relaxed);
-+ ENABLED.store(enabled as usize + 1, Ordering::SeqCst);
- enabled
- }
-
-diff -up firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/src/lib.rs
---- firefox-98.0/third_party/rust/anyhow/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/src/lib.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -210,7 +210,7 @@
- //! will require an explicit `.map_err(Error::msg)` when working with a
- //! non-Anyhow error type inside a function that returns Anyhow's error type.
-
--#![doc(html_root_url = "https://docs.rs/anyhow/1.0.52")]
-+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.51")]
- #![cfg_attr(backtrace, feature(backtrace))]
- #![cfg_attr(doc_cfg, feature(doc_cfg))]
- #![cfg_attr(not(feature = "std"), no_std)]
-@@ -225,7 +225,6 @@
- clippy::needless_doctest_main,
- clippy::new_ret_no_self,
- clippy::redundant_else,
-- clippy::return_self_not_must_use,
- clippy::unused_self,
- clippy::used_underscore_binding,
- clippy::wildcard_imports,
-diff -up firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs
---- firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/drop/mod.rs 2022-03-16 09:33:31.989159760 +0100
-@@ -2,7 +2,8 @@
-
- use std::error::Error as StdError;
- use std::fmt::{self, Display};
--use std::sync::atomic::{AtomicBool, Ordering};
-+use std::sync::atomic::AtomicBool;
-+use std::sync::atomic::Ordering::SeqCst;
- use std::sync::Arc;
-
- #[derive(Debug)]
-@@ -18,7 +19,7 @@ impl Flag {
- }
-
- pub fn get(&self) -> bool {
-- self.atomic.load(Ordering::Relaxed)
-+ self.atomic.load(SeqCst)
- }
- }
-
-@@ -47,7 +48,7 @@ impl Display for DetectDrop {
-
- impl Drop for DetectDrop {
- fn drop(&mut self) {
-- let already_dropped = self.has_dropped.atomic.swap(true, Ordering::Relaxed);
-+ let already_dropped = self.has_dropped.atomic.swap(true, SeqCst);
- assert!(!already_dropped);
- }
- }
-diff -up firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs
---- firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/anyhow/tests/test_ensure.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -5,7 +5,6 @@
- clippy::items_after_statements,
- clippy::let_and_return,
- clippy::let_underscore_drop,
-- clippy::logic_bug,
- clippy::match_bool,
- clippy::never_loop,
- clippy::redundant_closure_call,
-@@ -46,15 +45,13 @@ impl<T> Trait for T {}
- fn assert_err<T: Debug>(result: impl FnOnce() -> Result<T>, expected: &'static str) {
- let actual = result().unwrap_err().to_string();
-
-- // In general different rustc versions will format the interpolated lhs and
-- // rhs $:expr fragment with insignificant differences in whitespace or
-- // punctuation, so we check the message in full against nightly and do just
-- // a cursory test on older toolchains.
-- if rustversion::cfg!(nightly) && !cfg!(miri) {
-- assert_eq!(actual, expected);
-- } else {
-- assert_eq!(actual.contains(" vs "), expected.contains(" vs "));
-+ let mut accepted_alternatives = expected.split('\n');
-+ let expected = accepted_alternatives.next_back().unwrap();
-+ if accepted_alternatives.any(|alternative| actual == alternative) {
-+ return;
- }
-+
-+ assert_eq!(actual, expected);
- }
-
- #[test]
-@@ -101,7 +98,7 @@ fn test_low_precedence_binary_operator()
- let test = || Ok(ensure!(while false == true && false {} < ()));
- assert_err(
- test,
-- "Condition failed: `while false == true && false {} < ()` (() vs ())",
-+ "Condition failed: `while false == true && false { } < ()` (() vs ())",
- );
- }
-
-@@ -148,41 +145,41 @@ fn test_unary() {
- fn test_if() {
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {}.t(1) == 2));
-- assert_err(test, "Condition failed: `if false {}.t(1) == 2` (1 vs 2)");
-+ assert_err(test, "Condition failed: `if false { }.t(1) == 2` (1 vs 2)");
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if false {} else if false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if false {} else if false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if false { } else if false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -192,49 +189,53 @@ fn test_loop() {
- let test = || Ok(ensure!(1 + loop { break 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(1 + 'a: loop { break 'a 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
-+ // 1.54 puts a double space after loop
-+ "Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)\n\
-+ Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while false {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while false {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while false { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(while let None = Some(1) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `while let None = Some(1) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `while let None = Some(1) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
- );
-
- #[rustfmt::skip]
- let test = || Ok(ensure!(for true | false in iter::empty() {}.t(1) == 2));
- assert_err(
- test,
-- "Condition failed: `for true | false in iter::empty() {}.t(1) == 2` (1 vs 2)",
-+ "Condition failed: `for true | false in iter::empty() { }.t(1) == 2` (1 vs 2)",
- );
- }
-
-@@ -263,13 +264,13 @@ fn test_atom() {
- let test = || Ok(ensure!(S + async { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async { 1 } == true` (false vs true)",
- );
-
- let test = || Ok(ensure!(S + async move { 1 } == true));
- assert_err(
- test,
-- "Condition failed: `S + async move { 1 } == true` (false vs true)",
-+ "Condition failed: `S + async move { 1 } == true` (false vs true)",
- );
-
- let x = &1;
-@@ -380,7 +381,7 @@ fn test_macro() {
- let test = || Ok(ensure!(stringify! {} != ""));
- assert_err(
- test,
-- "Condition failed: `stringify! {} != \"\"` (\"\" vs \"\")",
-+ "Condition failed: `stringify! { } != \"\"` (\"\" vs \"\")",
- );
- }
-
-@@ -528,7 +529,7 @@ fn test_as() {
- let test = || Ok(ensure!(f as for<'a> fn() as usize * 0 != 0));
- assert_err(
- test,
-- "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)", // FIXME
-+ "Condition failed: `f as for<'a>fn() as usize * 0 != 0` (0 vs 0)",
- );
-
- let test = || Ok(ensure!(f as unsafe fn() as usize * 0 != 0));
-@@ -613,7 +614,7 @@ fn test_pat() {
- let test = || Ok(ensure!(if let -1..=1 = 0 { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let -1 ..=1 = 0 { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let &0 = &0 { 0 } else { 1 } == 1));
-@@ -656,13 +657,13 @@ fn test_pat() {
- let test = || Ok(ensure!(if let P::<u8> {} = p { 0 } else { 1 } == 1));
- assert_err(
- test,
-- "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)", // FIXME
-+ "Condition failed: `if let P::<u8> { } = p { 0 } else { 1 } == 1` (0 vs 1)",
- );
-
- let test = || Ok(ensure!(if let ::std::marker::PhantomData = p {} != ()));
- assert_err(
- test,
-- "Condition failed: `if let ::std::marker::PhantomData = p {} != ()` (() vs ())",
-+ "Condition failed: `if let ::std::marker::PhantomData = p { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let <S as Trait>::V = 0 { 0 } else { 1 } == 1));
-@@ -674,7 +675,7 @@ fn test_pat() {
- let test = || Ok(ensure!(for _ in iter::once(()) {} != ()));
- assert_err(
- test,
-- "Condition failed: `for _ in iter::once(()) {} != ()` (() vs ())",
-+ "Condition failed: `for _ in iter::once(()) { } != ()` (() vs ())",
- );
-
- let test = || Ok(ensure!(if let stringify!(x) = "x" { 0 } else { 1 } == 1));
-diff -up firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json
---- firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/.cargo-checksum.json 2022-03-16 09:33:31.990159794 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9168c83306a2940b86790578d9d72c23d70bad572bf67ad3def2c8265bd0c270","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"f1002235c33fc292e6784937c2c64d6e7ba105147b9a82126c830d09b86c1059","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"df12d6551ce0a8e3416f83fe92686ab2a22fb0a5dadb45499f531c8822c63c3e","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"1df5569f4615620172affeaa86da629623f32a0bb15f790a10c0837bd9da27e6","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"0f70f0bda0e86a43e6d6f6980f1ef8a1989c3e32db593bd60f920025a25728d5","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"21ce55872b2a6d57077ada797a5c3ae78a3d218570605a7509951b45afa212b3","tests/ui/missing-async-in-impl.rs":"5a5538d08d11c145211a92af0d8973eee8b21f33b90adda85430805bd3dbbc83","tests/ui/missing-async-in-impl.stderr":"2916bc8a51e25f4dd18eaf433b916d533943eac2c1afbee64e9a89e7b928040d","tests/ui/missing-async-in-trait.rs":"dc67241593f270233ba885df92e59164126416e68d49d8d62edc251666b5db6e","tests/ui/missing-async-in-trait.stderr":"67e66e7b19358830deff3ba01f5d701a9ae05c4e6fa9c081c49c1c75efbb7ade","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"e5ee994398bf8294324d61df02467a4229f68f4113bf5acc004851c03d66ec6a","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"cd7bf2fe9023021837b2b3e8cc164ffc18900b01cf704c68cde91edd07d65dc8","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"7865153d1e41ecdfa64b197901e3bda57bcda0c486bbcf11dc6e9837ceb40b29","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"01e6800bcabca87306c72269e38d1eac53ef1e8ad9951a9be052b97aff16364d","tests/ui/unreachable.rs":"be0aa7cc129fe42a1fbd85e36b3f08c6a2bd16c90ed2e33fc4c50e40ce085bcd","tests/ui/unreachable.stderr":"73beb71cb74076f2cb45485271de31658cf59f4143e62daa34b9f2a8980ddfcd","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"64fc5d45cb51330f0a1e85e69a28b69ddda12a109aa6a8ba3eaee1ac58d93b5f"},"package":"061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"fda2e0dc95a93f95edaa7dfdf9b7323593214c1b9e165789cd8b8e6057349ecb","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"b733a7cddbdc409fcd5fb8eff5fe1d5692b6d1e0364568366a69bb1dd68e232c","build.rs":"e2ca6b6c6f18d5d47cb662083856d1399946bc41a272b30231c31ae8317a3ed0","src/args.rs":"6eed5497db91752b3aae597943c39e769f60406b37055304e69e4699f1f87b15","src/expand.rs":"231d1e732f295949939583df7169f49f950317679e7415ee6b5d38b8414f8b7b","src/lib.rs":"51cd49b85c0a7662ef32f30631f1f6a2ce448f18e951725b9d13227b5a596d3e","src/lifetime.rs":"4b94740e2847ef8df128a25d264f0a1bc1d1723ea107fc53849322b98f1e6927","src/parse.rs":"cd9032fe2c6dcf41050b3a59b9fb98eb9700a29bbe2fa011ee2854014c1666b7","src/receiver.rs":"31f5ff929bb6ac061ca3f44d4efac1ca0c60273d54ef8f8f92234a69829dc88d","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/executor/mod.rs":"3cf48614288715f625514a73ae642f649c2635a402a3ad90278bbee116a7234c","tests/test.rs":"8a60ea2181287bfd42bcc73df1d157398f202f60991ec91eb906029e3a1ae88b","tests/ui/bare-trait-object.rs":"4546e8bd6682de11920fa4c768295fed61954484ef0550dfadbc5677b77f29a5","tests/ui/bare-trait-object.stderr":"fd6f80e2cae790f6370c537eaabedb17e9ff06c2b1f056d3d7071ed7f021f831","tests/ui/delimiter-span.rs":"97edf38c804d5e0d4cef6f040dee113d78ff76b08bf8c49586b803caa3ce7f40","tests/ui/delimiter-span.stderr":"f3c32ae57ead984ac985641bd07f50a894b572d6b8b8269556cf606f34d05101","tests/ui/lifetime-span.rs":"263de0b98abd0772fe9dc73ced1a71a3b85efb90d2b208226fe35ab9378c5e5a","tests/ui/lifetime-span.stderr":"1e1cbcbbfded1da0a252666f2077d806d11e16fccea825c7d58805c1d88a9d58","tests/ui/missing-body.rs":"d06c0da8c6044e7c790b924136f167e2edc0d0d3fa01f23521f3f08ca605929b","tests/ui/missing-body.stderr":"636a03cc42933b59d73032ce6cea862e33c16efb9c7fe7f27749247998bc9f23","tests/ui/must-use.rs":"75090c7df984df0996464337f60371d198bd0caf3f9f44b10d1e131f15fd4fca","tests/ui/must-use.stderr":"e6cb190e02f0226df6444065aaca3051f7db8ae599bba18a685155c52bb799b6","tests/ui/self-span.rs":"67ddde05907d7014bfb3f2c63d427b1d72d6c4369a9108a4335dac6bee5832b2","tests/ui/self-span.stderr":"590ba1db336f57133b66b83a576afa6f96f2201147b9c90eea4bdc84b966b19c","tests/ui/send-not-implemented.rs":"affbbe8bc9c3501d3db3a024e06daa9d076f1d142dba290c7aa1ea119daebd19","tests/ui/send-not-implemented.stderr":"63ed733b35b71f29ff0e863d287049e831dd0923978d16f5679ebd4d9d1c6d69","tests/ui/unreachable.rs":"7905c3fd0115753d18d64e12c39f42f3abec7a41b02572ea009c7d93f6d7751d","tests/ui/unreachable.stderr":"1fe3a63e44a99c62c489e1994176f03c2218bf382439bc20f1f12d368fe1558a","tests/ui/unsupported-self.rs":"f7855bc39dab1fd2f533fb2e873a27c3757dcb9fb57001e4b19f58d3dda36d01","tests/ui/unsupported-self.stderr":"be1893e21e626f0f76d16799bf27ad12df304384245462515e1fa63f06a83d80"},"package":"44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/Cargo.toml
---- firefox-98.0/third_party/rust/async-trait/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/Cargo.toml 2022-03-16 09:33:31.990159794 +0100
-@@ -11,9 +11,8 @@
-
- [package]
- edition = "2018"
--rust-version = "1.39"
- name = "async-trait"
--version = "0.1.52"
-+version = "0.1.51"
- authors = ["David Tolnay <dtolnay(a)gmail.com>"]
- description = "Type erasure for async trait methods"
- documentation = "https://docs.rs/async-trait"
-@@ -48,5 +47,5 @@ version = "0.1.14"
- version = "0.1.14"
-
- [dev-dependencies.trybuild]
--version = "1.0.49"
-+version = "1.0.19"
- features = ["diff"]
-diff -up firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/src/expand.rs
---- firefox-98.0/third_party/rust/async-trait/src/expand.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/src/expand.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -125,8 +125,6 @@ fn lint_suppress_with_body() -> Attribut
- parse_quote! {
- #[allow(
- clippy::let_unit_value,
-- clippy::no_effect_underscore_binding,
-- clippy::shadow_same,
- clippy::type_complexity,
- clippy::type_repetition_in_bounds,
- clippy::used_underscore_binding
-diff -up firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/test.rs
---- firefox-98.0/third_party/rust/async-trait/tests/test.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/test.rs 2022-03-16 09:33:31.990159794 +0100
-@@ -6,7 +6,6 @@
- clippy::let_underscore_drop,
- clippy::let_unit_value,
- clippy::missing_panics_doc,
-- clippy::missing_safety_doc,
- clippy::needless_return,
- clippy::trivially_copy_pass_by_ref,
- clippy::unused_async
-@@ -1377,15 +1376,3 @@ pub mod issue169 {
-
- pub fn test(_t: &dyn Trait) {}
- }
--
--// https://github.com/dtolnay/async-trait/issues/183
--pub mod issue183 {
-- #![deny(clippy::shadow_same)]
--
-- use async_trait::async_trait;
--
-- #[async_trait]
-- trait Foo {
-- async fn foo(_n: i32) {}
-- }
--}
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/bare-trait-object.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,13 +1,13 @@
- error: trait objects without an explicit `dyn` are deprecated
-- --> tests/ui/bare-trait-object.rs:11:16
-+ --> $DIR/bare-trait-object.rs:11:16
- |
- 11 | impl Trait for Send + Sync {
- | ^^^^^^^^^^^ help: use `dyn`: `dyn Send + Sync`
- |
- note: the lint level is defined here
-- --> tests/ui/bare-trait-object.rs:1:9
-+ --> $DIR/bare-trait-object.rs:1:9
- |
- 1 | #![deny(bare_trait_objects)]
- | ^^^^^^^^^^^^^^^^^^
- = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
-- = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promot...>
-+ = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/delimiter-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:17:16
-+ --> $DIR/delimiter-span.rs:17:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-@@ -8,7 +8,7 @@ error: no rules expected the token `{`
- | ^ no rules expected this token in macro call
-
- error: no rules expected the token `{`
-- --> tests/ui/delimiter-span.rs:18:16
-+ --> $DIR/delimiter-span.rs:18:16
- |
- 3 | macro_rules! picky {
- | ------------------ when calling this macro
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/lifetime-span.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error[E0726]: implicit elided lifetime not allowed here
-- --> tests/ui/lifetime-span.rs:12:6
-+ --> $DIR/lifetime-span.rs:12:6
- |
- 12 | impl Trait for A {
- | ^^^^^- help: indicate the anonymous lifetime: `<'_>`
-@@ -7,7 +7,7 @@ error[E0726]: implicit elided lifetime n
- = note: assuming a `'static` lifetime...
-
- error[E0107]: this trait takes 0 lifetime arguments but 1 lifetime argument was supplied
-- --> tests/ui/lifetime-span.rs:32:10
-+ --> $DIR/lifetime-span.rs:32:10
- |
- 32 | impl<'r> Trait2<'r> for B {
- | ^^^^^^---- help: remove these generics
-@@ -15,13 +15,13 @@ error[E0107]: this trait takes 0 lifetim
- | expected 0 lifetime arguments
- |
- note: trait defined here, with 0 lifetime parameters
-- --> tests/ui/lifetime-span.rs:22:11
-+ --> $DIR/lifetime-span.rs:22:11
- |
- 22 | pub trait Trait2 {
- | ^^^^^^
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:13:14
-+ --> $DIR/lifetime-span.rs:13:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -30,7 +30,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:18:14
-+ --> $DIR/lifetime-span.rs:18:14
- |
- 8 | async fn method(&'r self);
- | ---------------- lifetimes in impl do not match this method in trait
-@@ -39,7 +39,7 @@ error[E0195]: lifetime parameters or bou
- | ^^^^^^^^^^^^^ lifetimes do not match method in trait
-
- error[E0195]: lifetime parameters or bounds on method `method` do not match the trait declaration
-- --> tests/ui/lifetime-span.rs:33:14
-+ --> $DIR/lifetime-span.rs:33:14
- |
- 23 | async fn method<'r>(&'r self);
- | ---- lifetimes in impl do not match this method in trait
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-impl.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-async-in-trait.stderr
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/missing-body.stderr 2022-03-16 09:33:31.990159794 +0100
-@@ -1,5 +1,5 @@
- error: associated function in `impl` without body
-- --> tests/ui/missing-body.rs:12:5
-+ --> $DIR/missing-body.rs:12:5
- |
- 12 | async fn f(&self);
- | ^^^^^^^^^^^^^^^^^-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/must-use.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,11 +1,11 @@
- error: unused return value of `Interface::f` that must be used
-- --> tests/ui/must-use.rs:18:5
-+ --> $DIR/must-use.rs:18:5
- |
- 18 | Thing.f();
- | ^^^^^^^^^^
- |
- note: the lint level is defined here
-- --> tests/ui/must-use.rs:1:9
-+ --> $DIR/must-use.rs:1:9
- |
- 1 | #![deny(unused_must_use)]
- | ^^^^^^^^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/self-span.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:17:21
-+ --> $DIR/self-span.rs:17:21
- |
- 17 | let _: () = self;
- | -- ^^^^ expected `()`, found struct `S`
-@@ -7,13 +7,13 @@ error[E0308]: mismatched types
- | expected due to this
-
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/self-span.rs:18:23
-+ --> $DIR/self-span.rs:18:23
- |
- 18 | let _: Self = Self;
- | ^^^^ help: use curly brackets: `Self { /* fields */ }`
-
- error[E0308]: mismatched types
-- --> tests/ui/self-span.rs:25:21
-+ --> $DIR/self-span.rs:25:21
- |
- 25 | let _: () = self;
- | -- ^^^^ expected `()`, found enum `E`
-@@ -21,7 +21,7 @@ error[E0308]: mismatched types
- | expected due to this
-
- error[E0533]: expected unit struct, unit variant or constant, found struct variant `Self::V`
-- --> tests/ui/self-span.rs:26:23
-+ --> $DIR/self-span.rs:26:23
- |
- 26 | let _: Self = Self::V;
- | ^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/send-not-implemented.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:8:26
-+ --> $DIR/send-not-implemented.rs:8:26
- |
- 8 | async fn test(&self) {
- | __________________________^
-@@ -9,9 +9,9 @@ error: future cannot be sent between thr
- 12 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:11:9
-+ --> $DIR/send-not-implemented.rs:11:9
- |
- 10 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-@@ -22,7 +22,7 @@ note: future is not `Send` as this value
- = note: required for the cast to the object type `dyn Future<Output = ()> + Send`
-
- error: future cannot be sent between threads safely
-- --> tests/ui/send-not-implemented.rs:14:38
-+ --> $DIR/send-not-implemented.rs:14:38
- |
- 14 | async fn test_ret(&self) -> bool {
- | ______________________________________^
-@@ -33,9 +33,9 @@ error: future cannot be sent between thr
- 19 | | }
- | |_____^ future created by async block is not `Send`
- |
-- = help: within `impl Future<Output = [async output]>`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
-+ = help: within `impl Future`, the trait `Send` is not implemented for `MutexGuard<'_, ()>`
- note: future is not `Send` as this value is used across an await
-- --> tests/ui/send-not-implemented.rs:17:9
-+ --> $DIR/send-not-implemented.rs:17:9
- |
- 16 | let _guard = mutex.lock().unwrap();
- | ------ has type `MutexGuard<'_, ()>` which is not `Send`
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -12,8 +12,8 @@ pub trait Trait {
- #[async_trait]
- pub trait TraitFoo {
- async fn f() {
-- let _y = unimplemented!();
-- let _z = _y;
-+ let y = unimplemented!();
-+ let z = y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unreachable.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,13 +1,13 @@
- error: unreachable statement
-- --> tests/ui/unreachable.rs:16:9
-+ --> $DIR/unreachable.rs:16:9
- |
--15 | let _y = unimplemented!();
-- | ---------------- any code following this expression is unreachable
--16 | let _z = _y;
-- | ^^^^^^^^^^^^ unreachable statement
-+15 | let y = unimplemented!();
-+ | ---------------- any code following this expression is unreachable
-+16 | let z = y;
-+ | ^^^^^^^^^^ unreachable statement
- |
- note: the lint level is defined here
-- --> tests/ui/unreachable.rs:1:9
-+ --> $DIR/unreachable.rs:1:9
- |
- 1 | #![deny(warnings)]
- | ^^^^^^^^
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.rs
-diff -up firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr
---- firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/async-trait/tests/ui/unsupported-self.stderr 2022-03-16 09:33:31.991159827 +0100
-@@ -1,5 +1,5 @@
- error: the `Self` constructor can only be used with tuple or unit structs
-- --> tests/ui/unsupported-self.rs:11:17
-+ --> $DIR/unsupported-self.rs:11:17
- |
- 11 | let _ = Self;
- | ^^^^
-diff -up firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"28a1d4b7f04f3989f856789ec569d890a91b9dfdc8775ff8cbd4e0c1b2f8f9f2","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"250d841ee01b90209c6c4ad304969de145287c6c6588850b95e6f843ec4dd579","src/tests.rs":"5e62c77cfa155fd8affa8ff3c7ea688d80bce6f4956f9956582775ae3adca1a6"},"package":"bd5bf8a17cdc06d475689f9e9226f4b5bf5610e93cf5c3010a518fe6fb0d97f5"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"1da2771067c7bb47f182c75624cec456ef99daf6882314633a2a68aefc2616ad","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"8583712ee2b062ff3d4d6d3e16f19ff0f92bc3a0a4beeec11a81ef00146fbd4f","README.md":"28986de2e8d457e76ae3303d80094697e6ef4ad8da06a4a3178bb1b52bff63d5","src/lib.rs":"6dcb62a9279ecad8cdcfe37f383282089753e28adc0f2785ca73d50040bc89e7","src/tests.rs":"f67d17aa8faed5e3838322de9b98bb0cdc58d35fe5870e3f5c65ef1ef788966e"},"package":"9178181a7d44239c6c8eaafa8688558a2ab5fa04b8855381f2681e9591fb941b"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/Cargo.toml
---- firefox-98.0/third_party/rust/bitreader/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -3,15 +3,16 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- name = "bitreader"
--version = "0.3.5"
-+version = "0.3.4"
- authors = ["Ilkka Rauta <ilkka.rauta(a)gmail.com>"]
- description = "BitReader helps reading individual bits from a slice of bytes.\n\nYou can read \"unusual\" numbers of bits from the byte slice, for example 13 bits\nat once. The reader internally keeps track of position within the buffer.\n"
- homepage = "https://github.com/irauta/bitreader"
-diff -up firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/lib.rs
---- firefox-98.0/third_party/rust/bitreader/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/lib.rs 2022-03-16 09:37:01.761157888 +0100
-@@ -50,7 +50,6 @@
- cfg_if::cfg_if!{
- if #[cfg(feature = "std")] {
- extern crate std;
-- use std::cmp::min;
- use std::prelude::v1::*;
- use std::fmt;
- use std::error::Error;
-@@ -58,7 +57,6 @@ cfg_if::cfg_if!{
- } else {
- use core::result;
- use core::fmt;
-- use core::cmp::min;
- }
- }
-
-@@ -71,9 +69,6 @@ pub struct BitReader<'a> {
- /// Position from the start of the slice, counted as bits instead of bytes
- position: u64,
- relative_offset: u64,
--
-- /// Length this reader is allowed to read from the slice, counted as bits instead of bytes.
-- length: u64,
- }
-
- impl<'a> BitReader<'a> {
-@@ -84,7 +79,6 @@ impl<'a> BitReader<'a> {
- bytes: bytes,
- position: 0,
- relative_offset: 0,
-- length: bytes.len() as u64 * 8,
- }
- }
-
-@@ -115,45 +109,6 @@ impl<'a> BitReader<'a> {
- bytes: self.bytes,
- position: self.position,
- relative_offset: self.position,
-- length: self.length - self.position,
-- }
-- }
--
-- /// Returns a copy of current BitReader, with the difference that its position() returns
-- /// positions relative to the position of the original BitReader at the construction time, and
-- /// will not allow reading more than len bits. After construction, both readers are otherwise
-- // completely independent, except of course for sharing the same source data.
-- ///
-- /// ```
-- /// use bitreader::BitReader;
-- /// use bitreader::BitReaderError;
-- ///
-- /// let bytes = &[0b11110000, 0b00001111];
-- /// let mut original = BitReader::new(bytes);
-- /// assert_eq!(original.read_u8(4).unwrap(), 0b1111);
-- /// assert_eq!(original.position(), 4);
-- ///
-- /// let mut relative = original.relative_reader_atmost(8);
-- /// assert_eq!(relative.position(), 0);
-- ///
-- /// assert_eq!(original.read_u8(8).unwrap(), 0);
-- /// assert_eq!(relative.read_u8(8).unwrap(), 0);
-- ///
-- /// assert_eq!(original.position(), 12);
-- /// assert_eq!(relative.position(), 8);
-- ///
-- /// assert_eq!(relative.read_u8(8).unwrap_err(), BitReaderError::NotEnoughData{
-- /// position: 8,
-- /// length: 8,
-- /// requested: 8
-- /// });
-- /// ```
-- pub fn relative_reader_atmost(&self, len: u64) -> BitReader<'a> {
-- BitReader {
-- bytes: self.bytes,
-- position: self.position,
-- relative_offset: self.position,
-- length: min(self.length - self.position, len),
- }
- }
-
-@@ -175,9 +130,9 @@ impl<'a> BitReader<'a> {
- let requested = output_bytes.len() as u64 * 8;
- if requested > self.remaining() {
- Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-- requested,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
-+ requested: requested,
- })
- } else {
- for byte in output_bytes.iter_mut() {
-@@ -266,10 +221,10 @@ impl<'a> BitReader<'a> {
- /// Skip arbitrary number of bits. However, you can skip at most to the end of the byte slice.
- pub fn skip(&mut self, bit_count: u64) -> Result<()> {
- let end_position = self.position + bit_count;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count,
- });
- }
-@@ -284,7 +239,8 @@ impl<'a> BitReader<'a> {
-
- /// Returns the number of bits not yet read from the underlying slice.
- pub fn remaining(&self) -> u64 {
-- self.length - self.position
-+ let total_bits = self.bytes.len() as u64 * 8;
-+ total_bits - self.position
- }
-
- /// Helper to make sure the "bit cursor" is exactly at the beginning of a byte, or at specific
-@@ -335,10 +291,10 @@ impl<'a> BitReader<'a> {
- }
- let start_position = self.position;
- let end_position = self.position + bit_count as u64;
-- if end_position > (self.relative_offset + self.length) {
-+ if end_position > self.bytes.len() as u64 * 8 {
- return Err(BitReaderError::NotEnoughData {
-- position: self.position(),
-- length: self.length,
-+ position: self.position,
-+ length: (self.bytes.len() * 8) as u64,
- requested: bit_count as u64,
- });
- }
-@@ -366,13 +322,8 @@ pub type Result<T> = result::Result<T, B
- pub enum BitReaderError {
- /// Requested more bits than there are left in the byte slice at the current position.
- NotEnoughData {
-- /// Current posititon in bits relative to the beginning of the reader.
- position: u64,
--
-- /// Total readable length in bits of the underlaying slice.
- length: u64,
--
-- /// Bits requested to be read.
- requested: u64,
- },
- /// Requested more bits than the returned variable can hold, for example more than 8 bits when
-diff -up firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bitreader/src/tests.rs
---- firefox-98.0/third_party/rust/bitreader/src/tests.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bitreader/src/tests.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -282,34 +282,3 @@ fn read_slice_too_much() {
- });
- assert_eq!(&output, &[0u8; 4]);
- }
--
--#[test]
--fn relative_reader() {
-- let bytes = &[
-- 0b0001_0010, 0b0011_0100,
-- ];
-- let mut reader = BitReader::new(bytes);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0001);
--
-- let mut relative_reader = reader.relative_reader();
--
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 16,
-- length: 16,
-- requested: 1
-- });
--
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0010);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0011);
-- assert_eq!(relative_reader.read_u8(4).unwrap(), 0b0100);
--
-- assert_eq!(relative_reader.read_u8(1).unwrap_err(), BitReaderError::NotEnoughData {
-- position: 12,
-- length: 12,
-- requested: 1
-- });
--}
-diff -up firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json
---- firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/.cargo-checksum.json 2022-03-16 09:33:31.991159827 +0100
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"b79e2347297dee32b9483747ee3cf145bd60e8c9d14cc02929287dabde4685ff","README.md":"b90c7a163a0fbff29e2c049953968c8cbfe8aa616d7e36775f0a565761dcc671","src/avx2.rs":"b79f36e3a7442d241e3fdf2ec159866aea31b78883660a63cdc9b1a262f18d10","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"b0404c81988e4de8d8864437c512937d9e888c681ef4739ef2d5db1650bd8766","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"a274acd298a394c014096a8214a0dc1db7439d1e920bd2ad75707fadcc501e10","src/sse41.rs":"58e9e2ec97d266e9fb4cfa874f8cfcf5ee046911837824ceea4b99cd4007560b","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"648c10063fa1a16a961df45f194f50982bdf3d41d04586a48d2cc6d69e0252c1","README.md":"2253eba78d5af06642073c5dfd41253fb8be73d3a0e823bc3d7642c9d0ad0c6c","src/avx2.rs":"a97ec761e4e7f70ff6311f4c1e67cb5136ac66cfc51bc49525b81f9e23814d81","src/blake2bp.rs":"83577d4a22db3b92030d9bd4563aa9ad440f23c64a6ad5f10a9d709f22d50589","src/guts.rs":"1189cab87b18eaaf2abd5bcb3d7d799c75401a312cee6f1f65fdaad30203eb6f","src/lib.rs":"67723a3abc30dc7f3d488f434ced884b5ce962a807991c8f1cc9940df869c342","src/many.rs":"60d07e4d7ad63949fb5432ad05f7c6a525a3eee39d325f7d4e65e901b466be95","src/portable.rs":"c47baa15b311bc95d49f3d189111fe45756fb7d623a1f48f0050ae591817aedf","src/sse41.rs":"7a644b1056b804ada9ddc7586552a4a5c769e576d610ffe7ec74065f7eaff491","src/test.rs":"1685eec6fedc30fca1332cbb78c85e6c9b56eca962b6c6343c91ba69eefac754"},"package":"b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml
---- firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/Cargo.toml 2022-03-16 09:33:31.991159827 +0100
-@@ -13,12 +13,11 @@
- [package]
- edition = "2018"
- name = "blake2b_simd"
--version = "0.5.11"
-+version = "0.5.9"
- authors = ["Jack O'Connor"]
- description = "a pure Rust BLAKE2b implementation with dynamic SIMD"
- documentation = "https://docs.rs/blake2b_simd"
- readme = "README.md"
--keywords = ["blake2b", "blake2bp", "blake2"]
- license = "MIT"
- repository = "https://github.com/oconnor663/blake2_simd"
- [dependencies.arrayref]
-@@ -34,4 +33,3 @@ version = "0.1.3"
- [features]
- default = ["std"]
- std = []
--uninline_portable = []
-diff -up firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/README.md
---- firefox-98.0/third_party/rust/blake2b_simd/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/README.md 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+# blake2b_simd [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
-
- An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- [`blake2s_simd`](../blake2s).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/avx2.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -74,33 +74,32 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 32), _mm256_slli_epi64(x, 64 - 32))
-+ _mm256_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 24), _mm256_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm256_setr_epi8(
-+ 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10, 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13,
-+ 14, 15, 8, 9, 10,
-+ );
-+ _mm256_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 16), _mm256_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm256_setr_epi8(
-+ 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9, 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12,
-+ 13, 14, 15, 8, 9,
-+ );
-+ _mm256_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m256i) -> __m256i {
-- _mm256_or_si256(_mm256_srli_epi64(x, 63), _mm256_slli_epi64(x, 64 - 63))
-+ _mm256_or_si256(_mm256_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/lib.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -1,4 +1,4 @@
--//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Actions Status](https://github.com/oconnor663/blake2_simd/workflows/tests/badge.s...
-+//! [![GitHub](https://img.shields.io/github/tag/oconnor663/blake2_simd.svg?label=GitHub)](https://github.com/oconnor663/blake2_simd) [![crates.io](https://img.shields.io/crates/v/blake2b_simd.svg)](https://crates.io/crates/blake2b_simd) [![Build Status](https://travis-ci.org/oconnor663/blake2_simd.svg?branch=master)](...
- //!
- //! An implementation of the BLAKE2b and BLAKE2bp hash functions. See also
- //! [`blake2s_simd`](https://docs.rs/blake2s_simd).
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/portable.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -23,9 +23,7 @@ fn g(v: &mut [Word; 16], a: usize, b: us
- v[b] = (v[b] ^ v[c]).rotate_right(63);
- }
-
--// This is too much inlining for some small chips like ARM Cortex-M0, so the
--// uninline_portable feature is provided to disable it.
--#[cfg_attr(not(feature = "uninline_portable"), inline(always))]
-+#[inline(always)]
- fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
- // Select the message schedule based on the round.
- let s = SIGMA[r];
-diff -up firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs
---- firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/blake2b_simd/src/sse41.rs 2022-03-16 09:33:31.991159827 +0100
-@@ -70,33 +70,26 @@ macro_rules! _MM_SHUFFLE {
- };
- }
-
--// These rotations are the "simple version". For the "complicated version", see
--// https://github.com/sneves/blake2-avx2/blob/b3723921f668df09ece52dcd225a36....
--// For a discussion of the tradeoffs, see
--// https://github.com/sneves/blake2-avx2/pull/5. In short:
--// - Due to an LLVM bug (https://bugs.llvm.org/show_bug.cgi?id=44379), this
--// version performs better on recent x86 chips.
--// - LLVM is able to optimize this version to AVX-512 rotation instructions
--// when those are enabled.
--
- #[inline(always)]
- unsafe fn rot32(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 32), _mm_slli_epi64(x, 64 - 32))
-+ _mm_shuffle_epi32(x, _MM_SHUFFLE!(2, 3, 0, 1))
- }
-
- #[inline(always)]
- unsafe fn rot24(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 24), _mm_slli_epi64(x, 64 - 24))
-+ let rotate24 = _mm_setr_epi8(3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10);
-+ _mm_shuffle_epi8(x, rotate24)
- }
-
- #[inline(always)]
- unsafe fn rot16(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 16), _mm_slli_epi64(x, 64 - 16))
-+ let rotate16 = _mm_setr_epi8(2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9);
-+ _mm_shuffle_epi8(x, rotate16)
- }
-
- #[inline(always)]
- unsafe fn rot63(x: __m128i) -> __m128i {
-- _mm_or_si128(_mm_srli_epi64(x, 63), _mm_slli_epi64(x, 64 - 63))
-+ _mm_or_si128(_mm_srli_epi64(x, 63), add(x, x))
- }
-
- #[inline(always)]
-diff -up firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json
---- firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"31820be449d15a59a3fd124c89c5c5108bd8934fbd1c11d8d31cca3f9b082aee","Cargo.toml":"9a34d33f35a8271f6fed49f54b096ed9dcf80dd899f60205cf58962529abb4b9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"9a3b4407bab9fdf0f4a2acf5c2d3876f4c78fd25f1b8159462f07343a234fc8e","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"a0dcc1b5691e4a445f35fe84be46a938515dfdca1651396b880682547ae91292","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"d8d997589a7449f14cdd21fb85583f6c94eb0d3ea2c832d3c4c570e92a0a5cdd","src/lib.rs":"835cbcfa2ac45d9d8d40a13258922419027f60c9481e2cbc1b22690edea2f481"},"package":"a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"fb807cac318c99faa6fe40bcb6ddefd867c2048b9f2badd813281ddc808191b8","Cargo.toml":"74ed9ce9af6ed0be99c388989ab7e919ca1272fdd7e8a0d223506c790a74f1d5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"65f94e99ddaf4f5d1782a6dae23f35d4293a9a01444a13135a6887017d353cee","README.md":"84d13918b74c4175683118042305b0a4ff90333da9abf214bcf46d9b546ae319","README.tpl":"ec385000e14590a306855e7893daed0168102f33166bdc1e5cf5fa5599dac03f","src/alloc.rs":"ab0f23fa11c26efdd8f0596ebdf0e3faa75d097881fb59639b0fb23340c106bc","src/boxed.rs":"d18d363677a97a73225cb5c5b90e6187f7b5aae93979a41e40417fdd5a3f9975","src/collections/collect_in.rs":"243799901b950687d6e78220958cfb3484faefefafd5892e03d1564617842812","src/collections/mod.rs":"0fa36a7a5f2b5916b8e3bf4e2804e87c5f7716c87c719a9ab465d377e6272170","src/collections/raw_vec.rs":"11395868cfd0802fab3fe43417751a5755abb516136923e6d8fdbc2f0ff49d19","src/collections/str/lossy.rs":"c5d62b16e01071e2a574ae41ef6693ad12f1e6c786c5d38f7a13ebd6cb23c088","src/collections/str/mod.rs":"d82a8bd417fbf52a589d89a16ea2a0ac4f6ac920c3976ab1f5b6ac0c8493c4f2","src/collections/string.rs":"d4e6c74d7431fa2548ac10290afef6bcdefbf110c6343f0c0244306c11370b8c","src/collections/vec.rs":"8f445224c914c7a4f532636798f2b6ac254e650aa58aa57bd61aee1003d7f6af","src/lib.rs":"05bee63bd4bbfcf09a31b6511b5ec3f56ea1e973d079b398ff15d77be9a13d4a"},"package":"8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/Cargo.toml
---- firefox-98.0/third_party/rust/bumpalo/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -12,7 +12,7 @@
- [package]
- edition = "2018"
- name = "bumpalo"
--version = "3.9.1"
-+version = "3.8.0"
- authors = ["Nick Fitzgerald <fitzgen(a)gmail.com>"]
- exclude = ["/.github/*", "/benches", "/tests", "valgrind.supp", "bumpalo.png"]
- description = "A fast bump allocation arena for Rust."
-diff -up firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md
---- firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -28,30 +28,6 @@ Released YYYY-MM-DD.
-
- --------------------------------------------------------------------------------
-
--## 3.9.1
--
--Released 2022-01-06.
--
--### Fixed
--
--* Fixed link to logo in docs and README.md
--
----------------------------------------------------------------------------------
--
--## 3.9.0
--
--Released 2022-01-05.
--
--### Changed
--
--* The minimum supported Rust version (MSRV) has been raised to Rust 1.54.0.
--
--* `bumpalo::collections::Vec<T>` implements relevant traits for all arrays of
-- any size `N` via const generics. Previously, it was just arrays up to length
-- 32. Similar for `bumpalo::boxed::Box<[T; N]>`.
--
----------------------------------------------------------------------------------
--
- ## 3.8.0
-
- Released 2021-10-19.
-diff -up firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.md
---- firefox-98.0/third_party/rust/bumpalo/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,5 +1,6 @@
- # `bumpalo`
-
-+
- **A fast bump allocation arena for Rust.**
-
- [![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-@@ -7,7 +8,7 @@
- [![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
- [![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-
--![](https://github.com/fitzgen/bumpalo/raw/main/bumpalo.png)
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-
- ### Bump Allocation
-
-@@ -32,12 +33,11 @@ pointer back to the start of the arena's
- deallocation *extremely* fast, but allocated objects' `Drop` implementations are
- not invoked.
-
--> **However:** [`bumpalo::boxed::Box<T>`][box] can be used to wrap
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
- > `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
- > implementation when the `Box<T>` wrapper goes out of scope. This is similar to
- > how [`std::boxed::Box`] works, except without deallocating its backing memory.
-
--[box]: https://docs.rs/bumpalo/latest/bumpalo/boxed/struct.Box.html
- [`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-
- ### What happens when the memory chunk is full?
-@@ -80,22 +80,19 @@ collection types are modified to allocat
- arenas.
-
- ```rust
--#[cfg(feature = "collections")]
--{
-- use bumpalo::{Bump, collections::Vec};
--
-- // Create a new bump arena.
-- let bump = Bump::new();
--
-- // Create a vector of integers whose storage is backed by the bump arena. The
-- // vector cannot outlive its backing arena, and this property is enforced with
-- // Rust's lifetime rules.
-- let mut v = Vec::new_in(&bump);
--
-- // Push a bunch of integers onto `v`!
-- for i in 0..100 {
-- v.push(i);
-- }
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
- }
- ```
-
-@@ -117,36 +114,33 @@ can use this to work around the fact tha
- in its space itself.
-
- ```rust
--#[cfg(feature = "boxed")]
--{
-- use bumpalo::{Bump, boxed::Box};
-- use std::sync::atomic::{AtomicUsize, Ordering};
--
-- static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
--
-- struct CountDrops;
--
-- impl Drop for CountDrops {
-- fn drop(&mut self) {
-- NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-- }
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
- }
-+}
-
-- // Create a new bump arena.
-- let bump = Bump::new();
-+// Create a new bump arena.
-+let bump = Bump::new();
-
-- // Create a `CountDrops` inside the bump arena.
-- let mut c = Box::new_in(CountDrops, &bump);
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-
-- // No `CountDrops` have been dropped yet.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-
-- // Drop our `Box<CountDrops>`.
-- drop(c);
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-
-- // Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-- assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
--}
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
- ```
-
- ### `#![no_std]` Support
-@@ -180,14 +174,14 @@ bumpalo = { version = "3.4.0", features
-
- Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- ```
-
- Finally, use `std` collections with `Bump`, so that their internal heap
- allocations are made within the given bump arena:
-
--```rust,ignore
-+```rust
- #![feature(allocator_api)]
- use bumpalo::Bump;
-
-@@ -203,8 +197,9 @@ v.push(2);
-
- #### Minimum Supported Rust Version (MSRV)
-
--This crate is guaranteed to compile on stable Rust **1.54** and up. It might
--compile with older versions but that may change in any new patch release.
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-
- We reserve the right to increment the MSRV on minor releases, however we will strive
- to only do it deliberately and for good reasons.
-+
-diff -up firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/README.tpl
---- firefox-98.0/third_party/rust/bumpalo/README.tpl.crossbeam-downgrade-rhbz2063961 2022-03-16 09:33:31.992159860 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/README.tpl 2022-03-16 09:33:31.992159860 +0100
-@@ -0,0 +1,3 @@
-+# `{{crate}}`
-+
-+{{readme}}
-diff -up firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/boxed.rs
---- firefox-98.0/third_party/rust/bumpalo/src/boxed.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/boxed.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -647,25 +647,39 @@ impl<'a, F: ?Sized + Future + Unpin> Fut
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> From<Box<'a, [T; N]>> for Box<'a, [T]> {
-- fn from(mut arr: Box<'a, [T; N]>) -> Box<'a, [T]> {
-- let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), N);
-- mem::forget(arr);
-- unsafe { Box::from_raw(ptr) }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> From<Box<'a, [T; $N]>> for Box<'a, [T]> {
-+ fn from(mut arr: Box<'a, [T; $N]>) -> Box<'a, [T]> {
-+ let ptr = core::ptr::slice_from_raw_parts_mut(arr.as_mut_ptr(), $N);
-+ mem::forget(arr);
-+ unsafe { Box::from_raw(ptr) }
-+ }
-+ }
-+
-+
-+ /// This impl replaces unsize coercion.
-+ impl<'a, T> TryFrom<Box<'a, [T]>> for Box<'a, [T; $N]> {
-+ type Error = Box<'a, [T]>;
-+ fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; $N]>, Box<'a, [T]>> {
-+ if slice.len() == $N {
-+ let ptr = slice.as_mut_ptr() as *mut [T; $N];
-+ mem::forget(slice);
-+ Ok(unsafe { Box::from_raw(ptr) })
-+ } else {
-+ Err(slice)
-+ }
-+ }
-+ }
-+ )+
- }
- }
-
--/// This impl replaces unsize coercion.
--impl<'a, T, const N: usize> TryFrom<Box<'a, [T]>> for Box<'a, [T; N]> {
-- type Error = Box<'a, [T]>;
-- fn try_from(mut slice: Box<'a, [T]>) -> Result<Box<'a, [T; N]>, Box<'a, [T]>> {
-- if slice.len() == N {
-- let ptr = slice.as_mut_ptr() as *mut [T; N];
-- mem::forget(slice);
-- Ok(unsafe { Box::from_raw(ptr) })
-- } else {
-- Err(slice)
-- }
-- }
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
- }
-diff -up firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs
---- firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/collections/vec.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1983,23 +1983,26 @@ __impl_slice_eq1! { Vec<'a, A>, &'b [B]
- __impl_slice_eq1! { Vec<'a, A>, &'b mut [B] }
- // __impl_slice_eq1! { Cow<'a, [A]>, Vec<'b, B>, Clone }
-
--macro_rules! __impl_slice_eq1_array {
-- ($Lhs: ty, $Rhs: ty) => {
-- impl<'a, 'b, A, B, const N: usize> PartialEq<$Rhs> for $Lhs
-- where
-- A: PartialEq<B>,
-- {
-- #[inline]
-- fn eq(&self, other: &$Rhs) -> bool {
-- self[..] == other[..]
-- }
-- }
-- };
--}
--
--__impl_slice_eq1_array! { Vec<'a, A>, [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b [B; N] }
--__impl_slice_eq1_array! { Vec<'a, A>, &'b mut [B; N] }
-+macro_rules! array_impls {
-+ ($($N: expr)+) => {
-+ $(
-+ // NOTE: some less important impls are omitted to reduce code bloat
-+ __impl_slice_eq1! { Vec<'a, A>, [B; $N] }
-+ __impl_slice_eq1! { Vec<'a, A>, &'b [B; $N] }
-+ // __impl_slice_eq1! { Vec<A>, &'b mut [B; $N] }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b [B; $N], Clone }
-+ // __impl_slice_eq1! { Cow<'a, [A]>, &'b mut [B; $N], Clone }
-+ )+
-+ }
-+}
-+
-+array_impls! {
-+ 0 1 2 3 4 5 6 7 8 9
-+ 10 11 12 13 14 15 16 17 18 19
-+ 20 21 22 23 24 25 26 27 28 29
-+ 30 31 32
-+}
-
- /// Implements comparison of vectors, lexicographically.
- impl<'bump, T: 'bump + PartialOrd> PartialOrd for Vec<'bump, T> {
-@@ -2070,18 +2073,6 @@ impl<'bump, T: 'bump> BorrowMut<[T]> for
- }
- }
-
--impl<'bump, T> Drop for Vec<'bump, T> {
-- fn drop(&mut self) {
-- unsafe {
-- // use drop for [T]
-- // use a raw slice to refer to the elements of the vector as weakest necessary type;
-- // could avoid questions of validity in certain cases
-- ptr::drop_in_place(ptr::slice_from_raw_parts_mut(self.as_mut_ptr(), self.len))
-- }
-- // RawVec handles deallocation
-- }
--}
--
- ////////////////////////////////////////////////////////////////////////////////
- // Clone-on-write
- ////////////////////////////////////////////////////////////////////////////////
-diff -up firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/bumpalo/src/lib.rs
---- firefox-98.0/third_party/rust/bumpalo/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/bumpalo/src/lib.rs 2022-03-16 09:33:31.992159860 +0100
-@@ -1,4 +1,222 @@
--#![doc = include_str!("../README.md")]
-+/*!
-+
-+**A fast bump allocation arena for Rust.**
-+
-+[![](https://docs.rs/bumpalo/badge.svg)](https://docs.rs/bumpalo/)
-+[![](https://img.shields.io/crates/v/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![](https://img.shields.io/crates/d/bumpalo.svg)](https://crates.io/crates/bumpalo)
-+[![Build Status](https://github.com/fitzgen/bumpalo/workflows/Rust/badge.svg)](htt...
-+
-+![](https://github.com/fitzgen/bumpalo/raw/master/bumpalo.png)
-+
-+## Bump Allocation
-+
-+Bump allocation is a fast, but limited approach to allocation. We have a chunk
-+of memory, and we maintain a pointer within that memory. Whenever we allocate an
-+object, we do a quick test that we have enough capacity left in our chunk to
-+allocate the object and then update the pointer by the object's size. *That's
-+it!*
-+
-+The disadvantage of bump allocation is that there is no general way to
-+deallocate individual objects or reclaim the memory region for a
-+no-longer-in-use object.
-+
-+These trade offs make bump allocation well-suited for *phase-oriented*
-+allocations. That is, a group of objects that will all be allocated during the
-+same program phase, used, and then can all be deallocated together as a group.
-+
-+## Deallocation en Masse, but No `Drop`
-+
-+To deallocate all the objects in the arena at once, we can simply reset the bump
-+pointer back to the start of the arena's memory chunk. This makes mass
-+deallocation *extremely* fast, but allocated objects' `Drop` implementations are
-+not invoked.
-+
-+> **However:** [`bumpalo::boxed::Box<T>`][crate::boxed::Box] can be used to wrap
-+> `T` values allocated in the `Bump` arena, and calls `T`'s `Drop`
-+> implementation when the `Box<T>` wrapper goes out of scope. This is similar to
-+> how [`std::boxed::Box`] works, except without deallocating its backing memory.
-+
-+[`std::boxed::Box`]: https://doc.rust-lang.org/std/boxed/struct.Box.html
-+
-+## What happens when the memory chunk is full?
-+
-+This implementation will allocate a new memory chunk from the global allocator
-+and then start bump allocating into this new memory chunk.
-+
-+## Example
-+
-+```
-+use bumpalo::Bump;
-+use std::u64;
-+
-+struct Doggo {
-+ cuteness: u64,
-+ age: u8,
-+ scritches_required: bool,
-+}
-+
-+// Create a new arena to bump allocate into.
-+let bump = Bump::new();
-+
-+// Allocate values into the arena.
-+let scooter = bump.alloc(Doggo {
-+ cuteness: u64::max_value(),
-+ age: 8,
-+ scritches_required: true,
-+});
-+
-+// Exclusive, mutable references to the just-allocated value are returned.
-+assert!(scooter.scritches_required);
-+scooter.age += 1;
-+```
-+
-+## Collections
-+
-+When the `"collections"` cargo feature is enabled, a fork of some of the `std`
-+library's collections are available in the `collections` module. These
-+collection types are modified to allocate their space inside `bumpalo::Bump`
-+arenas.
-+
-+```rust
-+# #[cfg(feature = "collections")]
-+# {
-+use bumpalo::{Bump, collections::Vec};
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a vector of integers whose storage is backed by the bump arena. The
-+// vector cannot outlive its backing arena, and this property is enforced with
-+// Rust's lifetime rules.
-+let mut v = Vec::new_in(&bump);
-+
-+// Push a bunch of integers onto `v`!
-+for i in 0..100 {
-+ v.push(i);
-+}
-+# }
-+```
-+
-+Eventually [all `std` collection types will be parameterized by an
-+allocator](https://github.com/rust-lang/rust/issues/42774) and we can remove
-+this `collections` module and use the `std` versions.
-+
-+For unstable, nightly-only support for custom allocators in `std`, see the
-+`allocator_api` section below.
-+
-+## `bumpalo::boxed::Box`
-+
-+When the `"boxed"` cargo feature is enabled, a fork of `std::boxed::Box` library
-+is available in the `boxed` module. This `Box` type is modified to allocate its
-+space inside `bumpalo::Bump` arenas.
-+
-+**A `Box<T>` runs `T`'s drop implementation when the `Box<T>` is dropped.** You
-+can use this to work around the fact that `Bump` does not drop values allocated
-+in its space itself.
-+
-+```rust
-+# #[cfg(feature = "boxed")]
-+# {
-+use bumpalo::{Bump, boxed::Box};
-+use std::sync::atomic::{AtomicUsize, Ordering};
-+
-+static NUM_DROPPED: AtomicUsize = AtomicUsize::new(0);
-+
-+struct CountDrops;
-+
-+impl Drop for CountDrops {
-+ fn drop(&mut self) {
-+ NUM_DROPPED.fetch_add(1, Ordering::SeqCst);
-+ }
-+}
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `CountDrops` inside the bump arena.
-+let mut c = Box::new_in(CountDrops, &bump);
-+
-+// No `CountDrops` have been dropped yet.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 0);
-+
-+// Drop our `Box<CountDrops>`.
-+drop(c);
-+
-+// Its `Drop` implementation was run, and so `NUM_DROPS` has been incremented.
-+assert_eq!(NUM_DROPPED.load(Ordering::SeqCst), 1);
-+# }
-+```
-+
-+## `#![no_std]` Support
-+
-+Bumpalo is a `no_std` crate. It depends only on the `alloc` and `core` crates.
-+
-+## Thread support
-+
-+The `Bump` is `!Sync`, which makes it hard to use in certain situations around threads ‒ for
-+example in `rayon`.
-+
-+The [`bumpalo-herd`](https://crates.io/crates/bumpalo-herd) crate provides a pool of `Bump`
-+allocators for use in such situations.
-+
-+## Nightly Rust `feature(allocator_api)` Support
-+
-+The unstable, nightly-only Rust `allocator_api` feature defines an `Allocator`
-+trait and exposes custom allocators for `std` types. Bumpalo has a matching
-+`allocator_api` cargo feature to enable implementing `Allocator` and using
-+`Bump` with `std` collections. Note that, as `feature(allocator_api)` is
-+unstable and only in nightly Rust, Bumpalo's matching `allocator_api` cargo
-+feature should be considered unstable, and will not follow the semver
-+conventions that the rest of the crate does.
-+
-+First, enable the `allocator_api` feature in your `Cargo.toml`:
-+
-+```toml
-+[dependencies]
-+bumpalo = { version = "3.4.0", features = ["allocator_api"] }
-+```
-+
-+Next, enable the `allocator_api` nightly Rust feature in your `src/lib.rs` or `src/main.rs`:
-+
-+```rust
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+# }
-+```
-+
-+Finally, use `std` collections with `Bump`, so that their internal heap
-+allocations are made within the given bump arena:
-+
-+```
-+# #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
-+# #[cfg(feature = "allocator_api")]
-+# {
-+#![feature(allocator_api)]
-+use bumpalo::Bump;
-+
-+// Create a new bump arena.
-+let bump = Bump::new();
-+
-+// Create a `Vec` whose elements are allocated within the bump arena.
-+let mut v = Vec::new_in(&bump);
-+v.push(0);
-+v.push(1);
-+v.push(2);
-+# }
-+```
-+
-+### Minimum Supported Rust Version (MSRV)
-+
-+This crate is guaranteed to compile on stable Rust 1.44 and up. It might compile
-+with older versions but that may change in any new patch release.
-+
-+We reserve the right to increment the MSRV on minor releases, however we will strive
-+to only do it deliberately and for good reasons.
-+
-+ */
-+
- #![deny(missing_debug_implementations)]
- #![deny(missing_docs)]
- #![no_std]
-@@ -202,7 +420,7 @@ impl<E: Display> Display for AllocOrInit
- ///
- /// Even when optimizations are on, these functions do not **guarantee** that
- /// the value is constructed on the heap. To the best of our knowledge no such
--/// guarantee can be made in stable Rust as of 1.51.
-+/// guarantee can be made in stable Rust as of 1.44.
- ///
- /// ### Fallible Initialization: The `_try_with` Method Suffix
- ///
-diff -up firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json
---- firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/.cargo-checksum.json 2022-03-16 09:33:31.992159860 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"01efe9c9a75e5a305dac0e12676ed451f746049a825aa86acef0d8ee90742f71","Cargo.toml":"ea55c73cacac2dcc3bdcb2c657e057d9b73214e76f8654799236b13c853e97bd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"61d450a57f8699dfc1c39e3bb69236f7d10f31f4503b03aa8b2b37b2448b8b69","src/lib.rs":"4bcb45fe37cdca78ba0e403d9e531102c521ad42e9ffd2ecbb154b4509864978","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"50d6fbb00aa801cffefd2ecbbb43bba8686925658b3bf5e304b5af735f90bf08","Cargo.toml":"7ff90cd0fd3bc7449b8f55dea7de4d7d51f7c11948119512a274369733a94321","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"106c91d873d7c2681ca6264195737d7f2ea73f91cc74dd4c200f3fe9c5ea4907","src/lib.rs":"d2b1a7280c5cb8c1e946a5839862a1496749c445851f7ed196debf8386a4e646","tests/padding.rs":"120cc65d1fcebbdb0ed8b0c287680ede2483e3ab040746e1a3616ffb39d8f414"},"package":"631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/Cargo.toml
---- firefox-98.0/third_party/rust/cache-padded/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/Cargo.toml 2022-03-16 09:33:31.992159860 +0100
-@@ -3,20 +3,23 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
- name = "cache-padded"
--version = "1.2.0"
-+version = "1.1.1"
- authors = ["Stjepan Glavina <stjepang(a)gmail.com>"]
- description = "Prevent false sharing by padding and aligning to the length of a cache line"
--homepage = "https://github.com/smol-rs/cache-padded"
-+homepage = "https://github.com/stjepang/cache-padded"
-+documentation = "https://docs.rs/cache-padded"
-+readme = "README.md"
- keywords = ["cache", "padding", "lock-free", "atomic"]
- categories = ["concurrency", "no-std"]
- license = "Apache-2.0 OR MIT"
--repository = "https://github.com/smol-rs/cache-padded"
-+repository = "https://github.com/stjepang/cache-padded"
-diff -up firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md
---- firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/CHANGELOG.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,7 +1,3 @@
--# Version 1.2.0
--
--- Improve implementation of `CachePadded`.
--
- # Version 1.1.1
-
- - Forbid unsafe code.
-diff -up firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/README.md
---- firefox-98.0/third_party/rust/cache-padded/README.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/README.md 2022-03-16 09:33:31.992159860 +0100
-@@ -1,9 +1,9 @@
- # cache-padded
-
--[![Build](https://github.com/smol-rs/cache-padded/workflows/Build%20and%20test/badge.svg)](
--https://github.com/smol-rs/cache-padded/actions)
--[![License](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg)](
--https://github.com/smol-rs/cache-padded)
-+[![Build](https://github.com/stjepang/cache-padded/workflows/Build%20and%20test/badge.svg)](
-+https://github.com/stjepang/cache-padded/actions)
-+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
-+https://github.com/stjepang/cache-padded)
- [![Cargo](https://img.shields.io/crates/v/cache-padded.svg)](
- https://crates.io/crates/cache-padded)
- [![Documentation](https://docs.rs/cache-padded/badge.svg)](
-diff -up firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/cache-padded/src/lib.rs
---- firefox-98.0/third_party/rust/cache-padded/src/lib.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/cache-padded/src/lib.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,7 @@
- //! Prevent false sharing by padding and aligning to the length of a cache line.
- //!
- //! In concurrent programming, sometimes it is desirable to make sure commonly accessed shared data
--//! is not all placed into the same cache line. Updating an atomic value invalidates the whole cache
-+//! is not all placed into the same cache line. Updating an atomic value invalides the whole cache
- //! line it belongs to, which makes the next access to the same cache line slower for other CPU
- //! cores. Use [`CachePadded`] to ensure updating one piece of data doesn't invalidate other cached
- //! data.
-@@ -10,9 +10,8 @@
- //!
- //! Cache lines are assumed to be N bytes long, depending on the architecture:
- //!
--//! * On x86-64, aarch64, and powerpc64, N = 128.
--//! * On arm, mips, mips64, and riscv64, N = 32.
--//! * On s390x, N = 256.
-+//! * On x86-64 and aarch64, N = 128.
-+//! * On all others, N = 64.
- //!
- //! Note that N is just a reasonable guess and is not guaranteed to match the actual cache line
- //! length of the machine the program is running on.
-@@ -68,63 +67,14 @@ use core::ops::{Deref, DerefMut};
- // - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-i...
- // - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73b...
- //
--// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache line size.
-+// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache lines.
- //
- // Sources:
- // - https://www.mono-project.com/news/2016/09/12/arm64-icache/
- //
--// powerpc64 has 128-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- ),
-- repr(align(128))
--)]
--// arm, mips, mips64, and riscv64 have 32-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(
-- any(
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- ),
-- repr(align(32))
--)]
--// s390x has 256-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--#[cfg_attr(target_arch = "s390x", repr(align(256)))]
--// x86 and wasm have 64-byte cache line size.
--//
--// Sources:
--// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a90723...
--// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d...
--//
--// All others are assumed to have 64-byte cache line size.
-+#[cfg_attr(any(target_arch = "x86_64", target_arch = "aarch64"), repr(align(128)))]
- #[cfg_attr(
-- not(any(
-- target_arch = "x86_64",
-- target_arch = "aarch64",
-- target_arch = "powerpc64",
-- target_arch = "arm",
-- target_arch = "mips",
-- target_arch = "mips64",
-- target_arch = "riscv64",
-- target_arch = "s390x",
-- )),
-+ not(any(target_arch = "x86_64", target_arch = "aarch64")),
- repr(align(64))
- )]
- #[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/benches/crossbeam.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -13,7 +13,7 @@ mod unbounded {
-
- #[bench]
- fn create(b: &mut Bencher) {
-- b.iter(unbounded::<i32>);
-+ b.iter(|| unbounded::<i32>());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/.cargo-checksum.json 2022-03-16 09:33:31.993159893 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"e70d1a5fa6697a8b24e193e3934975317df12279c167b90fcb9616291792197c","Cargo.lock":"0f4e59f28bdd52c4781d102fc7d1f16d1ea417aaec0a4846432444a4019b2537","Cargo.toml":"c8334f658b699a1a0e25d997d752a9493a627f9ddcb7aab739c7319ea583882f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"96cb1abd23cac3ef8a7174a802e94609926b555bb02c9658c78723d433f1dd92","examples/fibonacci.rs":"4e88fa40048cdc31e9c7bb60347d46f92543d7ddf39cab3b52bfe44affdb6a02","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"d02121258f08d56f1eb7997e19bcb9bacb6836cfa0abbba90a9e59d8a50ae5cf","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ff4d39639ddf16aaab582d4a5f3d10ef2c71afe1abbf4e60f3d9d2ddbd72c230","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"853c2ad068f912cfb49877bcd41e241f34b25026b709bf0629523f19952e3adc","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"012a53f56b86df22ce49866da95e5f457fb99a18a098f0f64779c6d1cdd7092f","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"66eb10a6cbdf8dd0869f2a7cac9992fdaee36c9e2a01d708d39d7c794572935b","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"591ee70bf62ccad5aa2fac7b92d444183b02790a79c024f016c78de2396d08a3","tests/after.rs":"0154a8e152880db17a20514ecdd49dabc361d3629858d119b9746b5e932c780c","tests/array.rs":"e5f25e8991863a9a86d61a66be646d04feae527f35b1697fd215b97af4383736","tests/golang.rs":"dc85669c9c4e902b1bb263d00f5cb6f9ecb6d42b19fe53425b55ce97c887da49","tests/iter.rs":"25dc02135bbae9d47a30f9047661648e66bdc134e40ba78bc2fbacbb8b3819bc","tests/list.rs":"de865ef097f3bcb35c1c814554e6108fed43b3dbb1533c8bbcf8688cceb6b6ab","tests/mpsc.rs":"401aa3c6923815058881ddce98070df68ebab283913c89c007436bb8af7ca0ea","tests/never.rs":"ee40c4fc4dd5af4983fae8de6927f52b81174d222c162f745b26c4a6c7108e4f","tests/ready.rs":"d349702f123925a0781b48d677e6dcf64fc5d1fc788a7bf1e151a3d57e81871c","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"d20259a45f387cbce80c2c876ae81ea3883f36ea01c5151c159d58c362f6ba07","tests/select_macro.rs":"d3af2dc98e0dd03dc4ffab464b8ccb2f8b7504e8bb830948a04c015b92f0b296","tests/thread_locals.rs":"a1ce59e2aff69161621c0cb215eb6ea238088c06a31a8507a74cf179fd5a4299","tests/tick.rs":"5f697bd14c48505d932e82065b5302ef668e1cc19cac18e8ac22e0c83c221c1d","tests/zero.rs":"afbd838001d4196daddf17133e60ccea31529cc48ee01e245ac0d6366d1e30b9"},"package":"e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"74ac49b84461217698d4430f81b1cdcba0595bc4e57216ffc52b8296ac44cd41","Cargo.lock":"7956079bcac40cc40c894f0260266365ecdb1c01c48636ae4c4080977603e7b8","Cargo.toml":"6a7acaffaa30dab2b5ea1f5ab86b20bc97370314ed03472288745b3b969786dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"b16db96b93b1d7cf7bea533f572091ec6bca3234fbe0a83038be772ff391a44c","README.md":"415a71d4978cfd338a6ae1f1b41284652eccd277a815542c304647dc437a8274","benches/crossbeam.rs":"f5720508d3458f2451271b9887f7557823304bd38288c928b0d6aa1f459865e5","examples/fibonacci.rs":"6a26ecd74c7493d2c93f4280c0804afc19adc612b77b3d9fea433119ff472a44","examples/matching.rs":"63c250e164607a7a9f643d46f107bb5da846d49e89cf9069909562d20e530f71","examples/stopwatch.rs":"f9a00477b41823199e4af06bddeb0c6cfd22e272340eec1b98b333fc59ee6a1f","src/channel.rs":"a9baaad2f414c38cd324a60ac9375ca58462ce6662217683648e9b66cec43a8c","src/context.rs":"ad24cabfc50dd5e6ae84aa46a0246da12da1f1a6fa19043244ad25136075c6ca","src/counter.rs":"c49a9f44587888850edeb62f7c8ecd1acecb39c836834254ff3ac934c478440a","src/err.rs":"fdbde7279a1e74973e5c7d3e835a97836229a357fe465c0ba1a37f2a012d1bef","src/flavors/array.rs":"c125146771265058ac320226456b1e21667e93649531a3d20157f71cd715881d","src/flavors/at.rs":"65bf870b3ddb14738256706b0276f2656ad1fe9cd8eb91737489868edd088e92","src/flavors/list.rs":"50dbe59616c39b5aa184470023ce0cfb1cb0dbd92e1577375d299446981527c0","src/flavors/mod.rs":"3d9d43bc38b0adb18c96c995c2bd3421d8e33ab6c30b20c3c467d21d48e485dc","src/flavors/never.rs":"0e7921922d00c711552fb063c63c78192fa6ddc0762fb81c1713b847495ec39a","src/flavors/tick.rs":"38a479b9f4a72a5ccb9c407a1e7b44d36b6ad0f4e214e39266b12b9564c803dc","src/flavors/zero.rs":"1bda0c5483b04d53f36f9f4a6fe6f87b69f698068771e637e224c09400c6ce83","src/lib.rs":"3a65706d4124844ffc4c8cb1f8cc779631ec94f449f85cbb68364ad3619404f1","src/select.rs":"4eb4b1988c5dffff3e3d2138d14a1b86613bf62b78c45a5c70f65aaee92c11bb","src/select_macro.rs":"96bc9acb9a22588a4e733b0ab0761ad2be9a6b3e03744e8fc9c6de9ae433b696","src/utils.rs":"746fe315d6cfc832e3dda35e5055c0fd5c99907f1303b2ea7eacc4e37c8527e1","src/waker.rs":"9058cc441d467539c439ef88f0be1a187bf122d26fc116ce3e3a0265a693761f","tests/after.rs":"324c7d773f72bef62d150171f74ba7b7ac1b06f6030b3d4d2b1a35d211956b21","tests/array.rs":"574bff53aff0b0a8c365bf3f9ad77bb64675df9e6e0714be9c16eeeeac22e4d5","tests/golang.rs":"ec03806945fecd381cfce0634e2d776741423589c92e1bd4d8a431ac20f5d2d0","tests/iter.rs":"7563dc7fdf4c63e31dd74ee3fedecdd3aed490f7ef599b98f6f75f929cf79edb","tests/list.rs":"cc2971e69fd7f6a94b5463c9d4e9079df7955b37552e16dd66f4c6e65db60d96","tests/mpsc.rs":"0c4c6b056f5cec77ca19eca45f99b083632700a4b67133e88071a1d22a61d6fe","tests/never.rs":"665441a9fb004f7cd44047619637ebe6766cf2faf58e68e6481397bbfc682e11","tests/ready.rs":"eae3d7f16e817e63f3a6ceda062fece3de5e11c7a9631b32b02f23396a9d59c1","tests/same_channel.rs":"2bab761443671e841e1b2476bd8082d75533a2f6be7946f5dbcee67cdc82dccb","tests/select.rs":"3603f450b23f5e0d1e4014a167a9b23ab149b5f418c8b89636f1c02c90501569","tests/select_macro.rs":"00dd7963f79b96abf30851fdab29e86c8424b502a8a7d34abf4bc1714f493ecf","tests/thread_locals.rs":"3611db5502e6af0a8d15187d09fd195381819795544208b946e9f99b04579a81","tests/tick.rs":"dc4a7d3c8dd888ce135fe8a8c67f5dc8b5ab0c3fa57a48459f96d51fa0f1e6d5","tests/zero.rs":"0ff0587cc74569bfe389e0c619217799a960a0dfc5e6354603c88e6eea1b79a1"},"package":"06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.lock 2022-03-16 09:33:31.993159893 +0100
-@@ -3,6 +3,12 @@
- version = 3
-
- [[package]]
-+name = "autocfg"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-+
-+[[package]]
- name = "cfg-if"
- version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10,7 +16,7 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
- dependencies = [
- "cfg-if",
- "crossbeam-utils",
-@@ -21,19 +27,20 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
- dependencies = [
-+ "autocfg",
- "cfg-if",
- "lazy_static",
- ]
-
- [[package]]
- name = "getrandom"
--version = "0.2.3"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
- dependencies = [
- "cfg-if",
- "libc",
-@@ -42,9 +49,9 @@ dependencies = [
-
- [[package]]
- name = "hermit-abi"
--version = "0.1.19"
-+version = "0.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
- dependencies = [
- "libc",
- ]
-@@ -57,15 +64,15 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.93"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
-
- [[package]]
- name = "num_cpus"
--version = "1.13.1"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
- dependencies = [
- "hermit-abi",
- "libc",
-@@ -73,15 +80,15 @@ dependencies = [
-
- [[package]]
- name = "ppv-lite86"
--version = "0.2.16"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -91,9 +98,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -101,27 +108,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
- name = "signal-hook"
--version = "0.3.13"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
-+checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac"
- dependencies = [
- "libc",
- "signal-hook-registry",
-@@ -129,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "signal-hook-registry"
--version = "1.4.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-+checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
- dependencies = [
- "libc",
- ]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/Cargo.toml 2022-03-16 09:33:31.993159893 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-channel"
--version = "0.5.2"
-+version = "0.5.1"
-+authors = ["The Crossbeam Project Developers"]
- description = "Multi-producer multi-consumer channels for message passing"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
-+documentation = "https://docs.rs/crossbeam-channel"
- keywords = ["channel", "mpmc", "select", "golang", "message"]
- categories = ["algorithms", "concurrency", "data-structures"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/CHANGELOG.md 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,3 @@
--# Version 0.5.2
--
--- Fix stacked borrows violations. (#763, #764)
--
- # Version 0.5.1
-
- - Fix memory leak in unbounded channel. (#669)
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/fibonacci.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@ fn fibonacci(sender: Sender<u64>) {
- while sender.send(x).is_ok() {
- let tmp = x;
- x = y;
-- y += tmp;
-+ y = tmp + y;
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/examples/stopwatch.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -33,7 +33,11 @@ fn main() {
-
- // Prints the elapsed time.
- fn show(dur: Duration) {
-- println!("Elapsed: {}.{:03} sec", dur.as_secs(), dur.subsec_millis());
-+ println!(
-+ "Elapsed: {}.{:03} sec",
-+ dur.as_secs(),
-+ dur.subsec_nanos() / 1_000_000
-+ );
- }
-
- let start = Instant::now();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/context.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,8 +1,7 @@
- //! Thread-local context used in select.
-
- use std::cell::Cell;
--use std::ptr;
--use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
-+use std::sync::atomic::{AtomicUsize, Ordering};
- use std::sync::Arc;
- use std::thread::{self, Thread, ThreadId};
- use std::time::Instant;
-@@ -12,7 +11,6 @@ use crossbeam_utils::Backoff;
- use crate::select::Selected;
-
- /// Thread-local context used in select.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Clone)]
- pub struct Context {
- inner: Arc<Inner>,
-@@ -25,7 +23,7 @@ struct Inner {
- select: AtomicUsize,
-
- /// A slot into which another thread may store a pointer to its `Packet`.
-- packet: AtomicPtr<()>,
-+ packet: AtomicUsize,
-
- /// Thread handle.
- thread: Thread,
-@@ -47,7 +45,7 @@ impl Context {
- }
-
- let mut f = Some(f);
-- let mut f = |cx: &Context| -> R {
-+ let mut f = move |cx: &Context| -> R {
- let f = f.take().unwrap();
- f(cx)
- };
-@@ -71,7 +69,7 @@ impl Context {
- Context {
- inner: Arc::new(Inner {
- select: AtomicUsize::new(Selected::Waiting.into()),
-- packet: AtomicPtr::new(ptr::null_mut()),
-+ packet: AtomicUsize::new(0),
- thread: thread::current(),
- thread_id: thread::current().id(),
- }),
-@@ -84,7 +82,7 @@ impl Context {
- self.inner
- .select
- .store(Selected::Waiting.into(), Ordering::Release);
-- self.inner.packet.store(ptr::null_mut(), Ordering::Release);
-+ self.inner.packet.store(0, Ordering::Release);
- }
-
- /// Attempts to select an operation.
-@@ -114,19 +112,19 @@ impl Context {
- ///
- /// This method must be called after `try_select` succeeds and there is a packet to provide.
- #[inline]
-- pub fn store_packet(&self, packet: *mut ()) {
-- if !packet.is_null() {
-+ pub fn store_packet(&self, packet: usize) {
-+ if packet != 0 {
- self.inner.packet.store(packet, Ordering::Release);
- }
- }
-
- /// Waits until a packet is provided and returns it.
- #[inline]
-- pub fn wait_packet(&self) -> *mut () {
-+ pub fn wait_packet(&self) -> usize {
- let backoff = Backoff::new();
- loop {
- let packet = self.inner.packet.load(Ordering::Acquire);
-- if !packet.is_null() {
-+ if packet != 0 {
- return packet;
- }
- backoff.snooze();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/array.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -10,7 +10,7 @@
-
- use std::cell::UnsafeCell;
- use std::marker::PhantomData;
--use std::mem::MaybeUninit;
-+use std::mem::{self, MaybeUninit};
- use std::ptr;
- use std::sync::atomic::{self, AtomicUsize, Ordering};
- use std::time::Instant;
-@@ -110,7 +110,7 @@ impl<T> Channel<T> {
- // Allocate a buffer of `cap` slots initialized
- // with stamps.
- let buffer = {
-- let boxed: Box<[Slot<T>]> = (0..cap)
-+ let mut boxed: Box<[Slot<T>]> = (0..cap)
- .map(|i| {
- // Set the stamp to `{ lap: 0, mark: 0, index: i }`.
- Slot {
-@@ -119,7 +119,9 @@ impl<T> Channel<T> {
- }
- })
- .collect();
-- Box::into_raw(boxed) as *mut Slot<T>
-+ let ptr = boxed.as_mut_ptr();
-+ mem::forget(boxed);
-+ ptr
- };
-
- Channel {
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/flavors/zero.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -6,7 +6,6 @@ use std::cell::UnsafeCell;
- use std::marker::PhantomData;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::time::Instant;
--use std::{fmt, ptr};
-
- use crossbeam_utils::Backoff;
-
-@@ -17,19 +16,7 @@ use crate::utils::Spinlock;
- use crate::waker::Waker;
-
- /// A pointer to a packet.
--pub struct ZeroToken(*mut ());
--
--impl Default for ZeroToken {
-- fn default() -> Self {
-- Self(ptr::null_mut())
-- }
--}
--
--impl fmt::Debug for ZeroToken {
-- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-- fmt::Debug::fmt(&(self.0 as usize), f)
-- }
--}
-+pub(crate) type ZeroToken = usize;
-
- /// A slot for passing one message from a sender to a receiver.
- struct Packet<T> {
-@@ -130,10 +117,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -143,11 +130,11 @@ impl<T> Channel<T> {
- /// Writes a message into the packet.
- pub(crate) unsafe fn write(&self, token: &mut Token, msg: T) -> Result<(), T> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(msg);
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
- packet.msg.get().write(Some(msg));
- packet.ready.store(true, Ordering::Release);
- Ok(())
-@@ -159,10 +146,10 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- true
- } else if inner.is_disconnected {
-- token.zero.0 = ptr::null_mut();
-+ token.zero = 0;
- true
- } else {
- false
-@@ -172,11 +159,11 @@ impl<T> Channel<T> {
- /// Reads a message from the packet.
- pub(crate) unsafe fn read(&self, token: &mut Token) -> Result<T, ()> {
- // If there is no packet, the channel is disconnected.
-- if token.zero.0.is_null() {
-+ if token.zero == 0 {
- return Err(());
- }
-
-- let packet = &*(token.zero.0 as *const Packet<T>);
-+ let packet = &*(token.zero as *const Packet<T>);
-
- if packet.on_stack {
- // The message has been in the packet from the beginning, so there is no need to wait
-@@ -190,7 +177,7 @@ impl<T> Channel<T> {
- // heap-allocated packet.
- packet.wait_ready();
- let msg = packet.msg.get().replace(None).unwrap();
-- drop(Box::from_raw(token.zero.0 as *mut Packet<T>));
-+ drop(Box::from_raw(packet as *const Packet<T> as *mut Packet<T>));
- Ok(msg)
- }
- }
-@@ -202,7 +189,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -226,7 +213,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting receiver, pair up with it.
- if let Some(operation) = inner.receivers.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- self.write(token, msg).ok().unwrap();
-@@ -241,10 +228,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a receiver wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::message_on_stack(msg);
-+ let packet = Packet::<T>::message_on_stack(msg);
- inner
- .senders
-- .register_with_packet(oper, &mut packet as *mut Packet<T> as *mut (), cx);
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.receivers.notify();
- drop(inner);
-
-@@ -279,7 +266,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe { self.read(token).map_err(|_| TryRecvError::Disconnected) }
- } else if inner.is_disconnected {
-@@ -296,7 +283,7 @@ impl<T> Channel<T> {
-
- // If there's a waiting sender, pair up with it.
- if let Some(operation) = inner.senders.try_select() {
-- token.zero.0 = operation.packet;
-+ token.zero = operation.packet;
- drop(inner);
- unsafe {
- return self.read(token).map_err(|_| RecvTimeoutError::Disconnected);
-@@ -310,12 +297,10 @@ impl<T> Channel<T> {
- Context::with(|cx| {
- // Prepare for blocking until a sender wakes us up.
- let oper = Operation::hook(token);
-- let mut packet = Packet::<T>::empty_on_stack();
-- inner.receivers.register_with_packet(
-- oper,
-- &mut packet as *mut Packet<T> as *mut (),
-- cx,
-- );
-+ let packet = Packet::<T>::empty_on_stack();
-+ inner
-+ .receivers
-+ .register_with_packet(oper, &packet as *const Packet<T> as usize, cx);
- inner.senders.notify();
- drop(inner);
-
-@@ -400,7 +385,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- let mut inner = self.0.inner.lock();
- inner
- .receivers
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.senders.notify();
- inner.senders.can_select() || inner.is_disconnected
- }
-@@ -414,7 +399,7 @@ impl<T> SelectHandle for Receiver<'_, T>
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-@@ -450,7 +435,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- let mut inner = self.0.inner.lock();
- inner
- .senders
-- .register_with_packet(oper, packet as *mut (), cx);
-+ .register_with_packet(oper, packet as usize, cx);
- inner.receivers.notify();
- inner.receivers.can_select() || inner.is_disconnected
- }
-@@ -464,7 +449,7 @@ impl<T> SelectHandle for Sender<'_, T> {
- }
-
- fn accept(&self, token: &mut Token, cx: &Context) -> bool {
-- token.zero.0 = cx.wait_packet();
-+ token.zero = cx.wait_packet();
- true
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/select.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -19,7 +19,6 @@ use crate::utils;
- /// `read` or `write`.
- ///
- /// Each field contains data associated with a specific channel flavor.
--// This is a private API that is used by the select macro.
- #[derive(Debug, Default)]
- pub struct Token {
- pub at: flavors::at::AtToken,
-@@ -94,7 +93,6 @@ impl Into<usize> for Selected {
- ///
- /// This is a handle that assists select in executing an operation, registration, deciding on the
- /// appropriate deadline for blocking, etc.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- pub trait SelectHandle {
- /// Attempts to select an operation and returns `true` on success.
- fn try_select(&self, token: &mut Token) -> bool;
-@@ -444,7 +442,6 @@ fn run_ready(
- }
-
- /// Attempts to select one of the operations without blocking.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn try_select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -461,7 +458,6 @@ pub fn try_select<'a>(
- }
-
- /// Blocks until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-@@ -480,7 +476,6 @@ pub fn select<'a>(
- }
-
- /// Blocks for a limited time until one of the operations becomes ready and selects it.
--// This is a private API (exposed inside crossbeam_channel::internal module) that is used by the select macro.
- #[inline]
- pub fn select_timeout<'a>(
- handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/src/waker.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,6 +1,5 @@
- //! Waking mechanism for threads blocked on channel operations.
-
--use std::ptr;
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::thread::{self, ThreadId};
-
-@@ -14,7 +13,7 @@ pub(crate) struct Entry {
- pub(crate) oper: Operation,
-
- /// Optional packet.
-- pub(crate) packet: *mut (),
-+ pub(crate) packet: usize,
-
- /// Context associated with the thread owning this operation.
- pub(crate) cx: Context,
-@@ -45,12 +44,12 @@ impl Waker {
- /// Registers a select operation.
- #[inline]
- pub(crate) fn register(&mut self, oper: Operation, cx: &Context) {
-- self.register_with_packet(oper, ptr::null_mut(), cx);
-+ self.register_with_packet(oper, 0, cx);
- }
-
- /// Registers a select operation and a packet.
- #[inline]
-- pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: *mut (), cx: &Context) {
-+ pub(crate) fn register_with_packet(&mut self, oper: Operation, packet: usize, cx: &Context) {
- self.selectors.push(Entry {
- oper,
- packet,
-@@ -77,26 +76,34 @@ impl Waker {
- /// Attempts to find another thread's entry, select the operation, and wake it up.
- #[inline]
- pub(crate) fn try_select(&mut self) -> Option<Entry> {
-- self.selectors
-- .iter()
-- .position(|selector| {
-+ let mut entry = None;
-+
-+ if !self.selectors.is_empty() {
-+ let thread_id = current_thread_id();
-+
-+ for i in 0..self.selectors.len() {
- // Does the entry belong to a different thread?
-- selector.cx.thread_id() != current_thread_id()
-- && selector // Try selecting this operation.
-- .cx
-- .try_select(Selected::Operation(selector.oper))
-- .is_ok()
-- && {
-+ if self.selectors[i].cx.thread_id() != thread_id {
-+ // Try selecting this operation.
-+ let sel = Selected::Operation(self.selectors[i].oper);
-+ let res = self.selectors[i].cx.try_select(sel);
-+
-+ if res.is_ok() {
- // Provide the packet.
-- selector.cx.store_packet(selector.packet);
-+ self.selectors[i].cx.store_packet(self.selectors[i].packet);
- // Wake the thread up.
-- selector.cx.unpark();
-- true
-+ self.selectors[i].cx.unpark();
-+
-+ // Remove the entry from the queue to keep it clean and improve
-+ // performance.
-+ entry = Some(self.selectors.remove(i));
-+ break;
- }
-- })
-- // Remove the entry from the queue to keep it clean and improve
-- // performance.
-- .map(|pos| self.selectors.remove(pos))
-+ }
-+ }
-+ }
-+
-+ entry
- }
-
- /// Returns `true` if there is an entry which can be selected by the current thread.
-@@ -118,7 +125,7 @@ impl Waker {
- pub(crate) fn watch(&mut self, oper: Operation, cx: &Context) {
- self.observers.push(Entry {
- oper,
-- packet: ptr::null_mut(),
-+ packet: 0,
- cx: cx.clone(),
- });
- }
-@@ -262,7 +269,7 @@ impl SyncWaker {
- impl Drop for SyncWaker {
- #[inline]
- fn drop(&mut self) {
-- debug_assert!(self.is_empty.load(Ordering::SeqCst));
-+ debug_assert_eq!(self.is_empty.load(Ordering::SeqCst), true);
- }
- }
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/after.rs 2022-03-16 09:33:31.993159893 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the after channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -58,20 +56,20 @@ fn len_empty_full() {
- let r = after(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -213,7 +211,7 @@ fn select() {
- break;
- }
- i => {
-- oper.recv(v[i]).unwrap();
-+ oper.recv(&v[i]).unwrap();
- hits.fetch_add(1, Ordering::SeqCst);
- }
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/array.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the array channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::any::Any;
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
-@@ -45,38 +43,38 @@ fn len_empty_full() {
- let (s, r) = bounded(2);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 2);
-- assert!(!s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 2);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/golang.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -9,8 +9,6 @@
- //! - https://golang.org/LICENSE
- //! - https://golang.org/PATENTS
-
--#![allow(clippy::mutex_atomic, clippy::redundant_clone)]
--
- use std::alloc::{GlobalAlloc, Layout, System};
- use std::any::Any;
- use std::cell::Cell;
-@@ -178,7 +176,7 @@ unsafe impl GlobalAlloc for Counter {
- if !ret.is_null() {
- ALLOCATED.fetch_add(layout.size(), SeqCst);
- }
-- ret
-+ return ret;
- }
-
- unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-@@ -234,9 +232,6 @@ macro_rules! go {
- mod doubleselect {
- use super::*;
-
-- #[cfg(miri)]
-- const ITERATIONS: i32 = 100;
-- #[cfg(not(miri))]
- const ITERATIONS: i32 = 10_000;
-
- fn sender(n: i32, c1: Chan<i32>, c2: Chan<i32>, c3: Chan<i32>, c4: Chan<i32>) {
-@@ -696,11 +691,6 @@ mod select {
- mod select2 {
- use super::*;
-
-- #[cfg(miri)]
-- const N: i32 = 1000;
-- #[cfg(not(miri))]
-- const N: i32 = 100000;
--
- #[test]
- fn main() {
- fn sender(c: &Chan<i32>, n: i32) {
-@@ -712,7 +702,9 @@ mod select2 {
- fn receiver(c: &Chan<i32>, dummy: &Chan<i32>, n: i32) {
- for _ in 0..n {
- select! {
-- recv(c.rx()) -> _ => {}
-+ recv(c.rx()) -> _ => {
-+ ()
-+ }
- recv(dummy.rx()) -> _ => {
- panic!("dummy");
- }
-@@ -725,18 +717,15 @@ mod select2 {
-
- ALLOCATED.store(0, SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
- let alloc = ALLOCATED.load(SeqCst);
-
-- go!(c, sender(&c, N));
-- receiver(&c, &dummy, N);
-+ go!(c, sender(&c, 100000));
-+ receiver(&c, &dummy, 100000);
-
-- assert!(
-- !(ALLOCATED.load(SeqCst) > alloc
-- && (ALLOCATED.load(SeqCst) - alloc) > (N as usize + 10000))
-- )
-+ assert!(!(ALLOCATED.load(SeqCst) > alloc && (ALLOCATED.load(SeqCst) - alloc) > 110000))
- }
- }
-
-@@ -924,9 +913,6 @@ mod chan_test {
-
- #[test]
- fn test_chan() {
-- #[cfg(miri)]
-- const N: i32 = 20;
-- #[cfg(not(miri))]
- const N: i32 = 200;
-
- for cap in 0..N {
-@@ -1066,9 +1052,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_recv_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- for _ in 0..N {
-@@ -1090,9 +1073,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1126,9 +1106,6 @@ mod chan_test {
-
- #[test]
- fn test_nonblock_select_race2() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
-
- let done = make::<bool>(1);
-@@ -1165,11 +1142,6 @@ mod chan_test {
- // Ensure that send/recv on the same chan in select
- // does not crash nor deadlock.
-
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 1000;
--
- for &cap in &[0, 10] {
- let wg = WaitGroup::new();
- wg.add(2);
-@@ -1179,7 +1151,7 @@ mod chan_test {
- let p = p;
- go!(wg, p, c, {
- defer! { wg.done() }
-- for i in 0..N {
-+ for i in 0..1000 {
- if p == 0 || i % 2 == 0 {
- select! {
- send(c.tx(), p) -> _ => {}
-@@ -1208,11 +1180,6 @@ mod chan_test {
-
- #[test]
- fn test_select_stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let c = vec![
- make::<i32>(0),
- make::<i32>(0),
-@@ -1220,6 +1187,8 @@ mod chan_test {
- make::<i32>(3),
- ];
-
-+ const N: usize = 10000;
-+
- // There are 4 goroutines that send N values on each of the chans,
- // + 4 goroutines that receive N values on each of the chans,
- // + 1 goroutine that sends N values on each of the chans in a single select,
-@@ -1317,9 +1286,6 @@ mod chan_test {
-
- #[test]
- fn test_select_fairness() {
-- #[cfg(miri)]
-- const TRIALS: usize = 100;
-- #[cfg(not(miri))]
- const TRIALS: usize = 10000;
-
- let c1 = make::<u8>(TRIALS + 1);
-@@ -1403,9 +1369,6 @@ mod chan_test {
-
- #[test]
- fn test_pseudo_random_send() {
-- #[cfg(miri)]
-- const N: usize = 20;
-- #[cfg(not(miri))]
- const N: usize = 100;
-
- for cap in 0..N {
-@@ -1449,9 +1412,6 @@ mod chan_test {
- #[test]
- fn test_multi_consumer() {
- const NWORK: usize = 23;
-- #[cfg(miri)]
-- const NITER: usize = 100;
-- #[cfg(not(miri))]
- const NITER: usize = 271828;
-
- let pn = [2, 3, 7, 11, 13, 17, 19, 23, 27, 31];
-@@ -1550,9 +1510,6 @@ mod chan1 {
- use super::*;
-
- // sent messages
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
- const N: usize = 1000;
- // receiving "goroutines"
- const M: usize = 10;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/iter.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -93,7 +93,7 @@ fn recv_into_iter_owned() {
-
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -106,5 +106,5 @@ fn recv_into_iter_borrowed() {
- let mut iter = (&r).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/list.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -41,29 +41,29 @@ fn len_empty_full() {
- let (s, r) = unbounded();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- s.send(()).unwrap();
-
- assert_eq!(s.len(), 1);
-- assert!(!s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), false);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), false);
-
- r.recv().unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(!s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), false);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-@@ -239,9 +239,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = unbounded();
-@@ -264,9 +261,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -301,9 +295,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -319,9 +310,6 @@ fn stress_oneshot() {
-
- #[test]
- fn stress_iter() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (request_s, request_r) = unbounded();
-@@ -383,11 +371,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -401,7 +386,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..10_000);
- let additional = rng.gen_range(0..1000);
-
-@@ -436,9 +421,6 @@ fn drops() {
-
- #[test]
- fn linearizable() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -459,9 +441,6 @@ fn linearizable() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -484,9 +463,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = unbounded();
-@@ -520,9 +496,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/mpsc.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -20,12 +20,6 @@
- //! - https://github.com/rust-lang/rust/blob/master/COPYRIGHT
- //! - https://www.rust-lang.org/en-US/legal.html
-
--#![allow(
-- clippy::drop_copy,
-- clippy::match_single_binding,
-- clippy::redundant_clone
--)]
--
- use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
- use std::sync::mpsc::{SendError, TrySendError};
- use std::thread::JoinHandle;
-@@ -182,7 +176,7 @@ macro_rules! select {
- ) => ({
- cc::crossbeam_channel_internal! {
- $(
-- $meth(($rx).inner) -> res => {
-+ recv(($rx).inner) -> res => {
- let $name = res.map_err(|_| ::std::sync::mpsc::RecvError);
- $code
- }
-@@ -320,18 +314,13 @@ mod channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
-- const COUNT: usize = 10000;
--
- let (tx, rx) = channel::<i32>();
- let t = thread::spawn(move || {
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..COUNT {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().ok().unwrap();
-@@ -339,9 +328,6 @@ mod channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 500;
-- #[cfg(not(miri))]
- const AMT: u32 = 10000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = channel::<i32>();
-@@ -350,7 +336,10 @@ mod channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- });
-
- let mut ts = Vec::with_capacity(NTHREADS as usize);
-@@ -746,17 +735,12 @@ mod channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
- let (tx, rx) = channel();
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -896,7 +880,7 @@ mod channel_tests {
- };
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -908,7 +892,7 @@ mod channel_tests {
- let mut iter = (&rx).into_iter();
- assert_eq!(iter.next().unwrap(), 1);
- assert_eq!(iter.next().unwrap(), 2);
-- assert!(iter.next().is_none());
-+ assert_eq!(iter.next().is_none(), true);
- }
-
- #[test]
-@@ -1095,18 +1079,13 @@ mod sync_channel_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-- for _ in 0..N {
-+ for _ in 0..10000 {
- assert_eq!(rx.recv().unwrap(), 1);
- }
- t.join().unwrap();
-@@ -1114,15 +1093,10 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_recv_timeout_two_threads() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- let (tx, rx) = sync_channel::<i32>(0);
-
- let t = thread::spawn(move || {
-- for _ in 0..N {
-+ for _ in 0..10000 {
- tx.send(1).unwrap();
- }
- });
-@@ -1139,15 +1113,12 @@ mod sync_channel_tests {
- }
- }
-
-- assert_eq!(recv_count, N);
-+ assert_eq!(recv_count, 10000);
- t.join().unwrap();
- }
-
- #[test]
- fn stress_recv_timeout_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1194,9 +1165,6 @@ mod sync_channel_tests {
-
- #[test]
- fn stress_shared() {
-- #[cfg(miri)]
-- const AMT: u32 = 100;
-- #[cfg(not(miri))]
- const AMT: u32 = 1000;
- const NTHREADS: u32 = 8;
- let (tx, rx) = sync_channel::<i32>(0);
-@@ -1206,7 +1174,10 @@ mod sync_channel_tests {
- for _ in 0..AMT * NTHREADS {
- assert_eq!(rx.recv().unwrap(), 1);
- }
-- assert!(rx.try_recv().is_err());
-+ match rx.try_recv() {
-+ Ok(..) => panic!(),
-+ _ => {}
-+ }
- dtx.send(()).unwrap();
- });
-
-@@ -1478,17 +1449,12 @@ mod sync_channel_tests {
-
- #[test]
- fn recv_a_lot() {
-- #[cfg(miri)]
-- const N: usize = 100;
-- #[cfg(not(miri))]
-- const N: usize = 10000;
--
- // Regression test that we don't run out of stack in scheduler context
-- let (tx, rx) = sync_channel(N);
-- for _ in 0..N {
-+ let (tx, rx) = sync_channel(10000);
-+ for _ in 0..10000 {
- tx.send(()).unwrap();
- }
-- for _ in 0..N {
-+ for _ in 0..10000 {
- rx.recv().unwrap();
- }
- }
-@@ -1826,11 +1792,7 @@ mod select_tests {
-
- #[test]
- fn stress() {
-- #[cfg(miri)]
-- const AMT: i32 = 100;
-- #[cfg(not(miri))]
- const AMT: i32 = 10000;
--
- let (tx1, rx1) = channel::<i32>();
- let (tx2, rx2) = channel::<i32>();
- let (tx3, rx3) = channel::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/never.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -65,8 +65,8 @@ fn capacity() {
- fn len_empty_full() {
- let r = never::<i32>();
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/ready.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel readiness using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -492,9 +490,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -532,9 +527,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -569,9 +561,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -677,9 +666,6 @@ fn send_recv_same_channel() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -736,9 +722,6 @@ fn channel_through_channel() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -784,9 +767,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s1, r1) = unbounded::<()>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select_macro.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,6 @@
- //! Tests for the `select!` macro.
-
- #![forbid(unsafe_code)] // select! is safe.
--#![allow(clippy::drop_copy, clippy::match_single_binding)]
-
- use std::any::Any;
- use std::cell::Cell;
-@@ -284,7 +283,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -487,9 +485,6 @@ fn panic_receiver() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -523,9 +518,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -556,9 +548,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -692,9 +681,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -740,9 +726,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_default() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -787,9 +770,6 @@ fn linearizable_default() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -834,9 +814,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -861,9 +838,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -901,9 +875,6 @@ fn fairness2() {
-
- #[test]
- fn fairness_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -926,9 +897,6 @@ fn fairness_recv() {
-
- #[test]
- fn fairness_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, _r1) = bounded::<()>(COUNT);
-@@ -944,7 +912,6 @@ fn fairness_send() {
- assert!(hits.iter().all(|x| *x >= COUNT / 4));
- }
-
--#[allow(clippy::or_fun_call)] // This is intentional.
- #[test]
- fn references() {
- let (s, r) = unbounded::<i32>();
-@@ -991,7 +958,6 @@ fn case_blocks() {
- drop(s);
- }
-
--#[allow(clippy::redundant_closure_call)] // This is intentional.
- #[test]
- fn move_handles() {
- let (s, r) = unbounded::<i32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/select.rs 2022-03-16 09:33:31.994159927 +0100
-@@ -1,7 +1,5 @@
- //! Tests for channel selection using the `Select` struct.
-
--#![allow(clippy::drop_copy)]
--
- use std::any::Any;
- use std::cell::Cell;
- use std::thread;
-@@ -408,7 +406,6 @@ fn both_ready() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn loop_try() {
- const RUNS: usize = 20;
-@@ -693,9 +690,6 @@ fn nesting() {
-
- #[test]
- fn stress_recv() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded();
-@@ -734,9 +728,6 @@ fn stress_recv() {
-
- #[test]
- fn stress_send() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -772,9 +763,6 @@ fn stress_send() {
-
- #[test]
- fn stress_mixed() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-@@ -907,12 +895,12 @@ fn matching() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -933,12 +921,12 @@ fn matching_with_leftover() {
- for i in 0..THREADS {
- scope.spawn(move |_| {
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -952,9 +940,6 @@ fn matching_with_leftover() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-@@ -1013,9 +998,6 @@ fn channel_through_channel() {
-
- #[test]
- fn linearizable_try() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1068,9 +1050,6 @@ fn linearizable_try() {
-
- #[test]
- fn linearizable_timeout() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- for step in 0..2 {
-@@ -1123,9 +1102,6 @@ fn linearizable_timeout() {
-
- #[test]
- fn fairness1() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(COUNT);
-@@ -1172,9 +1148,6 @@ fn fairness1() {
-
- #[test]
- fn fairness2() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = unbounded::<()>();
-@@ -1239,8 +1212,8 @@ fn sync_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
- let sel = &sel;
-
- scope(|scope| {
-@@ -1249,8 +1222,8 @@ fn sync_and_clone() {
- let mut sel = sel.clone();
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1268,8 +1241,8 @@ fn send_and_clone() {
- let (s, r) = &bounded::<usize>(0);
-
- let mut sel = Select::new();
-- let oper1 = sel.recv(r);
-- let oper2 = sel.send(s);
-+ let oper1 = sel.recv(&r);
-+ let oper2 = sel.send(&s);
-
- scope(|scope| {
- for i in 0..THREADS {
-@@ -1277,8 +1250,8 @@ fn send_and_clone() {
- scope.spawn(move |_| {
- let oper = sel.select();
- match oper.index() {
-- ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)),
-- ix if ix == oper2 => assert!(oper.send(s, i).is_ok()),
-+ ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)),
-+ ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()),
- _ => unreachable!(),
- }
- });
-@@ -1291,9 +1264,6 @@ fn send_and_clone() {
-
- #[test]
- fn reuse() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded(0);
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/thread_locals.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests that make sure accessing thread-locals while exiting the thread doesn't cause panics.
-
--#![cfg(not(miri))] // error: abnormal termination: the evaluated program aborted execution
--
- use std::thread;
- use std::time::Duration;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/tick.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -1,7 +1,5 @@
- //! Tests for the tick channel flavor.
-
--#![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
--
- use std::sync::atomic::AtomicUsize;
- use std::sync::atomic::Ordering;
- use std::thread;
-@@ -80,20 +78,20 @@ fn len_empty_full() {
- let r = tick(ms(50));
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
-
- thread::sleep(ms(100));
-
- assert_eq!(r.len(), 1);
-- assert!(!r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), false);
-+ assert_eq!(r.is_full(), true);
-
- r.try_recv().unwrap();
-
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(!r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), false);
- }
-
- #[test]
-diff -up firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs
---- firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-channel/tests/zero.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -35,11 +35,11 @@ fn len_empty_full() {
- let (s, r) = bounded(0);
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
-
- scope(|scope| {
- scope.spawn(|_| s.send(0).unwrap());
-@@ -48,11 +48,11 @@ fn len_empty_full() {
- .unwrap();
-
- assert_eq!(s.len(), 0);
-- assert!(s.is_empty());
-- assert!(s.is_full());
-+ assert_eq!(s.is_empty(), true);
-+ assert_eq!(s.is_full(), true);
- assert_eq!(r.len(), 0);
-- assert!(r.is_empty());
-- assert!(r.is_full());
-+ assert_eq!(r.is_empty(), true);
-+ assert_eq!(r.is_full(), true);
- }
-
- #[test]
-@@ -187,9 +187,6 @@ fn send_timeout() {
-
- #[test]
- fn len() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
-
- let (s, r) = bounded(0);
-@@ -252,9 +249,6 @@ fn disconnect_wakes_receiver() {
-
- #[test]
- fn spsc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
-
- let (s, r) = bounded(0);
-@@ -277,9 +271,6 @@ fn spsc() {
-
- #[test]
- fn mpmc() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 25_000;
- const THREADS: usize = 4;
-
-@@ -312,9 +303,6 @@ fn mpmc() {
-
- #[test]
- fn stress_oneshot() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- for _ in 0..COUNT {
-@@ -328,7 +316,6 @@ fn stress_oneshot() {
- }
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn stress_iter() {
- const COUNT: usize = 1000;
-@@ -396,11 +383,8 @@ fn stress_timeout_two_threads() {
- .unwrap();
- }
-
--#[cfg_attr(miri, ignore)] // Miri is too slow
- #[test]
- fn drops() {
-- const RUNS: usize = 100;
--
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
- #[derive(Debug, PartialEq)]
-@@ -414,7 +398,7 @@ fn drops() {
-
- let mut rng = thread_rng();
-
-- for _ in 0..RUNS {
-+ for _ in 0..100 {
- let steps = rng.gen_range(0..3_000);
-
- DROPS.store(0, Ordering::SeqCst);
-@@ -444,9 +428,6 @@ fn drops() {
-
- #[test]
- fn fairness() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s1, r1) = bounded::<()>(0);
-@@ -478,9 +459,6 @@ fn fairness() {
-
- #[test]
- fn fairness_duplicates() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 10_000;
-
- let (s, r) = bounded::<()>(0);
-@@ -539,9 +517,6 @@ fn recv_in_send() {
-
- #[test]
- fn channel_through_channel() {
-- #[cfg(miri)]
-- const COUNT: usize = 100;
-- #[cfg(not(miri))]
- const COUNT: usize = 1000;
-
- type T = Box<dyn Any + Send>;
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/benches/pin.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -8,7 +8,7 @@ use test::Bencher;
-
- #[bench]
- fn single_pin(b: &mut Bencher) {
-- b.iter(epoch::pin);
-+ b.iter(|| epoch::pin());
- }
-
- #[bench]
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/build.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/build.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -4,19 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/.cargo-checksum.json 2022-03-16 09:33:31.995159961 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"40b65a13f12e97a24c838fe2254a3563a5fe00922053ef7256ed4752876614fa","Cargo.lock":"35b1db42b892c01e72ff1f99fc7767e5e47208d083203866337f6f2f7d0738eb","Cargo.toml":"eab75399db818408fd4f45a91919b08e050e56547014816683a269270e292055","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"80f9e65ba04a2ddec7a330172d0b0fbc698e20c221b3d8cdc70cc42e3b9099d1","build.rs":"c8684300062c73e96eae8877d03e145ee95e0cd99d4d933696caa582c08e2416","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic.rs":"631d3062e3c30d8e505fda3a7e2c68a88abf7617881035d6131c39cb8fdddce0","src/collector.rs":"7d636f3f96fafd033298d1c2ab126205438a46deb84895d8e28bea9eef67798a","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"1ee67bd3200d3891076aac8cfc9767abdddc194602f2084d11455484096005ea","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"f3f8131819b2a4ec4d1a6d392c734688324f3ae708bac6745e88f2930657eba1","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"262e0d8f343e97df9e2a738461e4255e339710e81c479e484f9efe517ae47135","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.lock 2022-03-16 09:33:31.995159961 +0100
-@@ -3,15 +3,6 @@
- version = 3
-
- [[package]]
--name = "ansi_term"
--version = "0.12.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
--dependencies = [
-- "winapi",
--]
--
--[[package]]
- name = "autocfg"
- version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -19,9 +10,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffe
-
- [[package]]
- name = "cc"
--version = "1.0.72"
-+version = "1.0.68"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
-
- [[package]]
- name = "cfg-if"
-@@ -31,13 +22,13 @@ checksum = "baf1de4339761588bc0619e3cbc0
-
- [[package]]
- name = "const_fn"
--version = "0.4.9"
-+version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
- dependencies = [
- "cfg-if",
- "const_fn",
-@@ -51,9 +42,9 @@ dependencies = [
-
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
-+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
- "cfg-if",
- "lazy_static",
-@@ -92,9 +83,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
-
- [[package]]
- name = "libc"
--version = "0.2.112"
-+version = "0.2.95"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-+checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
-
- [[package]]
- name = "log"
-@@ -107,76 +98,35 @@ dependencies = [
-
- [[package]]
- name = "loom"
--version = "0.5.4"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
-+checksum = "7aa5348dc45fa5f2419b6dd4ea20345e6b01b1fcc9d176a322eada1ac3f382ba"
- dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
-- "tracing",
-- "tracing-subscriber",
--]
--
--[[package]]
--name = "matchers"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
--dependencies = [
-- "regex-automata",
- ]
-
- [[package]]
- name = "memoffset"
--version = "0.6.5"
-+version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
- dependencies = [
- "autocfg",
- ]
-
- [[package]]
--name = "once_cell"
--version = "1.9.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
--
--[[package]]
--name = "pin-project-lite"
--version = "0.2.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
--
--[[package]]
- name = "ppv-lite86"
--version = "0.2.16"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
--
--[[package]]
--name = "proc-macro2"
--version = "1.0.36"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
--dependencies = [
-- "unicode-xid",
--]
--
--[[package]]
--name = "quote"
--version = "1.0.14"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
--dependencies = [
-- "proc-macro2",
--]
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
- [[package]]
- name = "rand"
--version = "0.8.4"
-+version = "0.8.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
- dependencies = [
- "libc",
- "rand_chacha",
-@@ -186,9 +136,9 @@ dependencies = [
-
- [[package]]
- name = "rand_chacha"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
- dependencies = [
- "ppv-lite86",
- "rand_core",
-@@ -196,51 +146,27 @@ dependencies = [
-
- [[package]]
- name = "rand_core"
--version = "0.6.3"
-+version = "0.6.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
- dependencies = [
- "getrandom",
- ]
-
- [[package]]
- name = "rand_hc"
--version = "0.3.1"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
- dependencies = [
- "rand_core",
- ]
-
- [[package]]
--name = "regex"
--version = "1.5.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-automata"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
--dependencies = [
-- "regex-syntax",
--]
--
--[[package]]
--name = "regex-syntax"
--version = "0.6.25"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
--
--[[package]]
- name = "rustversion"
--version = "1.0.6"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-+checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
-
- [[package]]
- name = "scoped-tls"
-@@ -255,108 +181,6 @@ source = "registry+https://github.com/ru
- checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
- [[package]]
--name = "sharded-slab"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "smallvec"
--version = "1.7.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
--
--[[package]]
--name = "syn"
--version = "1.0.85"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "unicode-xid",
--]
--
--[[package]]
--name = "thread_local"
--version = "1.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
--dependencies = [
-- "once_cell",
--]
--
--[[package]]
--name = "tracing"
--version = "0.1.29"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
--dependencies = [
-- "cfg-if",
-- "pin-project-lite",
-- "tracing-attributes",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-attributes"
--version = "0.1.18"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn",
--]
--
--[[package]]
--name = "tracing-core"
--version = "0.1.21"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
--dependencies = [
-- "lazy_static",
--]
--
--[[package]]
--name = "tracing-log"
--version = "0.1.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
--dependencies = [
-- "lazy_static",
-- "log",
-- "tracing-core",
--]
--
--[[package]]
--name = "tracing-subscriber"
--version = "0.3.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
--dependencies = [
-- "ansi_term",
-- "lazy_static",
-- "matchers",
-- "regex",
-- "sharded-slab",
-- "smallvec",
-- "thread_local",
-- "tracing",
-- "tracing-core",
-- "tracing-log",
--]
--
--[[package]]
--name = "unicode-xid"
--version = "0.2.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
--
--[[package]]
- name = "wasi"
- version = "0.10.2+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/Cargo.toml 2022-03-16 09:33:31.995159961 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-epoch"
--version = "0.9.6"
-+version = "0.9.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Epoch-based garbage collection"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch"
-+documentation = "https://docs.rs/crossbeam-epoch"
- keywords = ["lock-free", "rcu", "atomic", "garbage"]
- categories = ["concurrency", "memory-management", "no-std"]
- license = "MIT OR Apache-2.0"
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/CHANGELOG.md 2022-03-16 09:33:31.995159961 +0100
-@@ -1,16 +1,12 @@
--# Version 0.9.6
--
--- Add `Atomic::fetch_update`. (#706)
--
- # Version 0.9.5
-
--- Fix UB in `Pointable` impl of `[MaybeUninit<T>]`. (#694)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
--- Fix breakage with nightly feature due to rust-lang/rust#84510. (#692)
-+- Fix UB in `Pointable` impl of `[MaybeUninit<T>]` (#694)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-+- Fix breakage with nightly feature due to rust-lang/rust#84510 (#692)
-
- # Version 0.9.4
-
--- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation. (#690)
-+- Fix UB in `<[MaybeUninit<T>] as Pointable>::init` when global allocator failed allocation (#690)
- - Bump `loom` dependency to version 0.5. (#686)
-
- # Version 0.9.3
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/no_atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/atomic.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -562,65 +562,6 @@ impl<T: ?Sized + Pointable> Atomic<T> {
- })
- }
-
-- /// Fetches the pointer, and then applies a function to it that returns a new value.
-- /// Returns a `Result` of `Ok(previous_value)` if the function returned `Some`, else `Err(_)`.
-- ///
-- /// Note that the given function may be called multiple times if the value has been changed by
-- /// other threads in the meantime, as long as the function returns `Some(_)`, but the function
-- /// will have been applied only once to the stored value.
-- ///
-- /// `fetch_update` takes two [`Ordering`] arguments to describe the memory
-- /// ordering of this operation. The first describes the required ordering for
-- /// when the operation finally succeeds while the second describes the
-- /// required ordering for loads. These correspond to the success and failure
-- /// orderings of [`Atomic::compare_exchange`] respectively.
-- ///
-- /// Using [`Acquire`] as success ordering makes the store part of this
-- /// operation [`Relaxed`], and using [`Release`] makes the final successful
-- /// load [`Relaxed`]. The (failed) load ordering can only be [`SeqCst`],
-- /// [`Acquire`] or [`Relaxed`] and must be equivalent to or weaker than the
-- /// success ordering.
-- ///
-- /// [`Relaxed`]: Ordering::Relaxed
-- /// [`Acquire`]: Ordering::Acquire
-- /// [`Release`]: Ordering::Release
-- /// [`SeqCst`]: Ordering::SeqCst
-- ///
-- /// # Examples
-- ///
-- /// ```
-- /// use crossbeam_epoch::{self as epoch, Atomic};
-- /// use std::sync::atomic::Ordering::SeqCst;
-- ///
-- /// let a = Atomic::new(1234);
-- /// let guard = &epoch::pin();
-- ///
-- /// let res1 = a.fetch_update(SeqCst, SeqCst, guard, |x| Some(x.with_tag(1)));
-- /// assert!(res1.is_ok());
-- ///
-- /// let res2 = a.fetch_update(SeqCst, SeqCst, guard, |x| None);
-- /// assert!(res2.is_err());
-- /// ```
-- pub fn fetch_update<'g, F>(
-- &self,
-- set_order: Ordering,
-- fail_order: Ordering,
-- guard: &'g Guard,
-- mut func: F,
-- ) -> Result<Shared<'g, T>, Shared<'g, T>>
-- where
-- F: FnMut(Shared<'g, T>) -> Option<Shared<'g, T>>,
-- {
-- let mut prev = self.load(fail_order, guard);
-- while let Some(next) = func(prev) {
-- match self.compare_exchange_weak(prev, next, set_order, fail_order, guard) {
-- Ok(shared) => return Ok(shared),
-- Err(next_prev) => prev = next_prev.current,
-- }
-- }
-- Err(prev)
-- }
--
- /// Stores the pointer `new` (either `Shared` or `Owned`) into the atomic pointer if the current
- /// value is the same as `current`. The tag is also taken into account, so two pointers to the
- /// same object, but with different tags, will not be considered equal.
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/collector.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -178,18 +178,13 @@ mod tests {
-
- #[test]
- fn pin_holds_advance() {
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 500_000;
--
- let collector = Collector::new();
-
- thread::scope(|scope| {
- for _ in 0..NUM_THREADS {
- scope.spawn(|_| {
- let handle = collector.register();
-- for _ in 0..N {
-+ for _ in 0..500_000 {
- let guard = &handle.pin();
-
- let before = collector.global.epoch.load(Ordering::Relaxed);
-@@ -207,9 +202,6 @@ mod tests {
- #[cfg(not(crossbeam_sanitize))] // TODO: assertions failed due to `cfg(crossbeam_sanitize)` reduce `internal::MAX_OBJECTS`
- #[test]
- fn incremental() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -238,16 +230,12 @@ mod tests {
- let guard = &handle.pin();
- collector.global.collect(guard);
- }
-- assert!(DESTROYS.load(Ordering::Relaxed) == COUNT);
-+ assert!(DESTROYS.load(Ordering::Relaxed) == 100_000);
- }
-
- #[test]
- fn buffering() {
- const COUNT: usize = 10;
-- #[cfg(miri)]
-- const N: usize = 500;
-- #[cfg(not(miri))]
-- const N: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
- let collector = Collector::new();
-@@ -264,7 +252,7 @@ mod tests {
- }
- }
-
-- for _ in 0..N {
-+ for _ in 0..100_000 {
- collector.global.collect(&handle.pin());
- }
- assert!(DESTROYS.load(Ordering::Relaxed) < COUNT);
-@@ -280,9 +268,6 @@ mod tests {
-
- #[test]
- fn count_drops() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -316,9 +301,6 @@ mod tests {
-
- #[test]
- fn count_destroy() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -385,9 +367,6 @@ mod tests {
-
- #[test]
- fn destroy_array() {
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DESTROYS: AtomicUsize = AtomicUsize::new(0);
-
-@@ -423,9 +402,6 @@ mod tests {
- #[test]
- fn stress() {
- const THREADS: usize = 8;
-- #[cfg(miri)]
-- const COUNT: usize = 500;
-- #[cfg(not(miri))]
- const COUNT: usize = 100_000;
- static DROPS: AtomicUsize = AtomicUsize::new(0);
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/deferred.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -81,8 +81,6 @@ impl Deferred {
-
- #[cfg(all(test, not(crossbeam_loom)))]
- mod tests {
-- #![allow(clippy::drop_copy)]
--
- use super::Deferred;
- use std::cell::Cell;
-
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/internal.rs 2022-03-16 09:33:31.995159961 +0100
-@@ -101,7 +101,7 @@ impl Bag {
-
- /// Seals the bag with the given epoch.
- fn seal(self, epoch: Epoch) -> SealedBag {
-- SealedBag { epoch, _bag: self }
-+ SealedBag { epoch, bag: self }
- }
- }
-
-@@ -216,7 +216,7 @@ fn no_op_func() {}
- #[derive(Default, Debug)]
- struct SealedBag {
- epoch: Epoch,
-- _bag: Bag,
-+ bag: Bag,
- }
-
- /// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.
-@@ -311,7 +311,7 @@ impl Global {
- // TODO(stjepang): `Local`s are stored in a linked list because linked lists are fairly
- // easy to implement in a lock-free manner. However, traversal can be slow due to cache
- // misses and data dependencies. We should experiment with other data structures as well.
-- for local in self.locals.iter(guard) {
-+ for local in self.locals.iter(&guard) {
- match local {
- Err(IterError::Stalled) => {
- // A concurrent thread stalled this iteration. That thread might also try to
-diff -up firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs
---- firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-epoch/src/sync/queue.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -259,9 +259,6 @@ mod test {
- }
- }
-
-- #[cfg(miri)]
-- const CONC_COUNT: i64 = 1000;
-- #[cfg(not(miri))]
- const CONC_COUNT: i64 = 1000000;
-
- #[test]
-@@ -425,8 +422,8 @@ mod test {
-
- let mut vl2 = vl.clone();
- let mut vr2 = vr.clone();
-- vl2.sort_unstable();
-- vr2.sort_unstable();
-+ vl2.sort();
-+ vr2.sort();
-
- assert_eq!(vl, vl2);
- assert_eq!(vr, vr2);
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/build.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/build.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/build.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -4,31 +4,9 @@ use std::env;
-
- include!("no_atomic.rs");
-
--// The rustc-cfg listed below are considered public API, but it is *unstable*
--// and outside of the normal semver guarantees:
--//
--// - `crossbeam_no_atomic_cas`
--// Assume the target does *not* support atomic CAS operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic`
--// Assume the target does *not* support any atomic operations.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// - `crossbeam_no_atomic_64`
--// Assume the target does *not* support AtomicU64/AtomicI64.
--// This is usually detected automatically by the build script, but you may
--// need to enable it manually when building for custom targets or using
--// non-cargo build systems that don't run the build script.
--//
--// With the exceptions mentioned above, the rustc-cfg strings below are
--// *not* public API. Please let us know by opening a GitHub issue if your build
--// environment requires some way to enable these cfgs other than by executing
--// our build script.
-+// The rustc-cfg strings below are *not* public API. Please let us know by
-+// opening a GitHub issue if your build environment requires some way to enable
-+// these cfgs other than by executing our build script.
- fn main() {
- let target = match env::var("TARGET") {
- Ok(target) => target,
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json
---- firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/.cargo-checksum.json 2022-03-16 09:33:31.996159993 +0100
-@@ -1 +1 @@
--{"files":{"CHANGELOG.md":"097eb3484f4f13471dfe6879ce61450cc60d4453aecb924f38a8f0e4af593cdd","Cargo.toml":"2734493ab832f12a4f849c333d2dd11760c6ce614b88355da21118f77acdcd70","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"39cf39e855e52559c8f68880a02b3e2778ae2d8f089650af1b3e34a85898aed7","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic/atomic_cell.rs":"9d0785073f506b75c110270947f6a8367ead7faaf29c507d4ede37125310cff6","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"ba2e34ed1e27f0d0d4f1bb8a5feb4eb8131f756adb27a719de52c26ee7b86b9c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"}
-\ No newline at end of file
-+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
-\ No newline at end of file
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml
---- firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/Cargo.toml 2022-03-16 09:33:31.996159993 +0100
-@@ -3,19 +3,21 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g., crates.io) dependencies.
-+# to registry (e.g., crates.io) dependencies
- #
--# If you are reading this file be aware that the original Cargo.toml
--# will likely look very different (and much more reasonable).
--# See Cargo.toml.orig for the original contents.
-+# If you believe there's an error in this file please file an
-+# issue against the rust-lang/cargo repository. If you're
-+# editing this file be aware that the upstream Cargo.toml
-+# will likely look very different (and much more reasonable)
-
- [package]
- edition = "2018"
--rust-version = "1.36"
- name = "crossbeam-utils"
--version = "0.8.6"
-+version = "0.8.5"
-+authors = ["The Crossbeam Project Developers"]
- description = "Utilities for concurrent programming"
- homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
-+documentation = "https://docs.rs/crossbeam-utils"
- keywords = ["scoped", "thread", "atomic", "cache"]
- categories = ["algorithms", "concurrency", "data-structures", "no-std"]
- license = "MIT OR Apache-2.0"
-@@ -29,9 +31,6 @@ optional = true
- [dev-dependencies.rand]
- version = "0.8"
-
--[dev-dependencies.rustversion]
--version = "1"
--
- [features]
- default = ["std"]
- nightly = []
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md
---- firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/CHANGELOG.md 2022-03-16 09:33:31.996159993 +0100
-@@ -1,12 +1,7 @@
--# Version 0.8.6
--
--- Re-add `AtomicCell<{i,u}64>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0 on targets that do not support `Atomic{I,U}64`. (#767)
--- Re-add `AtomicCell<{i,u}128>::{fetch_add,fetch_sub,fetch_and,fetch_or,fetch_xor}` that were accidentally removed in 0.8.0. (#767)
--
- # Version 0.8.5
-
--- Add `AtomicCell::fetch_update`. (#704)
--- Support targets that do not have atomic CAS on stable Rust. (#698)
-+- Add `AtomicCell::fetch_update` (#704)
-+- Support targets that do not have atomic CAS on stable Rust (#698)
-
- # Version 0.8.4
-
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/no_atomic.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -3,8 +3,6 @@
-
- const NO_ATOMIC_CAS: &[&str] = &[
- "avr-unknown-gnu-atmega328",
-- "bpfeb-unknown-none",
-- "bpfel-unknown-none",
- "msp430-none-elf",
- "riscv32i-unknown-none-elf",
- "riscv32imc-unknown-none-elf",
-@@ -23,7 +21,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "armv7r-none-eabi",
- "armv7r-none-eabihf",
- "hexagon-unknown-linux-musl",
-- "m68k-unknown-linux-gnu",
- "mips-unknown-linux-gnu",
- "mips-unknown-linux-musl",
- "mips-unknown-linux-uclibc",
-@@ -33,7 +30,6 @@ const NO_ATOMIC_64: &[&str] = &[
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-- "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-@@ -44,14 +40,12 @@ const NO_ATOMIC_64: &[&str] = &[
- "riscv32gc-unknown-linux-gnu",
- "riscv32gc-unknown-linux-musl",
- "riscv32imac-unknown-none-elf",
-- "riscv32imc-esp-espidf",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi",
- "thumbv8m.main-none-eabihf",
-- "armv6k-nintendo-3ds",
- "mipsel-sony-psp",
- "thumbv4t-none-eabi",
- "thumbv6m-none-eabi",
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/atomic/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -295,7 +295,7 @@ impl<T: Copy + Eq> AtomicCell<T> {
- }
-
- macro_rules! impl_arithmetic {
-- ($t:ty, fallback, $example:tt) => {
-+ ($t:ty, $example:tt) => {
- impl AtomicCell<$t> {
- /// Increments the current value by `val` and returns the previous value.
- ///
-@@ -313,13 +313,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_add(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_add(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -344,13 +341,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_sub(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_sub(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -373,13 +367,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_and(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_and(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -402,13 +393,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_or(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_or(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -431,13 +419,10 @@ macro_rules! impl_arithmetic {
- /// ```
- #[inline]
- pub fn fetch_xor(&self, val: $t) -> $t {
-- #[cfg(crossbeam_loom)]
-- {
-- let _ = val;
-- unimplemented!("loom does not support non-atomic atomic ops");
-- }
-- #[cfg(not(crossbeam_loom))]
-- {
-+ if can_transmute::<$t, atomic::AtomicUsize>() {
-+ let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
-+ a.fetch_xor(val as usize, Ordering::AcqRel) as $t
-+ } else {
- let _guard = lock(self.value.get() as usize).write();
- let value = unsafe { &mut *(self.value.get()) };
- let old = *value;
-@@ -556,15 +541,9 @@ impl_arithmetic!(i32, atomic::AtomicI32,
- impl_arithmetic!(u64, atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
- #[cfg(not(crossbeam_no_atomic_64))]
- impl_arithmetic!(i64, atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(u64, fallback, "let a = AtomicCell::new(7u64);");
--#[cfg(crossbeam_no_atomic_64)]
--impl_arithmetic!(i64, fallback, "let a = AtomicCell::new(7i64);");
- // TODO: AtomicU128 is unstable
- // impl_arithmetic!(u128, atomic::AtomicU128, "let a = AtomicCell::new(7u128);");
- // impl_arithmetic!(i128, atomic::AtomicI128, "let a = AtomicCell::new(7i128);");
--impl_arithmetic!(u128, fallback, "let a = AtomicCell::new(7u128);");
--impl_arithmetic!(i128, fallback, "let a = AtomicCell::new(7i128);");
-
- impl_arithmetic!(
- usize,
-@@ -704,13 +683,105 @@ fn lock(addr: usize) -> &'static SeqLock
- // stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
- // In order to protect from such cases, we simply choose a large prime number for `LEN`.
- const LEN: usize = 97;
-- #[allow(clippy::declare_interior_mutable_const)]
-- const L: SeqLock = SeqLock::new();
-+
- static LOCKS: [SeqLock; LEN] = [
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
-- L, L, L, L, L, L, L,
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
-+ SeqLock::new(),
- ];
-
- // If the modulus is a constant number, the compiler will use crazy math to transform this into
-@@ -762,6 +833,7 @@ macro_rules! atomic {
- ($t:ty, $a:ident, $atomic_op:expr, $fallback_op:expr) => {
- loop {
- atomic!(@check, $t, AtomicUnit, $a, $atomic_op);
-+ atomic!(@check, $t, atomic::AtomicUsize, $a, $atomic_op);
-
- atomic!(@check, $t, atomic::AtomicU8, $a, $atomic_op);
- atomic!(@check, $t, atomic::AtomicU16, $a, $atomic_op);
-@@ -783,6 +855,7 @@ macro_rules! atomic {
- const fn atomic_is_lock_free<T>() -> bool {
- // HACK(taiki-e): This is equivalent to `atomic! { T, _a, true, false }`, but can be used in const fn even in Rust 1.36.
- let is_lock_free = can_transmute::<T, AtomicUnit>()
-+ | can_transmute::<T, atomic::AtomicUsize>()
- | can_transmute::<T, atomic::AtomicU8>()
- | can_transmute::<T, atomic::AtomicU16>()
- | can_transmute::<T, atomic::AtomicU32>();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/sync/parker.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -175,7 +175,6 @@ impl Parker {
- ///
- /// let p = Parker::new();
- /// let raw = Parker::into_raw(p);
-- /// # let _ = unsafe { Parker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Parker) -> *const () {
- Unparker::into_raw(this.unparker)
-@@ -259,7 +258,6 @@ impl Unparker {
- /// let p = Parker::new();
- /// let u = p.unparker().clone();
- /// let raw = Unparker::into_raw(u);
-- /// # let _ = unsafe { Unparker::from_raw(raw) };
- /// ```
- pub fn into_raw(this: Unparker) -> *const () {
- Arc::into_raw(this.inner) as *const ()
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:40.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/src/thread.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -446,7 +446,7 @@ impl<'scope, 'env> ScopedThreadBuilder<'
- unsafe { mem::transmute(closure) };
-
- // Finally, spawn the closure.
-- self.builder.spawn(closure)?
-+ self.builder.spawn(move || closure())?
- };
-
- let thread = handle.thread().clone();
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/atomic_cell.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -264,22 +264,3 @@ fn const_atomic_cell_new() {
- CELL.store(1);
- assert_eq!(CELL.load(), 1);
- }
--
--// https://github.com/crossbeam-rs/crossbeam/issues/748
--#[cfg_attr(miri, ignore)] // TODO
--#[rustversion::since(1.37)] // #[repr(align(N))] requires Rust 1.37
--#[test]
--fn issue_748() {
-- #[allow(dead_code)]
-- #[repr(align(8))]
-- #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-- enum Test {
-- Field(u32),
-- FieldLess,
-- }
--
-- assert_eq!(mem::size_of::<Test>(), 8);
-- assert!(AtomicCell::<Test>::is_lock_free());
-- let x = AtomicCell::new(Test::FieldLess);
-- assert_eq!(x.load(), Test::FieldLess);
--}
-diff -up firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs
---- firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs.crossbeam-downgrade-rhbz2063961 2022-03-05 00:04:39.000000000 +0100
-+++ firefox-98.0/third_party/rust/crossbeam-utils/tests/sharded_lock.rs 2022-03-16 09:33:31.996159993 +0100
-@@ -21,9 +21,6 @@ fn smoke() {
- #[test]
- fn frob() {
- const N: u32 = 10;
-- #[cfg(miri)]
-- const M: usize = 100;
-- #[cfg(not(miri))]
- const M: usize = 1000;
-
- let r = Arc::new(ShardedLock::new(()));
diff --git a/firefox.spec b/firefox.spec
index 238bca8..23f2eb0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -216,7 +216,6 @@ Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
# Test patches
@@ -459,9 +458,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-%ifarch aarch64
-%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
-%endif
%patch71 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
# Test patches
commit 3b1730925b4ef954a27f291ab3eed5b0667bc067
Merge: 35a5afb f14b870
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:11 2022 +0200
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
commit 35a5afbafa9e3f85b82856171e9da0670e91d5ab
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Apr 6 10:36:00 2022 +0200
Updated to 99.0
diff --git a/.gitignore b/.gitignore
index c32b695..85b9eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -501,3 +501,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-98.0-20220305.tar.xz
/firefox-98.0.2.source.tar.xz
/firefox-langpacks-98.0.2-20220331.tar.xz
+/firefox-99.0.source.tar.xz
+/firefox-langpacks-99.0-20220331.tar.xz
diff --git a/D139022.diff b/D139022.diff
deleted file mode 100644
index 9d18162..0000000
--- a/D139022.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/dom/animation/TimingParams.h b/dom/animation/TimingParams.h
---- a/dom/animation/TimingParams.h
-+++ b/dom/animation/TimingParams.h
-@@ -31,22 +31,19 @@
- struct TimingParams {
- constexpr TimingParams() = default;
-
-- constexpr TimingParams(float aDuration, float aDelay, float aIterationCount,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode)
-+ TimingParams(float aDuration, float aDelay, float aIterationCount,
-+ dom::PlaybackDirection aDirection, dom::FillMode aFillMode)
- : mIterations(aIterationCount), mDirection(aDirection), mFill(aFillMode) {
- mDuration.emplace(StickyTimeDuration::FromMilliseconds(aDuration));
- mDelay = TimeDuration::FromMilliseconds(aDelay);
- Update();
- }
-
-- constexpr TimingParams(const TimeDuration& aDuration,
-- const TimeDuration& aDelay,
-- const TimeDuration& aEndDelay, float aIterations,
-- float aIterationStart,
-- dom::PlaybackDirection aDirection,
-- dom::FillMode aFillMode,
-- Maybe<ComputedTimingFunction>&& aFunction)
-+ TimingParams(const TimeDuration& aDuration, const TimeDuration& aDelay,
-+ const TimeDuration& aEndDelay, float aIterations,
-+ float aIterationStart, dom::PlaybackDirection aDirection,
-+ dom::FillMode aFillMode,
-+ Maybe<ComputedTimingFunction>&& aFunction)
- : mDelay(aDelay),
- mEndDelay(aEndDelay),
- mIterations(aIterations),
-
diff --git a/D139078.diff b/D139078.diff
deleted file mode 100644
index 8198e1a..0000000
--- a/D139078.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/gfx/wr/swgl/src/glsl.h b/gfx/wr/swgl/src/glsl.h
---- a/gfx/wr/swgl/src/glsl.h
-+++ b/gfx/wr/swgl/src/glsl.h
-@@ -2301,20 +2301,12 @@
- const vec2& operator[](int index) const { return data[index]; }
- mat2() = default;
-
-- IMPLICIT mat2(Float a) {
-- data[0] = vec2(a);
-- data[1] = vec2(a);
-- }
-+ IMPLICIT constexpr mat2(Float a) : data{vec2(a), vec2(a)} {}
-
-- mat2(vec2 a, vec2 b) {
-- data[0] = a;
-- data[1] = b;
-- }
-+ constexpr mat2(vec2 a, vec2 b) : data{a, b} {}
- IMPLICIT mat2(const mat4& mat);
-- IMPLICIT constexpr mat2(mat2_scalar s) {
-- data[0] = vec2(s.data[0]);
-- data[1] = vec2(s.data[1]);
-- }
-+ IMPLICIT constexpr mat2(mat2_scalar s)
-+ : data{vec2(s.data[0]), vec2(s.data[1])} {}
-
- friend vec2 operator*(mat2 m, vec2 v) {
- vec2 u;
-@@ -2404,30 +2396,19 @@
- vec3& operator[](int index) { return data[index]; }
- const vec3& operator[](int index) const { return data[index]; }
- mat3() = default;
-- mat3(vec3 a, vec3 b, vec3 c) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- }
-+ constexpr mat3(vec3 a, vec3 b, vec3 c) : data{a, b, c} {}
-
-- IMPLICIT constexpr mat3(mat3_scalar s) {
-- data[0] = vec3(s.data[0]);
-- data[1] = vec3(s.data[1]);
-- data[2] = vec3(s.data[2]);
-- }
-- constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2,
-- mat3_scalar s3) {
-- data[0] = vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]);
-- data[1] = vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]);
-- data[2] = vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2]);
-- }
-+ IMPLICIT constexpr mat3(mat3_scalar s)
-+ : data{vec3(s.data[0]), vec3(s.data[1]), vec3(s.data[2])} {}
-+
-+ constexpr mat3(mat3_scalar s0, mat3_scalar s1, mat3_scalar s2, mat3_scalar s3)
-+ : data{vec3(s0.data[0], s1.data[0], s2.data[0], s3.data[0]),
-+ vec3(s0.data[1], s1.data[1], s2.data[1], s3.data[1]),
-+ vec3(s0.data[2], s1.data[2], s2.data[2], s3.data[2])} {}
-
- constexpr mat3(Float d1, Float d2, Float d3, Float d4, Float d5, Float d6,
-- Float d7, Float d8, Float d9) {
-- data[0] = vec3(d1, d2, d3);
-- data[1] = vec3(d4, d5, d6);
-- data[2] = vec3(d7, d8, d9);
-- }
-+ Float d7, Float d8, Float d9)
-+ : data{vec3(d1, d2, d3), vec3(d4, d5, d6), vec3(d7, d8, d9)} {}
-
- IMPLICIT mat3(const mat4& mat);
-
-@@ -2597,19 +2578,11 @@
- vec4 data[4];
-
- mat4() = default;
-- IMPLICIT constexpr mat4(mat4_scalar s) {
-- data[0] = vec4(s.data[0]);
-- data[1] = vec4(s.data[1]);
-- data[2] = vec4(s.data[2]);
-- data[3] = vec4(s.data[3]);
-- }
-+ IMPLICIT constexpr mat4(mat4_scalar s)
-+ : data{vec4(s.data[0]), vec4(s.data[1]), vec4(s.data[2]),
-+ vec4(s.data[3])} {}
-
-- mat4(vec4 a, vec4 b, vec4 c, vec4 d) {
-- data[0] = a;
-- data[1] = b;
-- data[2] = c;
-- data[3] = d;
-- }
-+ constexpr mat4(vec4 a, vec4 b, vec4 c, vec4 d) : data{a, b, c, d} {}
-
- vec4& operator[](int index) { return data[index]; }
- const vec4& operator[](int index) const { return data[index]; }
-
diff --git a/D139088.diff b/D139088.diff
deleted file mode 100644
index 91e9967..0000000
--- a/D139088.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
---- a/gfx/wr/swgl/src/gl.cc
-+++ b/gfx/wr/swgl/src/gl.cc
-@@ -82,7 +82,7 @@
-
- #define FALLTHROUGH [[fallthrough]]
-
--#ifdef MOZILLA_CLIENT
-+#if defined(MOZILLA_CLIENT) && defined(MOZ_CLANG_PLUGIN)
- # define IMPLICIT __attribute__((annotate("moz_implicit")))
- #else
- # define IMPLICIT
-
diff --git a/D139696.diff b/D139696.diff
deleted file mode 100644
index 432a9c6..0000000
--- a/D139696.diff
+++ /dev/null
@@ -1,13808 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1 b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/COPYING.LGPLv2.1
-@@ -0,0 +1,504 @@
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 2.1, February 1999
-+
-+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+[This is the first released version of the Lesser GPL. It also counts
-+ as the successor of the GNU Library Public License, version 2, hence
-+ the version number 2.1.]
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+Licenses are intended to guarantee your freedom to share and change
-+free software--to make sure the software is free for all its users.
-+
-+ This license, the Lesser General Public License, applies to some
-+specially designated software packages--typically libraries--of the
-+Free Software Foundation and other authors who decide to use it. You
-+can use it too, but we suggest you first think carefully about whether
-+this license or the ordinary General Public License is the better
-+strategy to use in any particular case, based on the explanations below.
-+
-+ When we speak of free software, we are referring to freedom of use,
-+not price. Our General Public Licenses are designed to make sure that
-+you have the freedom to distribute copies of free software (and charge
-+for this service if you wish); that you receive source code or can get
-+it if you want it; that you can change the software and use pieces of
-+it in new free programs; and that you are informed that you can do
-+these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+distributors to deny you these rights or to ask you to surrender these
-+rights. These restrictions translate to certain responsibilities for
-+you if you distribute copies of the library or if you modify it.
-+
-+ For example, if you distribute copies of the library, whether gratis
-+or for a fee, you must give the recipients all the rights that we gave
-+you. You must make sure that they, too, receive or can get the source
-+code. If you link other code with the library, you must provide
-+complete object files to the recipients, so that they can relink them
-+with the library after making changes to the library and recompiling
-+it. And you must show them these terms so they know their rights.
-+
-+ We protect your rights with a two-step method: (1) we copyright the
-+library, and (2) we offer you this license, which gives you legal
-+permission to copy, distribute and/or modify the library.
-+
-+ To protect each distributor, we want to make it very clear that
-+there is no warranty for the free library. Also, if the library is
-+modified by someone else and passed on, the recipients should know
-+that what they have is not the original version, so that the original
-+author's reputation will not be affected by problems that might be
-+introduced by others.
-+
-+ Finally, software patents pose a constant threat to the existence of
-+any free program. We wish to make sure that a company cannot
-+effectively restrict the users of a free program by obtaining a
-+restrictive license from a patent holder. Therefore, we insist that
-+any patent license obtained for a version of the library must be
-+consistent with the full freedom of use specified in this license.
-+
-+ Most GNU software, including some libraries, is covered by the
-+ordinary GNU General Public License. This license, the GNU Lesser
-+General Public License, applies to certain designated libraries, and
-+is quite different from the ordinary General Public License. We use
-+this license for certain libraries in order to permit linking those
-+libraries into non-free programs.
-+
-+ When a program is linked with a library, whether statically or using
-+a shared library, the combination of the two is legally speaking a
-+combined work, a derivative of the original library. The ordinary
-+General Public License therefore permits such linking only if the
-+entire combination fits its criteria of freedom. The Lesser General
-+Public License permits more lax criteria for linking other code with
-+the library.
-+
-+ We call this license the "Lesser" General Public License because it
-+does Less to protect the user's freedom than the ordinary General
-+Public License. It also provides other free software developers Less
-+of an advantage over competing non-free programs. These disadvantages
-+are the reason we use the ordinary General Public License for many
-+libraries. However, the Lesser license provides advantages in certain
-+special circumstances.
-+
-+ For example, on rare occasions, there may be a special need to
-+encourage the widest possible use of a certain library, so that it becomes
-+a de-facto standard. To achieve this, non-free programs must be
-+allowed to use the library. A more frequent case is that a free
-+library does the same job as widely used non-free libraries. In this
-+case, there is little to gain by limiting the free library to free
-+software only, so we use the Lesser General Public License.
-+
-+ In other cases, permission to use a particular library in non-free
-+programs enables a greater number of people to use a large body of
-+free software. For example, permission to use the GNU C Library in
-+non-free programs enables many more people to use the whole GNU
-+operating system, as well as its variant, the GNU/Linux operating
-+system.
-+
-+ Although the Lesser General Public License is Less protective of the
-+users' freedom, it does ensure that the user of a program that is
-+linked with the Library has the freedom and the wherewithal to run
-+that program using a modified version of the Library.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow. Pay close attention to the difference between a
-+"work based on the library" and a "work that uses the library". The
-+former contains code derived from the library, whereas the latter must
-+be combined with the library in order to run.
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License Agreement applies to any software library or other
-+program which contains a notice placed by the copyright holder or
-+other authorized party saying it may be distributed under the terms of
-+this Lesser General Public License (also called "this License").
-+Each licensee is addressed as "you".
-+
-+ A "library" means a collection of software functions and/or data
-+prepared so as to be conveniently linked with application programs
-+(which use some of those functions and data) to form executables.
-+
-+ The "Library", below, refers to any such software library or work
-+which has been distributed under these terms. A "work based on the
-+Library" means either the Library or any derivative work under
-+copyright law: that is to say, a work containing the Library or a
-+portion of it, either verbatim or with modifications and/or translated
-+straightforwardly into another language. (Hereinafter, translation is
-+included without limitation in the term "modification".)
-+
-+ "Source code" for a work means the preferred form of the work for
-+making modifications to it. For a library, complete source code means
-+all the source code for all modules it contains, plus any associated
-+interface definition files, plus the scripts used to control compilation
-+and installation of the library.
-+
-+ Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running a program using the Library is not restricted, and output from
-+such a program is covered only if its contents constitute a work based
-+on the Library (independent of the use of the Library in a tool for
-+writing it). Whether that is true depends on what the Library does
-+and what the program that uses the Library does.
-+
-+ 1. You may copy and distribute verbatim copies of the Library's
-+complete source code as you receive it, in any medium, provided that
-+you conspicuously and appropriately publish on each copy an
-+appropriate copyright notice and disclaimer of warranty; keep intact
-+all the notices that refer to this License and to the absence of any
-+warranty; and distribute a copy of this License along with the
-+Library.
-+
-+ You may charge a fee for the physical act of transferring a copy,
-+and you may at your option offer warranty protection in exchange for a
-+fee.
-+
-+ 2. You may modify your copy or copies of the Library or any portion
-+of it, thus forming a work based on the Library, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) The modified work must itself be a software library.
-+
-+ b) You must cause the files modified to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ c) You must cause the whole of the work to be licensed at no
-+ charge to all third parties under the terms of this License.
-+
-+ d) If a facility in the modified Library refers to a function or a
-+ table of data to be supplied by an application program that uses
-+ the facility, other than as an argument passed when the facility
-+ is invoked, then you must make a good faith effort to ensure that,
-+ in the event an application does not supply such function or
-+ table, the facility still operates, and performs whatever part of
-+ its purpose remains meaningful.
-+
-+ (For example, a function in a library to compute square roots has
-+ a purpose that is entirely well-defined independent of the
-+ application. Therefore, Subsection 2d requires that any
-+ application-supplied function or table used by this function must
-+ be optional: if the application does not supply it, the square
-+ root function must still compute square roots.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Library,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Library, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote
-+it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Library.
-+
-+In addition, mere aggregation of another work not based on the Library
-+with the Library (or with a work based on the Library) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may opt to apply the terms of the ordinary GNU General Public
-+License instead of this License to a given copy of the Library. To do
-+this, you must alter all the notices that refer to this License, so
-+that they refer to the ordinary GNU General Public License, version 2,
-+instead of to this License. (If a newer version than version 2 of the
-+ordinary GNU General Public License has appeared, then you can specify
-+that version instead if you wish.) Do not make any other change in
-+these notices.
-+
-+ Once this change is made in a given copy, it is irreversible for
-+that copy, so the ordinary GNU General Public License applies to all
-+subsequent copies and derivative works made from that copy.
-+
-+ This option is useful when you wish to copy part of the code of
-+the Library into a program that is not a library.
-+
-+ 4. You may copy and distribute the Library (or a portion or
-+derivative of it, under Section 2) in object code or executable form
-+under the terms of Sections 1 and 2 above provided that you accompany
-+it with the complete corresponding machine-readable source code, which
-+must be distributed under the terms of Sections 1 and 2 above on a
-+medium customarily used for software interchange.
-+
-+ If distribution of object code is made by offering access to copy
-+from a designated place, then offering equivalent access to copy the
-+source code from the same place satisfies the requirement to
-+distribute the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 5. A program that contains no derivative of any portion of the
-+Library, but is designed to work with the Library by being compiled or
-+linked with it, is called a "work that uses the Library". Such a
-+work, in isolation, is not a derivative work of the Library, and
-+therefore falls outside the scope of this License.
-+
-+ However, linking a "work that uses the Library" with the Library
-+creates an executable that is a derivative of the Library (because it
-+contains portions of the Library), rather than a "work that uses the
-+library". The executable is therefore covered by this License.
-+Section 6 states terms for distribution of such executables.
-+
-+ When a "work that uses the Library" uses material from a header file
-+that is part of the Library, the object code for the work may be a
-+derivative work of the Library even though the source code is not.
-+Whether this is true is especially significant if the work can be
-+linked without the Library, or if the work is itself a library. The
-+threshold for this to be true is not precisely defined by law.
-+
-+ If such an object file uses only numerical parameters, data
-+structure layouts and accessors, and small macros and small inline
-+functions (ten lines or less in length), then the use of the object
-+file is unrestricted, regardless of whether it is legally a derivative
-+work. (Executables containing this object code plus portions of the
-+Library will still fall under Section 6.)
-+
-+ Otherwise, if the work is a derivative of the Library, you may
-+distribute the object code for the work under the terms of Section 6.
-+Any executables containing that work also fall under Section 6,
-+whether or not they are linked directly with the Library itself.
-+
-+ 6. As an exception to the Sections above, you may also combine or
-+link a "work that uses the Library" with the Library to produce a
-+work containing portions of the Library, and distribute that work
-+under terms of your choice, provided that the terms permit
-+modification of the work for the customer's own use and reverse
-+engineering for debugging such modifications.
-+
-+ You must give prominent notice with each copy of the work that the
-+Library is used in it and that the Library and its use are covered by
-+this License. You must supply a copy of this License. If the work
-+during execution displays copyright notices, you must include the
-+copyright notice for the Library among them, as well as a reference
-+directing the user to the copy of this License. Also, you must do one
-+of these things:
-+
-+ a) Accompany the work with the complete corresponding
-+ machine-readable source code for the Library including whatever
-+ changes were used in the work (which must be distributed under
-+ Sections 1 and 2 above); and, if the work is an executable linked
-+ with the Library, with the complete machine-readable "work that
-+ uses the Library", as object code and/or source code, so that the
-+ user can modify the Library and then relink to produce a modified
-+ executable containing the modified Library. (It is understood
-+ that the user who changes the contents of definitions files in the
-+ Library will not necessarily be able to recompile the application
-+ to use the modified definitions.)
-+
-+ b) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (1) uses at run time a
-+ copy of the library already present on the user's computer system,
-+ rather than copying library functions into the executable, and (2)
-+ will operate properly with a modified version of the library, if
-+ the user installs one, as long as the modified version is
-+ interface-compatible with the version that the work was made with.
-+
-+ c) Accompany the work with a written offer, valid for at
-+ least three years, to give the same user the materials
-+ specified in Subsection 6a, above, for a charge no more
-+ than the cost of performing this distribution.
-+
-+ d) If distribution of the work is made by offering access to copy
-+ from a designated place, offer equivalent access to copy the above
-+ specified materials from the same place.
-+
-+ e) Verify that the user has already received a copy of these
-+ materials or that you have already sent this user a copy.
-+
-+ For an executable, the required form of the "work that uses the
-+Library" must include any data and utility programs needed for
-+reproducing the executable from it. However, as a special exception,
-+the materials to be distributed need not include anything that is
-+normally distributed (in either source or binary form) with the major
-+components (compiler, kernel, and so on) of the operating system on
-+which the executable runs, unless that component itself accompanies
-+the executable.
-+
-+ It may happen that this requirement contradicts the license
-+restrictions of other proprietary libraries that do not normally
-+accompany the operating system. Such a contradiction means you cannot
-+use both them and the Library together in an executable that you
-+distribute.
-+
-+ 7. You may place library facilities that are a work based on the
-+Library side-by-side in a single library together with other library
-+facilities not covered by this License, and distribute such a combined
-+library, provided that the separate distribution of the work based on
-+the Library and of the other library facilities is otherwise
-+permitted, and provided that you do these two things:
-+
-+ a) Accompany the combined library with a copy of the same work
-+ based on the Library, uncombined with any other library
-+ facilities. This must be distributed under the terms of the
-+ Sections above.
-+
-+ b) Give prominent notice with the combined library of the fact
-+ that part of it is a work based on the Library, and explaining
-+ where to find the accompanying uncombined form of the same work.
-+
-+ 8. You may not copy, modify, sublicense, link with, or distribute
-+the Library except as expressly provided under this License. Any
-+attempt otherwise to copy, modify, sublicense, link with, or
-+distribute the Library is void, and will automatically terminate your
-+rights under this License. However, parties who have received copies,
-+or rights, from you under this License will not have their licenses
-+terminated so long as such parties remain in full compliance.
-+
-+ 9. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Library or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Library (or any work based on the
-+Library), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Library or works based on it.
-+
-+ 10. Each time you redistribute the Library (or any work based on the
-+Library), the recipient automatically receives a license from the
-+original licensor to copy, distribute, link with or modify the Library
-+subject to these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties with
-+this License.
-+
-+ 11. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Library at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Library by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Library.
-+
-+If any portion of this section is held invalid or unenforceable under any
-+particular circumstance, the balance of the section is intended to apply,
-+and the section as a whole is intended to apply in other circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 12. If the distribution and/or use of the Library is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Library under this License may add
-+an explicit geographical distribution limitation excluding those countries,
-+so that distribution is permitted only in or among countries not thus
-+excluded. In such case, this License incorporates the limitation as if
-+written in the body of this License.
-+
-+ 13. The Free Software Foundation may publish revised and/or new
-+versions of the Lesser General Public License from time to time.
-+Such new versions will be similar in spirit to the present version,
-+but may differ in detail to address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Library
-+specifies a version number of this License which applies to it and
-+"any later version", you have the option of following the terms and
-+conditions either of that version or of any later version published by
-+the Free Software Foundation. If the Library does not specify a
-+license version number, you may choose any version ever published by
-+the Free Software Foundation.
-+
-+ 14. If you wish to incorporate parts of the Library into other free
-+programs whose distribution conditions are incompatible with these,
-+write to the author to ask for permission. For software which is
-+copyrighted by the Free Software Foundation, write to the Free
-+Software Foundation; we sometimes make exceptions for this. Our
-+decision will be guided by the two goals of preserving the free status
-+of all derivatives of our free software and of promoting the sharing
-+and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Libraries
-+
-+ If you develop a new library, and you want it to be of the greatest
-+possible use to the public, we recommend making it free software that
-+everyone can redistribute and change. You can do so by permitting
-+redistribution under these terms (or, alternatively, under the terms of the
-+ordinary General Public License).
-+
-+ To apply these terms, attach the following notices to the library. It is
-+safest to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least the
-+"copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the library's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the library, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
-+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1990
-+ Ty Coon, President of Vice
-+
-+That's all there is to it!
-+
-+
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avcodec.h
-@@ -0,0 +1,3204 @@
-+/*
-+ * copyright (c) 2001 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVCODEC_H
-+#define AVCODEC_AVCODEC_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec external API header
-+ */
-+
-+#include "libavutil/samplefmt.h"
-+#include "libavutil/attributes.h"
-+#include "libavutil/avutil.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/frame.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec.h"
-+#include "codec_desc.h"
-+#include "codec_par.h"
-+#include "codec_id.h"
-+#include "defs.h"
-+#include "packet.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup libavc libavcodec
-+ * Encoding/Decoding Library
-+ *
-+ * @{
-+ *
-+ * @defgroup lavc_decoding Decoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_encoding Encoding
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavc_codec Codecs
-+ * @{
-+ * @defgroup lavc_codec_native Native Codecs
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_wrappers External library wrappers
-+ * @{
-+ * @}
-+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
-+ * @{
-+ * @}
-+ * @}
-+ * @defgroup lavc_internal Internal
-+ * @{
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @ingroup libavc
-+ * @defgroup lavc_encdec send/receive encoding and decoding API overview
-+ * @{
-+ *
-+ * The avcodec_send_packet()/avcodec_receive_frame()/avcodec_send_frame()/
-+ * avcodec_receive_packet() functions provide an encode/decode API, which
-+ * decouples input and output.
-+ *
-+ * The API is very similar for encoding/decoding and audio/video, and works as
-+ * follows:
-+ * - Set up and open the AVCodecContext as usual.
-+ * - Send valid input:
-+ * - For decoding, call avcodec_send_packet() to give the decoder raw
-+ * compressed data in an AVPacket.
-+ * - For encoding, call avcodec_send_frame() to give the encoder an AVFrame
-+ * containing uncompressed audio or video.
-+ *
-+ * In both cases, it is recommended that AVPackets and AVFrames are
-+ * refcounted, or libavcodec might have to copy the input data. (libavformat
-+ * always returns refcounted AVPackets, and av_frame_get_buffer() allocates
-+ * refcounted AVFrames.)
-+ * - Receive output in a loop. Periodically call one of the avcodec_receive_*()
-+ * functions and process their output:
-+ * - For decoding, call avcodec_receive_frame(). On success, it will return
-+ * an AVFrame containing uncompressed audio or video data.
-+ * - For encoding, call avcodec_receive_packet(). On success, it will return
-+ * an AVPacket with a compressed frame.
-+ *
-+ * Repeat this call until it returns AVERROR(EAGAIN) or an error. The
-+ * AVERROR(EAGAIN) return value means that new input data is required to
-+ * return new output. In this case, continue with sending input. For each
-+ * input frame/packet, the codec will typically return 1 output frame/packet,
-+ * but it can also be 0 or more than 1.
-+ *
-+ * At the beginning of decoding or encoding, the codec might accept multiple
-+ * input frames/packets without returning a frame, until its internal buffers
-+ * are filled. This situation is handled transparently if you follow the steps
-+ * outlined above.
-+ *
-+ * In theory, sending input can result in EAGAIN - this should happen only if
-+ * not all output was received. You can use this to structure alternative decode
-+ * or encode loops other than the one suggested above. For example, you could
-+ * try sending new input on each iteration, and try to receive output if that
-+ * returns EAGAIN.
-+ *
-+ * End of stream situations. These require "flushing" (aka draining) the codec,
-+ * as the codec might buffer multiple frames or packets internally for
-+ * performance or out of necessity (consider B-frames).
-+ * This is handled as follows:
-+ * - Instead of valid input, send NULL to the avcodec_send_packet() (decoding)
-+ * or avcodec_send_frame() (encoding) functions. This will enter draining
-+ * mode.
-+ * - Call avcodec_receive_frame() (decoding) or avcodec_receive_packet()
-+ * (encoding) in a loop until AVERROR_EOF is returned. The functions will
-+ * not return AVERROR(EAGAIN), unless you forgot to enter draining mode.
-+ * - Before decoding can be resumed again, the codec has to be reset with
-+ * avcodec_flush_buffers().
-+ *
-+ * Using the API as outlined above is highly recommended. But it is also
-+ * possible to call functions outside of this rigid schema. For example, you can
-+ * call avcodec_send_packet() repeatedly without calling
-+ * avcodec_receive_frame(). In this case, avcodec_send_packet() will succeed
-+ * until the codec's internal buffer has been filled up (which is typically of
-+ * size 1 per output frame, after initial input), and then reject input with
-+ * AVERROR(EAGAIN). Once it starts rejecting input, you have no choice but to
-+ * read at least some output.
-+ *
-+ * Not all codecs will follow a rigid and predictable dataflow; the only
-+ * guarantee is that an AVERROR(EAGAIN) return value on a send/receive call on
-+ * one end implies that a receive/send call on the other end will succeed, or
-+ * at least will not fail with AVERROR(EAGAIN). In general, no codec will
-+ * permit unlimited buffering of input or output.
-+ *
-+ * A codec is not allowed to return AVERROR(EAGAIN) for both sending and
-+ * receiving. This would be an invalid state, which could put the codec user
-+ * into an endless loop. The API has no concept of time either: it cannot happen
-+ * that trying to do avcodec_send_packet() results in AVERROR(EAGAIN), but a
-+ * repeated call 1 second later accepts the packet (with no other receive/flush
-+ * API calls involved). The API is a strict state machine, and the passage of
-+ * time is not supposed to influence it. Some timing-dependent behavior might
-+ * still be deemed acceptable in certain cases. But it must never result in both
-+ * send/receive returning EAGAIN at the same time at any point. It must also
-+ * absolutely be avoided that the current state is "unstable" and can
-+ * "flip-flop" between the send/receive APIs allowing progress. For example,
-+ * it's not allowed that the codec randomly decides that it actually wants to
-+ * consume a packet now instead of returning a frame, after it just returned
-+ * AVERROR(EAGAIN) on an avcodec_send_packet() call.
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_core Core functions/structures.
-+ * @ingroup libavc
-+ *
-+ * Basic definitions, functions for querying libavcodec capabilities,
-+ * allocating core structures, etc.
-+ * @{
-+ */
-+
-+/**
-+ * @ingroup lavc_encoding
-+ * minimum encoding buffer size
-+ * Used to avoid some checks during header writing.
-+ */
-+#define AV_INPUT_BUFFER_MIN_SIZE 16384
-+
-+/**
-+ * @ingroup lavc_encoding
-+ */
-+typedef struct RcOverride {
-+ int start_frame;
-+ int end_frame;
-+ int qscale; // If this is 0 then quality_factor will be used instead.
-+ float quality_factor;
-+} RcOverride;
-+
-+/* encoding support
-+ These flags can be passed in AVCodecContext.flags before initialization.
-+ Note: Not everything is supported yet.
-+*/
-+
-+/**
-+ * Allow decoders to produce frames with data planes that are not aligned
-+ * to CPU requirements (e.g. due to cropping).
-+ */
-+#define AV_CODEC_FLAG_UNALIGNED (1 << 0)
-+/**
-+ * Use fixed qscale.
-+ */
-+#define AV_CODEC_FLAG_QSCALE (1 << 1)
-+/**
-+ * 4 MV per MB allowed / advanced prediction for H.263.
-+ */
-+#define AV_CODEC_FLAG_4MV (1 << 2)
-+/**
-+ * Output even those frames that might be corrupted.
-+ */
-+#define AV_CODEC_FLAG_OUTPUT_CORRUPT (1 << 3)
-+/**
-+ * Use qpel MC.
-+ */
-+#define AV_CODEC_FLAG_QPEL (1 << 4)
-+/**
-+ * Don't output frames whose parameters differ from first
-+ * decoded frame in stream.
-+ */
-+#define AV_CODEC_FLAG_DROPCHANGED (1 << 5)
-+/**
-+ * Use internal 2pass ratecontrol in first pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS1 (1 << 9)
-+/**
-+ * Use internal 2pass ratecontrol in second pass mode.
-+ */
-+#define AV_CODEC_FLAG_PASS2 (1 << 10)
-+/**
-+ * loop filter.
-+ */
-+#define AV_CODEC_FLAG_LOOP_FILTER (1 << 11)
-+/**
-+ * Only decode/encode grayscale.
-+ */
-+#define AV_CODEC_FLAG_GRAY (1 << 13)
-+/**
-+ * error[?] variables will be set during encoding.
-+ */
-+#define AV_CODEC_FLAG_PSNR (1 << 15)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * Input bitstream might be truncated at a random location
-+ * instead of only at frame boundaries.
-+ *
-+ * @deprecated use codec parsers for packetizing input
-+ */
-+# define AV_CODEC_FLAG_TRUNCATED (1 << 16)
-+#endif
-+/**
-+ * Use interlaced DCT.
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_DCT (1 << 18)
-+/**
-+ * Force low delay.
-+ */
-+#define AV_CODEC_FLAG_LOW_DELAY (1 << 19)
-+/**
-+ * Place global headers in extradata instead of every keyframe.
-+ */
-+#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
-+/**
-+ * Use only bitexact stuff (except (I)DCT).
-+ */
-+#define AV_CODEC_FLAG_BITEXACT (1 << 23)
-+/* Fx : Flag for H.263+ extra options */
-+/**
-+ * H.263 advanced intra coding / MPEG-4 AC prediction
-+ */
-+#define AV_CODEC_FLAG_AC_PRED (1 << 24)
-+/**
-+ * interlaced motion estimation
-+ */
-+#define AV_CODEC_FLAG_INTERLACED_ME (1 << 29)
-+#define AV_CODEC_FLAG_CLOSED_GOP (1U << 31)
-+
-+/**
-+ * Allow non spec compliant speedup tricks.
-+ */
-+#define AV_CODEC_FLAG2_FAST (1 << 0)
-+/**
-+ * Skip bitstream encoding.
-+ */
-+#define AV_CODEC_FLAG2_NO_OUTPUT (1 << 2)
-+/**
-+ * Place global headers at every keyframe instead of in extradata.
-+ */
-+#define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3)
-+
-+/**
-+ * timecode is in drop frame format. DEPRECATED!!!!
-+ */
-+#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13)
-+
-+/**
-+ * Input bitstream might be truncated at a packet boundaries
-+ * instead of only at frame boundaries.
-+ */
-+#define AV_CODEC_FLAG2_CHUNKS (1 << 15)
-+/**
-+ * Discard cropping information from SPS.
-+ */
-+#define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16)
-+
-+/**
-+ * Show all frames before the first keyframe
-+ */
-+#define AV_CODEC_FLAG2_SHOW_ALL (1 << 22)
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_FLAG2_EXPORT_MVS (1 << 28)
-+/**
-+ * Do not skip samples and export skip information as frame side data
-+ */
-+#define AV_CODEC_FLAG2_SKIP_MANUAL (1 << 29)
-+/**
-+ * Do not reset ASS ReadOrder field on flush (subtitles decoding)
-+ */
-+#define AV_CODEC_FLAG2_RO_FLUSH_NOOP (1 << 30)
-+
-+/* Unsupported options :
-+ * Syntax Arithmetic coding (SAC)
-+ * Reference Picture Selection
-+ * Independent Segment Decoding */
-+/* /Fx */
-+/* codec capabilities */
-+
-+/* Exported side data.
-+ These flags can be passed in AVCodecContext.export_side_data before
-+ initialization.
-+*/
-+/**
-+ * Export motion vectors through frame side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_MVS (1 << 0)
-+/**
-+ * Export encoder Producer Reference Time through packet side data
-+ */
-+#define AV_CODEC_EXPORT_DATA_PRFT (1 << 1)
-+/**
-+ * Decoding only.
-+ * Export the AVVideoEncParams structure through frame side data.
-+ */
-+#define AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS (1 << 2)
-+/**
-+ * Decoding only.
-+ * Do not apply film grain, export it instead.
-+ */
-+#define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)
-+
-+/**
-+ * The decoder will keep a reference to the frame and may reuse it later.
-+ */
-+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-+
-+/**
-+ * The encoder will keep a reference to the packet and may reuse it later.
-+ */
-+#define AV_GET_ENCODE_BUFFER_FLAG_REF (1 << 0)
-+
-+struct AVCodecInternal;
-+
-+/**
-+ * main external API structure.
-+ * New fields can be added to the end with minor version bumps.
-+ * Removal, reordering and changes to existing fields require a major
-+ * version bump.
-+ * You can use AVOptions (av_opt* / av_set/get*()) to access these fields from
-+ * user applications. The name string for AVOptions options matches the
-+ * associated command line parameter name and can be found in
-+ * libavcodec/options_table.h The AVOption/command line parameter names differ
-+ * in some cases from the C structure field names for historic reasons or
-+ * brevity. sizeof(AVCodecContext) must not be used outside libav*.
-+ */
-+typedef struct AVCodecContext {
-+ /**
-+ * information on struct for av_log
-+ * - set by avcodec_alloc_context3
-+ */
-+ const AVClass* av_class;
-+ int log_level_offset;
-+
-+ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
-+ const struct AVCodec* codec;
-+ enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
-+
-+ /**
-+ * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-+ * This is used to work around some encoder bugs.
-+ * A demuxer should set this to what is stored in the field used to identify
-+ * the codec. If there are multiple such fields in a container then the
-+ * demuxer should choose the one which maximizes the information about the
-+ * used codec. If the codec tag field in a container is larger than 32 bits
-+ * then the demuxer should remap the longer ID to 32 bits with a table or
-+ * other structure. Alternatively a new extra_codec_tag + size could be added
-+ * but for this a clear advantage must be demonstrated first.
-+ * - encoding: Set by user, if not then the default based on codec_id will be
-+ * used.
-+ * - decoding: Set by user, will be converted to uppercase by libavcodec
-+ * during init.
-+ */
-+ unsigned int codec_tag;
-+
-+ void* priv_data;
-+
-+ /**
-+ * Private context used for internal data.
-+ *
-+ * Unlike priv_data, this is not codec-specific. It is used in general
-+ * libavcodec functions.
-+ */
-+ struct AVCodecInternal* internal;
-+
-+ /**
-+ * Private data of the user, can be used to carry app specific stuff.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ void* opaque;
-+
-+ /**
-+ * the average bitrate
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: Set by user, may be overwritten by libavcodec
-+ * if this info is available in the stream
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * number of bits the bitstream is allowed to diverge from the reference.
-+ * the reference can be CBR (for CBR pass1) or VBR (for pass2)
-+ * - encoding: Set by user; unused for constant quantizer encoding.
-+ * - decoding: unused
-+ */
-+ int bit_rate_tolerance;
-+
-+ /**
-+ * Global quality for codecs which cannot change it per frame.
-+ * This should be proportional to MPEG-1/2/4 qscale.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int global_quality;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int compression_level;
-+#define FF_COMPRESSION_DEFAULT -1
-+
-+ /**
-+ * AV_CODEC_FLAG_*.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags;
-+
-+ /**
-+ * AV_CODEC_FLAG2_*
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int flags2;
-+
-+ /**
-+ * some codecs need / can use extradata like Huffman tables.
-+ * MJPEG: Huffman tables
-+ * rv10: additional flags
-+ * MPEG-4: global headers (they can be in the bitstream or here)
-+ * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
-+ * than extradata_size to avoid problems if it is read with the bitstream
-+ * reader. The bytewise contents of extradata must not depend on the
-+ * architecture or CPU endianness. Must be allocated with the av_malloc()
-+ * family of functions.
-+ * - encoding: Set/allocated/freed by libavcodec.
-+ * - decoding: Set/allocated/freed by user.
-+ */
-+ uint8_t* extradata;
-+ int extradata_size;
-+
-+ /**
-+ * This is the fundamental unit of time (in seconds) in terms
-+ * of which frame timestamps are represented. For fixed-fps content,
-+ * timebase should be 1/framerate and timestamp increments should be
-+ * identically 1.
-+ * This often, but not always is the inverse of the frame rate or field rate
-+ * for video. 1/time_base is not the average frame rate if the frame rate is
-+ * not constant.
-+ *
-+ * Like containers, elementary streams also can store timestamps, 1/time_base
-+ * is the unit in which these timestamps are specified.
-+ * As example of such codec time base see ISO/IEC 14496-2:2001(E)
-+ * vop_time_increment_resolution and fixed_vop_rate
-+ * (fixed_vop_rate == 0 implies that it is different from the framerate)
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: the use of this field for decoding is deprecated.
-+ * Use framerate instead.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * For some codecs, the time base is closer to the field rate than the frame
-+ * rate. Most notably, H.264 and MPEG-2 specify time_base as half of frame
-+ * duration if no telecine is used ...
-+ *
-+ * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it
-+ * to 2.
-+ */
-+ int ticks_per_frame;
-+
-+ /**
-+ * Codec delay.
-+ *
-+ * Encoding: Number of frames delay there will be from the encoder input to
-+ * the decoder output. (we assume the decoder matches the spec)
-+ * Decoding: Number of frames delay in addition to what a standard decoder
-+ * as specified in the spec would produce.
-+ *
-+ * Video:
-+ * Number of frames the decoded output will be delayed relative to the
-+ * encoded input.
-+ *
-+ * Audio:
-+ * For encoding, this field is unused (see initial_padding).
-+ *
-+ * For decoding, this is the number of samples the decoder needs to
-+ * output before the decoder's output is valid. When seeking, you should
-+ * start decoding this many samples prior to your desired seek point.
-+ *
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int delay;
-+
-+ /* video only */
-+ /**
-+ * picture width / height.
-+ *
-+ * @note Those fields may not match the values of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: MUST be set by user.
-+ * - decoding: May be set by the user before opening the decoder if known e.g.
-+ * from the container. Some decoders will require the dimensions
-+ * to be set by the caller. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int width, height;
-+
-+ /**
-+ * Bitstream width / height, may be different from width/height e.g. when
-+ * the decoded frame is cropped before being output or lowres is enabled.
-+ *
-+ * @note Those field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: unused
-+ * - decoding: May be set by the user before opening the decoder if known
-+ * e.g. from the container. During decoding, the decoder may
-+ * overwrite those values as required while parsing the data.
-+ */
-+ int coded_width, coded_height;
-+
-+ /**
-+ * the number of pictures in a group of pictures, or 0 for intra_only
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int gop_size;
-+
-+ /**
-+ * Pixel format, see AV_PIX_FMT_xxx.
-+ * May be set by the demuxer if known from headers.
-+ * May be overridden by the decoder if it knows better.
-+ *
-+ * @note This field may not match the value of the last
-+ * AVFrame output by avcodec_receive_frame() due frame
-+ * reordering.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: Set by user if known, overridden by libavcodec while
-+ * parsing the data.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * If non NULL, 'draw_horiz_band' is called by the libavcodec
-+ * decoder to draw a horizontal band. It improves cache usage. Not
-+ * all codecs can do that. You must check the codec capabilities
-+ * beforehand.
-+ * When multithreading is used, it may be called from multiple threads
-+ * at the same time; threads might draw different parts of the same AVFrame,
-+ * or multiple AVFrames, and there is no guarantee that slices will be drawn
-+ * in order.
-+ * The function is also used by hardware acceleration APIs.
-+ * It is called at least once during frame decoding to pass
-+ * the data needed for hardware render.
-+ * In that mode instead of pixel data, AVFrame points to
-+ * a structure specific to the acceleration API. The application
-+ * reads the structure and can change some fields to indicate progress
-+ * or mark state.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ * @param height the height of the slice
-+ * @param y the y position of the slice
-+ * @param type 1->top field, 2->bottom field, 3->frame
-+ * @param offset offset into the AVFrame.data from which the slice should be
-+ * read
-+ */
-+ void (*draw_horiz_band)(struct AVCodecContext* s, const AVFrame* src,
-+ int offset[AV_NUM_DATA_POINTERS], int y, int type,
-+ int height);
-+
-+ /**
-+ * Callback to negotiate the pixel format. Decoding only, may be set by the
-+ * caller before avcodec_open2().
-+ *
-+ * Called by some decoders to select the pixel format that will be used for
-+ * the output frames. This is mainly used to set up hardware acceleration,
-+ * then the provided format list contains the corresponding hwaccel pixel
-+ * formats alongside the "software" one. The software pixel format may also
-+ * be retrieved from \ref sw_pix_fmt.
-+ *
-+ * This callback will be called when the coded frame properties (such as
-+ * resolution, pixel format, etc.) change and more than one output format is
-+ * supported for those new properties. If a hardware pixel format is chosen
-+ * and initialization for it fails, the callback may be called again
-+ * immediately.
-+ *
-+ * This callback may be called from different threads if the decoder is
-+ * multi-threaded, but not from more than one thread simultaneously.
-+ *
-+ * @param fmt list of formats which may be used in the current
-+ * configuration, terminated by AV_PIX_FMT_NONE.
-+ * @warning Behavior is undefined if the callback returns a value other
-+ * than one of the formats in fmt or AV_PIX_FMT_NONE.
-+ * @return the chosen format or AV_PIX_FMT_NONE
-+ */
-+ enum AVPixelFormat (*get_format)(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+ /**
-+ * maximum number of B-frames between non-B-frames
-+ * Note: The output will be delayed by max_b_frames+1 relative to the input.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_b_frames;
-+
-+ /**
-+ * qscale factor between IP and B-frames
-+ * If > 0 then the last P-frame quantizer will be used (q=
-+ * lastp_q*factor+offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_factor;
-+
-+ /**
-+ * qscale offset between IP and B-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float b_quant_offset;
-+
-+ /**
-+ * Size of the frame reordering buffer in the decoder.
-+ * For MPEG-2 it is 1 IPB or 0 low delay IP.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int has_b_frames;
-+
-+ /**
-+ * qscale factor between P- and I-frames
-+ * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor +
-+ * offset). If < 0 then normal ratecontrol will be done (q=
-+ * -normal_q*factor+offset).
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_factor;
-+
-+ /**
-+ * qscale offset between P and I-frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float i_quant_offset;
-+
-+ /**
-+ * luminance masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float lumi_masking;
-+
-+ /**
-+ * temporary complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float temporal_cplx_masking;
-+
-+ /**
-+ * spatial complexity masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float spatial_cplx_masking;
-+
-+ /**
-+ * p block masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float p_masking;
-+
-+ /**
-+ * darkness masking (0-> disabled)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ float dark_masking;
-+
-+ /**
-+ * slice count
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user (or 0).
-+ */
-+ int slice_count;
-+
-+ /**
-+ * slice offsets in the frame in bytes
-+ * - encoding: Set/allocated by libavcodec.
-+ * - decoding: Set/allocated by user (or NULL).
-+ */
-+ int* slice_offset;
-+
-+ /**
-+ * sample aspect ratio (0 if unknown)
-+ * That is the width of a pixel divided by the height of the pixel.
-+ * Numerator and denominator must be relatively prime and smaller than 256 for
-+ * some video standards.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_cmp;
-+ /**
-+ * subpixel motion estimation comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_sub_cmp;
-+ /**
-+ * macroblock comparison function (not supported yet)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_cmp;
-+ /**
-+ * interlaced DCT comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int ildct_cmp;
-+#define FF_CMP_SAD 0
-+#define FF_CMP_SSE 1
-+#define FF_CMP_SATD 2
-+#define FF_CMP_DCT 3
-+#define FF_CMP_PSNR 4
-+#define FF_CMP_BIT 5
-+#define FF_CMP_RD 6
-+#define FF_CMP_ZERO 7
-+#define FF_CMP_VSAD 8
-+#define FF_CMP_VSSE 9
-+#define FF_CMP_NSSE 10
-+#define FF_CMP_W53 11
-+#define FF_CMP_W97 12
-+#define FF_CMP_DCTMAX 13
-+#define FF_CMP_DCT264 14
-+#define FF_CMP_MEDIAN_SAD 15
-+#define FF_CMP_CHROMA 256
-+
-+ /**
-+ * ME diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dia_size;
-+
-+ /**
-+ * amount of previous MV predictors (2a+1 x 2a+1 square)
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int last_predictor_count;
-+
-+ /**
-+ * motion estimation prepass comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_pre_cmp;
-+
-+ /**
-+ * ME prepass diamond size & shape
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int pre_dia_size;
-+
-+ /**
-+ * subpel ME quality
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_subpel_quality;
-+
-+ /**
-+ * maximum motion estimation search range in subpel units
-+ * If 0 then no limit.
-+ *
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int me_range;
-+
-+ /**
-+ * slice flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int slice_flags;
-+#define SLICE_FLAG_CODED_ORDER \
-+ 0x0001 ///< draw_horiz_band() is called in coded order instead of display
-+#define SLICE_FLAG_ALLOW_FIELD \
-+ 0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
-+#define SLICE_FLAG_ALLOW_PLANE \
-+ 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-+
-+ /**
-+ * macroblock decision mode
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_decision;
-+#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp
-+#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits
-+#define FF_MB_DECISION_RD 2 ///< rate distortion
-+
-+ /**
-+ * custom intra quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* intra_matrix;
-+
-+ /**
-+ * custom inter quantization matrix
-+ * Must be allocated with the av_malloc() family of functions, and will be
-+ * freed in avcodec_free_context().
-+ * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-+ * - decoding: Set/allocated/freed by libavcodec.
-+ */
-+ uint16_t* inter_matrix;
-+
-+ /**
-+ * precision of the intra DC coefficient - 8
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec
-+ */
-+ int intra_dc_precision;
-+
-+ /**
-+ * Number of macroblock rows at the top which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_top;
-+
-+ /**
-+ * Number of macroblock rows at the bottom which are skipped.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int skip_bottom;
-+
-+ /**
-+ * minimum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmin;
-+
-+ /**
-+ * maximum MB Lagrange multiplier
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mb_lmax;
-+
-+ /**
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int bidir_refine;
-+
-+ /**
-+ * minimum GOP size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int keyint_min;
-+
-+ /**
-+ * number of reference frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by lavc.
-+ */
-+ int refs;
-+
-+ /**
-+ * Note: Value depends upon the compare function used for fullpel ME.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int mv0_threshold;
-+
-+ /**
-+ * Chromaticity coordinates of the source primaries.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorPrimaries color_primaries;
-+
-+ /**
-+ * Color Transfer Characteristic.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ /**
-+ * This defines the location of chroma samples.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVChromaLocation chroma_sample_location;
-+
-+ /**
-+ * Number of slices.
-+ * Indicates number of picture subdivisions. Used for parallelized
-+ * decoding.
-+ * - encoding: Set by user
-+ * - decoding: unused
-+ */
-+ int slices;
-+
-+ /** Field order
-+ * - encoding: set by libavcodec
-+ * - decoding: Set by user.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /* audio only */
-+ int sample_rate; ///< samples per second
-+ int channels; ///< number of audio channels
-+
-+ /**
-+ * audio sample format
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVSampleFormat sample_fmt; ///< sample format
-+
-+ /* The following data should not be initialized. */
-+ /**
-+ * Number of samples per channel in an audio frame.
-+ *
-+ * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
-+ * except the last must contain exactly frame_size samples per channel.
-+ * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then
-+ * the frame size is not restricted.
-+ * - decoding: may be set by some decoders to indicate constant frame size
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Frame counter, set by libavcodec.
-+ *
-+ * - decoding: total number of frames returned from the decoder so far.
-+ * - encoding: total number of frames passed to the encoder so far.
-+ *
-+ * @note the counter is not incremented if encoding/decoding resulted in
-+ * an error.
-+ */
-+ int frame_number;
-+
-+ /**
-+ * number of bytes per packet if constant and known or 0
-+ * Used by some WAV based audio codecs.
-+ */
-+ int block_align;
-+
-+ /**
-+ * Audio cutoff bandwidth (0 means "automatic")
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int cutoff;
-+
-+ /**
-+ * Audio channel layout.
-+ * - encoding: set by user.
-+ * - decoding: set by user, may be overwritten by libavcodec.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * Request decoder to use this channel layout if it can (0 for default)
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ uint64_t request_channel_layout;
-+
-+ /**
-+ * Type of service that the audio stream conveys.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ enum AVAudioServiceType audio_service_type;
-+
-+ /**
-+ * desired sample format
-+ * - encoding: Not used.
-+ * - decoding: Set by user.
-+ * Decoder will decode to this format if it can.
-+ */
-+ enum AVSampleFormat request_sample_fmt;
-+
-+ /**
-+ * This callback is called at the beginning of each frame to get data
-+ * buffer(s) for it. There may be one contiguous buffer for all the data or
-+ * there may be a buffer per each data plane or anything in between. What
-+ * this means is, you may set however many entries in buf[] you feel
-+ * necessary. Each buffer must be reference-counted using the AVBuffer API
-+ * (see description of buf[] below).
-+ *
-+ * The following fields will be set in the frame before this callback is
-+ * called:
-+ * - format
-+ * - width, height (video only)
-+ * - sample_rate, channel_layout, nb_samples (audio only)
-+ * Their values may differ from the corresponding values in
-+ * AVCodecContext. This callback must use the frame values, not the codec
-+ * context values, to calculate the required buffer size.
-+ *
-+ * This callback must fill the following fields in the frame:
-+ * - data[]
-+ * - linesize[]
-+ * - extended_data:
-+ * * if the data is planar audio with more than 8 channels, then this
-+ * callback must allocate and fill extended_data to contain all pointers
-+ * to all data planes. data[] must hold as many pointers as it can.
-+ * extended_data must be allocated with av_malloc() and will be freed in
-+ * av_frame_unref().
-+ * * otherwise extended_data must point to data
-+ * - buf[] must contain one or more pointers to AVBufferRef structures. Each
-+ * of the frame's data and extended_data pointers must be contained in these.
-+ * That is, one AVBufferRef for each allocated chunk of memory, not
-+ * necessarily one AVBufferRef per data[] entry. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
-+ * this callback and filled with the extra buffers if there are more
-+ * buffers than buf[] can hold. extended_buf will be freed in
-+ * av_frame_unref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
-+ * avcodec_default_get_buffer2() instead of providing buffers allocated by
-+ * some other means.
-+ *
-+ * Each data plane must be aligned to the maximum required by the target
-+ * CPU.
-+ *
-+ * @see avcodec_default_get_buffer2()
-+ *
-+ * Video:
-+ *
-+ * If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
-+ * (read and/or written to if it is writable) later by libavcodec.
-+ *
-+ * avcodec_align_dimensions2() should be used to find the required width and
-+ * height, as they normally need to be rounded up to the next multiple of 16.
-+ *
-+ * Some decoders do not support linesizes changing between frames.
-+ *
-+ * If frame multithreading is used, this callback may be called from a
-+ * different thread, but not from more than one at once. Does not need to be
-+ * reentrant.
-+ *
-+ * @see avcodec_align_dimensions2()
-+ *
-+ * Audio:
-+ *
-+ * Decoders request a buffer of a particular size by setting
-+ * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
-+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
-+ * to a smaller value in the output frame.
-+ *
-+ * As a convenience, av_samples_get_buffer_size() and
-+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
-+ * functions to find the required data size and to fill data pointers and
-+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
-+ * since all planes must be the same size.
-+ *
-+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
-+ *
-+ * - encoding: unused
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*get_buffer2)(struct AVCodecContext* s, AVFrame* frame, int flags);
-+
-+ /* - encoding parameters */
-+ float qcompress; ///< amount of qscale change between easy & hard scenes
-+ ///< (0.0-1.0)
-+ float qblur; ///< amount of qscale smoothing over time (0.0-1.0)
-+
-+ /**
-+ * minimum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmin;
-+
-+ /**
-+ * maximum quantizer
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int qmax;
-+
-+ /**
-+ * maximum quantizer difference between frames
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int max_qdiff;
-+
-+ /**
-+ * decoder bitstream buffer size
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_buffer_size;
-+
-+ /**
-+ * ratecontrol override, see RcOverride
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ int rc_override_count;
-+ RcOverride* rc_override;
-+
-+ /**
-+ * maximum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: Set by user, may be overwritten by libavcodec.
-+ */
-+ int64_t rc_max_rate;
-+
-+ /**
-+ * minimum bitrate
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int64_t rc_min_rate;
-+
-+ /**
-+ * Ratecontrol attempt to use, at maximum, <value> of what can be used without
-+ * an underflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_max_available_vbv_use;
-+
-+ /**
-+ * Ratecontrol attempt to use, at least, <value> times the amount needed to
-+ * prevent a vbv overflow.
-+ * - encoding: Set by user.
-+ * - decoding: unused.
-+ */
-+ float rc_min_vbv_overflow_use;
-+
-+ /**
-+ * Number of bits which should be loaded into the rc buffer before decoding
-+ * starts.
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int rc_initial_buffer_occupancy;
-+
-+ /**
-+ * trellis RD quantization
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int trellis;
-+
-+ /**
-+ * pass1 encoding statistics output buffer
-+ * - encoding: Set by libavcodec.
-+ * - decoding: unused
-+ */
-+ char* stats_out;
-+
-+ /**
-+ * pass2 encoding statistics input buffer
-+ * Concatenated stuff from stats_out of pass1 should be placed here.
-+ * - encoding: Allocated/set/freed by user.
-+ * - decoding: unused
-+ */
-+ char* stats_in;
-+
-+ /**
-+ * Work around bugs in encoders which sometimes cannot be detected
-+ * automatically.
-+ * - encoding: Set by user
-+ * - decoding: Set by user
-+ */
-+ int workaround_bugs;
-+#define FF_BUG_AUTODETECT 1 ///< autodetection
-+#define FF_BUG_XVID_ILACE 4
-+#define FF_BUG_UMP4 8
-+#define FF_BUG_NO_PADDING 16
-+#define FF_BUG_AMV 32
-+#define FF_BUG_QPEL_CHROMA 64
-+#define FF_BUG_STD_QPEL 128
-+#define FF_BUG_QPEL_CHROMA2 256
-+#define FF_BUG_DIRECT_BLOCKSIZE 512
-+#define FF_BUG_EDGE 1024
-+#define FF_BUG_HPEL_CHROMA 2048
-+#define FF_BUG_DC_CLIP 4096
-+#define FF_BUG_MS \
-+ 8192 ///< Work around various bugs in Microsoft's broken decoders.
-+#define FF_BUG_TRUNCATED 16384
-+#define FF_BUG_IEDGE 32768
-+
-+ /**
-+ * strictly follow the standard (MPEG-4, ...).
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ * Setting this to STRICT or higher means the encoder and decoder will
-+ * generally do stupid things, whereas setting it to unofficial or lower
-+ * will mean the encoder might produce output that is not supported by all
-+ * spec-compliant decoders. Decoders don't differentiate between normal,
-+ * unofficial and experimental (that is, they always try to decode things
-+ * when they can) unless they are explicitly asked to behave stupidly
-+ * (=strictly conform to the specs)
-+ */
-+ int strict_std_compliance;
-+#define FF_COMPLIANCE_VERY_STRICT \
-+ 2 ///< Strictly conform to an older more strict version of the spec or
-+ ///< reference software.
-+#define FF_COMPLIANCE_STRICT \
-+ 1 ///< Strictly conform to all the things in the spec no matter what
-+ ///< consequences.
-+#define FF_COMPLIANCE_NORMAL 0
-+#define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions
-+#define FF_COMPLIANCE_EXPERIMENTAL \
-+ -2 ///< Allow nonstandardized experimental things.
-+
-+ /**
-+ * error concealment flags
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int error_concealment;
-+#define FF_EC_GUESS_MVS 1
-+#define FF_EC_DEBLOCK 2
-+#define FF_EC_FAVOR_INTER 256
-+
-+ /**
-+ * debug
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int debug;
-+#define FF_DEBUG_PICT_INFO 1
-+#define FF_DEBUG_RC 2
-+#define FF_DEBUG_BITSTREAM 4
-+#define FF_DEBUG_MB_TYPE 8
-+#define FF_DEBUG_QP 16
-+#define FF_DEBUG_DCT_COEFF 0x00000040
-+#define FF_DEBUG_SKIP 0x00000080
-+#define FF_DEBUG_STARTCODE 0x00000100
-+#define FF_DEBUG_ER 0x00000400
-+#define FF_DEBUG_MMCO 0x00000800
-+#define FF_DEBUG_BUGS 0x00001000
-+#define FF_DEBUG_BUFFERS 0x00008000
-+#define FF_DEBUG_THREADS 0x00010000
-+#define FF_DEBUG_GREEN_MD 0x00800000
-+#define FF_DEBUG_NOMC 0x01000000
-+
-+ /**
-+ * Error recognition; may misdetect some more or less valid parts as errors.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int err_recognition;
-+
-+/**
-+ * Verify checksums embedded in the bitstream (could be of either encoded or
-+ * decoded data, depending on the codec) and print an error message on mismatch.
-+ * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
-+ * decoder returning an error.
-+ */
-+#define AV_EF_CRCCHECK (1 << 0)
-+#define AV_EF_BITSTREAM (1 << 1) ///< detect bitstream specification deviations
-+#define AV_EF_BUFFER (1 << 2) ///< detect improper bitstream length
-+#define AV_EF_EXPLODE (1 << 3) ///< abort decoding on minor error detection
-+
-+#define AV_EF_IGNORE_ERR (1 << 15) ///< ignore errors and continue
-+#define AV_EF_CAREFUL \
-+ (1 << 16) ///< consider things that violate the spec, are fast to calculate
-+ ///< and have not been seen in the wild as errors
-+#define AV_EF_COMPLIANT \
-+ (1 << 17) ///< consider all spec non compliances as errors
-+#define AV_EF_AGGRESSIVE \
-+ (1 << 18) ///< consider things that a sane encoder should not do as an error
-+
-+ /**
-+ * opaque 64-bit number (generally a PTS) that will be reordered and
-+ * output in AVFrame.reordered_opaque
-+ * - encoding: Set by libavcodec to the reordered_opaque of the input
-+ * frame corresponding to the last returned packet. Only
-+ * supported by encoders with the
-+ * AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
-+ * - decoding: Set by user.
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Hardware accelerator in use
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec
-+ */
-+ const struct AVHWAccel* hwaccel;
-+
-+ /**
-+ * Hardware accelerator context.
-+ * For some hardware accelerators, a global context needs to be
-+ * provided by the user. In that case, this holds display-dependent
-+ * data FFmpeg cannot instantiate itself. Please refer to the
-+ * FFmpeg HW accelerator documentation to know how to fill this.
-+ * - encoding: unused
-+ * - decoding: Set by user
-+ */
-+ void* hwaccel_context;
-+
-+ /**
-+ * error
-+ * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
-+ * - decoding: unused
-+ */
-+ uint64_t error[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * DCT algorithm, see FF_DCT_* below
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int dct_algo;
-+#define FF_DCT_AUTO 0
-+#define FF_DCT_FASTINT 1
-+#define FF_DCT_INT 2
-+#define FF_DCT_MMX 3
-+#define FF_DCT_ALTIVEC 5
-+#define FF_DCT_FAAN 6
-+
-+ /**
-+ * IDCT algorithm, see FF_IDCT_* below.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int idct_algo;
-+#define FF_IDCT_AUTO 0
-+#define FF_IDCT_INT 1
-+#define FF_IDCT_SIMPLE 2
-+#define FF_IDCT_SIMPLEMMX 3
-+#define FF_IDCT_ARM 7
-+#define FF_IDCT_ALTIVEC 8
-+#define FF_IDCT_SIMPLEARM 10
-+#define FF_IDCT_XVID 14
-+#define FF_IDCT_SIMPLEARMV5TE 16
-+#define FF_IDCT_SIMPLEARMV6 17
-+#define FF_IDCT_FAAN 20
-+#define FF_IDCT_SIMPLENEON 22
-+#define FF_IDCT_NONE \
-+ 24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
-+#define FF_IDCT_SIMPLEAUTO 128
-+
-+ /**
-+ * bits per sample/pixel from the demuxer (needed for huffyuv).
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by user.
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * Bits per sample/pixel of internal libavcodec pixel/sample format.
-+ * - encoding: set by user.
-+ * - decoding: set by libavcodec.
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ int lowres;
-+
-+ /**
-+ * thread count
-+ * is used to decide how many independent tasks should be passed to execute()
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ int thread_count;
-+
-+ /**
-+ * Which multithreading methods to use.
-+ * Use of FF_THREAD_FRAME will increase decoding delay by one frame per
-+ * thread, so clients which cannot provide future frames should not use it.
-+ *
-+ * - encoding: Set by user, otherwise the default is used.
-+ * - decoding: Set by user, otherwise the default is used.
-+ */
-+ int thread_type;
-+#define FF_THREAD_FRAME 1 ///< Decode more than one frame at once
-+#define FF_THREAD_SLICE \
-+ 2 ///< Decode more than one part of a single frame at once
-+
-+ /**
-+ * Which multithreading methods are in use by the codec.
-+ * - encoding: Set by libavcodec.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int active_thread_type;
-+
-+#if FF_API_THREAD_SAFE_CALLBACKS
-+ /**
-+ * Set by the client if its custom get_buffer() callback can be called
-+ * synchronously from another thread, which allows faster multithreaded
-+ * decoding. draw_horiz_band() will be called from other threads regardless of
-+ * this setting. Ignored if the default get_buffer() is used.
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ *
-+ * @deprecated the custom get_buffer2() callback should always be
-+ * thread-safe. Thread-unsafe get_buffer2() implementations will be
-+ * invalid starting with LIBAVCODEC_VERSION_MAJOR=60; in other words,
-+ * libavcodec will behave as if this field was always set to 1.
-+ * Callers that want to be forward compatible with future libavcodec
-+ * versions should wrap access to this field in
-+ * #if LIBAVCODEC_VERSION_MAJOR < 60
-+ */
-+ attribute_deprecated int thread_safe_callbacks;
-+#endif
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * @param count the number of things to execute
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg), void* arg2,
-+ int* ret, int count, int size);
-+
-+ /**
-+ * The codec may call this to execute several independent things.
-+ * It will return only after finishing all tasks.
-+ * The user may replace this with some multithreaded implementation,
-+ * the default implementation will execute the parts serially.
-+ * Also see avcodec_thread_init and e.g. the --enable-pthread configure
-+ * option.
-+ * @param c context passed also to func
-+ * @param count the number of things to execute
-+ * @param arg2 argument passed unchanged to func
-+ * @param ret return values of executed functions, must have space for "count"
-+ * values. May be NULL.
-+ * @param func function that will be called count times, with jobnr from 0 to
-+ * count-1. threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS
-+ * and so that no two instances of func executing at the same time will have
-+ * the same threadnr.
-+ * @return always 0 currently, but code should handle a future improvement
-+ * where when any call to func returns < 0 no further calls to func may be
-+ * done and < 0 is returned.
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: Set by libavcodec, user can override.
-+ */
-+ int (*execute2)(struct AVCodecContext* c,
-+ int (*func)(struct AVCodecContext* c2, void* arg, int jobnr,
-+ int threadnr),
-+ void* arg2, int* ret, int count);
-+
-+ /**
-+ * noise vs. sse weight for the nsse comparison function
-+ * - encoding: Set by user.
-+ * - decoding: unused
-+ */
-+ int nsse_weight;
-+
-+ /**
-+ * profile
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int profile;
-+#define FF_PROFILE_UNKNOWN -99
-+#define FF_PROFILE_RESERVED -100
-+
-+#define FF_PROFILE_AAC_MAIN 0
-+#define FF_PROFILE_AAC_LOW 1
-+#define FF_PROFILE_AAC_SSR 2
-+#define FF_PROFILE_AAC_LTP 3
-+#define FF_PROFILE_AAC_HE 4
-+#define FF_PROFILE_AAC_HE_V2 28
-+#define FF_PROFILE_AAC_LD 22
-+#define FF_PROFILE_AAC_ELD 38
-+#define FF_PROFILE_MPEG2_AAC_LOW 128
-+#define FF_PROFILE_MPEG2_AAC_HE 131
-+
-+#define FF_PROFILE_DNXHD 0
-+#define FF_PROFILE_DNXHR_LB 1
-+#define FF_PROFILE_DNXHR_SQ 2
-+#define FF_PROFILE_DNXHR_HQ 3
-+#define FF_PROFILE_DNXHR_HQX 4
-+#define FF_PROFILE_DNXHR_444 5
-+
-+#define FF_PROFILE_DTS 20
-+#define FF_PROFILE_DTS_ES 30
-+#define FF_PROFILE_DTS_96_24 40
-+#define FF_PROFILE_DTS_HD_HRA 50
-+#define FF_PROFILE_DTS_HD_MA 60
-+#define FF_PROFILE_DTS_EXPRESS 70
-+
-+#define FF_PROFILE_MPEG2_422 0
-+#define FF_PROFILE_MPEG2_HIGH 1
-+#define FF_PROFILE_MPEG2_SS 2
-+#define FF_PROFILE_MPEG2_SNR_SCALABLE 3
-+#define FF_PROFILE_MPEG2_MAIN 4
-+#define FF_PROFILE_MPEG2_SIMPLE 5
-+
-+#define FF_PROFILE_H264_CONSTRAINED (1 << 9) // 8+1; constraint_set1_flag
-+#define FF_PROFILE_H264_INTRA (1 << 11) // 8+3; constraint_set3_flag
-+
-+#define FF_PROFILE_H264_BASELINE 66
-+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66 | FF_PROFILE_H264_CONSTRAINED)
-+#define FF_PROFILE_H264_MAIN 77
-+#define FF_PROFILE_H264_EXTENDED 88
-+#define FF_PROFILE_H264_HIGH 100
-+#define FF_PROFILE_H264_HIGH_10 110
-+#define FF_PROFILE_H264_HIGH_10_INTRA (110 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
-+#define FF_PROFILE_H264_HIGH_422 122
-+#define FF_PROFILE_H264_HIGH_422_INTRA (122 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_STEREO_HIGH 128
-+#define FF_PROFILE_H264_HIGH_444 144
-+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
-+#define FF_PROFILE_H264_HIGH_444_INTRA (244 | FF_PROFILE_H264_INTRA)
-+#define FF_PROFILE_H264_CAVLC_444 44
-+
-+#define FF_PROFILE_VC1_SIMPLE 0
-+#define FF_PROFILE_VC1_MAIN 1
-+#define FF_PROFILE_VC1_COMPLEX 2
-+#define FF_PROFILE_VC1_ADVANCED 3
-+
-+#define FF_PROFILE_MPEG4_SIMPLE 0
-+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE 1
-+#define FF_PROFILE_MPEG4_CORE 2
-+#define FF_PROFILE_MPEG4_MAIN 3
-+#define FF_PROFILE_MPEG4_N_BIT 4
-+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE 5
-+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION 6
-+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE 7
-+#define FF_PROFILE_MPEG4_HYBRID 8
-+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME 9
-+#define FF_PROFILE_MPEG4_CORE_SCALABLE 10
-+#define FF_PROFILE_MPEG4_ADVANCED_CODING 11
-+#define FF_PROFILE_MPEG4_ADVANCED_CORE 12
-+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
-+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
-+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
-+
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 1
-+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 2
-+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 32768
-+#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
-+#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
-+
-+#define FF_PROFILE_VP9_0 0
-+#define FF_PROFILE_VP9_1 1
-+#define FF_PROFILE_VP9_2 2
-+#define FF_PROFILE_VP9_3 3
-+
-+#define FF_PROFILE_HEVC_MAIN 1
-+#define FF_PROFILE_HEVC_MAIN_10 2
-+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
-+#define FF_PROFILE_HEVC_REXT 4
-+
-+#define FF_PROFILE_VVC_MAIN_10 1
-+#define FF_PROFILE_VVC_MAIN_10_444 33
-+
-+#define FF_PROFILE_AV1_MAIN 0
-+#define FF_PROFILE_AV1_HIGH 1
-+#define FF_PROFILE_AV1_PROFESSIONAL 2
-+
-+#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT 0xc0
-+#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
-+#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT 0xc2
-+#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS 0xc3
-+#define FF_PROFILE_MJPEG_JPEG_LS 0xf7
-+
-+#define FF_PROFILE_SBC_MSBC 1
-+
-+#define FF_PROFILE_PRORES_PROXY 0
-+#define FF_PROFILE_PRORES_LT 1
-+#define FF_PROFILE_PRORES_STANDARD 2
-+#define FF_PROFILE_PRORES_HQ 3
-+#define FF_PROFILE_PRORES_4444 4
-+#define FF_PROFILE_PRORES_XQ 5
-+
-+#define FF_PROFILE_ARIB_PROFILE_A 0
-+#define FF_PROFILE_ARIB_PROFILE_C 1
-+
-+#define FF_PROFILE_KLVA_SYNC 0
-+#define FF_PROFILE_KLVA_ASYNC 1
-+
-+ /**
-+ * level
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int level;
-+#define FF_LEVEL_UNKNOWN -99
-+
-+ /**
-+ * Skip loop filtering for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_loop_filter;
-+
-+ /**
-+ * Skip IDCT/dequantization for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_idct;
-+
-+ /**
-+ * Skip decoding for selected frames.
-+ * - encoding: unused
-+ * - decoding: Set by user.
-+ */
-+ enum AVDiscard skip_frame;
-+
-+ /**
-+ * Header containing style information for text subtitles.
-+ * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
-+ * [Script Info] and [V4+ Styles] section, plus the [Events] line and
-+ * the Format line following. It shouldn't include any Dialogue line.
-+ * - encoding: Set/allocated/freed by user (before avcodec_open2())
-+ * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
-+ */
-+ uint8_t* subtitle_header;
-+ int subtitle_header_size;
-+
-+ /**
-+ * Audio only. The number of "priming" samples (padding) inserted by the
-+ * encoder at the beginning of the audio. I.e. this number of leading
-+ * decoded samples must be discarded by the caller to get the original audio
-+ * without leading padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: Set by libavcodec. The timestamps on the output packets are
-+ * adjusted by the encoder so that they always refer to the
-+ * first sample of the data actually contained in the packet,
-+ * including any added padding. E.g. if the timebase is
-+ * 1/samplerate and the timestamp of the first input sample is
-+ * 0, the timestamp of the first output packet will be
-+ * -initial_padding.
-+ */
-+ int initial_padding;
-+
-+ /**
-+ * - decoding: For codecs that store a framerate value in the compressed
-+ * bitstream, the decoder may export it here. { 0, 1} when
-+ * unknown.
-+ * - encoding: May be used to signal the framerate of CFR content to an
-+ * encoder.
-+ */
-+ AVRational framerate;
-+
-+ /**
-+ * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx.
-+ * - encoding: unused.
-+ * - decoding: Set by libavcodec before calling get_format()
-+ */
-+ enum AVPixelFormat sw_pix_fmt;
-+
-+ /**
-+ * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
-+ * - encoding unused.
-+ * - decoding set by user.
-+ */
-+ AVRational pkt_timebase;
-+
-+ /**
-+ * AVCodecDescriptor
-+ * - encoding: unused.
-+ * - decoding: set by libavcodec.
-+ */
-+ const AVCodecDescriptor* codec_descriptor;
-+
-+ /**
-+ * Current statistics for PTS correction.
-+ * - decoding: maintained and used by libavcodec, not intended to be used by
-+ * user apps
-+ * - encoding: unused
-+ */
-+ int64_t
-+ pts_correction_num_faulty_pts; /// Number of incorrect PTS values so far
-+ int64_t
-+ pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
-+ int64_t pts_correction_last_pts; /// PTS of the last frame
-+ int64_t pts_correction_last_dts; /// DTS of the last frame
-+
-+ /**
-+ * Character encoding of the input subtitles file.
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ char* sub_charenc;
-+
-+ /**
-+ * Subtitles character encoding mode. Formats or codecs might be adjusting
-+ * this setting (if they are doing the conversion themselves for instance).
-+ * - decoding: set by libavcodec
-+ * - encoding: unused
-+ */
-+ int sub_charenc_mode;
-+#define FF_SUB_CHARENC_MODE_DO_NOTHING \
-+ -1 ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8,
-+ ///< or the codec is bitmap for instance)
-+#define FF_SUB_CHARENC_MODE_AUTOMATIC \
-+ 0 ///< libavcodec will select the mode itself
-+#define FF_SUB_CHARENC_MODE_PRE_DECODER \
-+ 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the
-+ ///< decoder, requires iconv
-+#define FF_SUB_CHARENC_MODE_IGNORE \
-+ 2 ///< neither convert the subtitles, nor check them for valid UTF-8
-+
-+ /**
-+ * Skip processing alpha if supported by codec.
-+ * Note that if the format uses pre-multiplied alpha (common with VP6,
-+ * and recommended due to better video quality/compression)
-+ * the image will look as if alpha-blended onto a black background.
-+ * However for formats that do not use pre-multiplied alpha
-+ * there might be serious artefacts (though e.g. libswscale currently
-+ * assumes pre-multiplied alpha anyway).
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int skip_alpha;
-+
-+ /**
-+ * Number of samples to skip after a discontinuity
-+ * - decoding: unused
-+ * - encoding: set by libavcodec
-+ */
-+ int seek_preroll;
-+
-+#if FF_API_DEBUG_MV
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int debug_mv;
-+# define FF_DEBUG_VIS_MV_P_FOR \
-+ 0x00000001 // visualize forward predicted MVs of P frames
-+# define FF_DEBUG_VIS_MV_B_FOR \
-+ 0x00000002 // visualize forward predicted MVs of B frames
-+# define FF_DEBUG_VIS_MV_B_BACK \
-+ 0x00000004 // visualize backward predicted MVs of B frames
-+#endif
-+
-+ /**
-+ * custom intra quantization matrix
-+ * - encoding: Set by user, can be NULL.
-+ * - decoding: unused.
-+ */
-+ uint16_t* chroma_intra_matrix;
-+
-+ /**
-+ * dump format separator.
-+ * can be ", " or "\n " or anything else
-+ * - encoding: Set by user.
-+ * - decoding: Set by user.
-+ */
-+ uint8_t* dump_separator;
-+
-+ /**
-+ * ',' separated list of allowed decoders.
-+ * If NULL then all are allowed
-+ * - encoding: unused
-+ * - decoding: set by user
-+ */
-+ char* codec_whitelist;
-+
-+ /**
-+ * Properties of the stream that gets decoded
-+ * - encoding: unused
-+ * - decoding: set by libavcodec
-+ */
-+ unsigned properties;
-+#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001
-+#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
-+#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004
-+
-+ /**
-+ * Additional data associated with the entire coded stream.
-+ *
-+ * - decoding: unused
-+ * - encoding: may be set by libavcodec after avcodec_open2().
-+ */
-+ AVPacketSideData* coded_side_data;
-+ int nb_coded_side_data;
-+
-+ /**
-+ * A reference to the AVHWFramesContext describing the input (for encoding)
-+ * or output (decoding) frames. The reference is set by the caller and
-+ * afterwards owned (and freed) by libavcodec - it should never be read by
-+ * the caller after being set.
-+ *
-+ * - decoding: This field should be set by the caller from the get_format()
-+ * callback. The previous reference (if any) will always be
-+ * unreffed by libavcodec before the get_format() call.
-+ *
-+ * If the default get_buffer2() is used with a hwaccel pixel
-+ * format, then this AVHWFramesContext will be used for
-+ * allocating the frame buffers.
-+ *
-+ * - encoding: For hardware encoders configured to use a hwaccel pixel
-+ * format, this field should be set by the caller to a reference
-+ * to the AVHWFramesContext describing input frames.
-+ * AVHWFramesContext.format must be equal to
-+ * AVCodecContext.pix_fmt.
-+ *
-+ * This field should be set before avcodec_open2() is called.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+#if FF_API_SUB_TEXT_FORMAT
-+ /**
-+ * @deprecated unused
-+ */
-+ attribute_deprecated int sub_text_format;
-+# define FF_SUB_TEXT_FMT_ASS 0
-+#endif
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ *
-+ * - decoding: unused
-+ * - encoding: unused
-+ */
-+ int trailing_padding;
-+
-+ /**
-+ * The number of pixels per image to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_pixels;
-+
-+ /**
-+ * A reference to the AVHWDeviceContext describing the device which will
-+ * be used by a hardware encoder/decoder. The reference is set by the
-+ * caller and afterwards owned (and freed) by libavcodec.
-+ *
-+ * This should be used if either the codec device does not require
-+ * hardware frames or any that are used are to be allocated internally by
-+ * libavcodec. If the user wishes to supply any of the frames used as
-+ * encoder input or decoder output then hw_frames_ctx should be used
-+ * instead. When hw_frames_ctx is set in get_format() for a decoder, this
-+ * field will be ignored while decoding the associated stream segment, but
-+ * may again be used on a following one after another get_format() call.
-+ *
-+ * For both encoders and decoders this field should be set before
-+ * avcodec_open2() is called and must not be written to thereafter.
-+ *
-+ * Note that some decoders may require this field to be set initially in
-+ * order to support hw_frames_ctx at all - in that case, all frames
-+ * contexts used must be created on the same device.
-+ */
-+ AVBufferRef* hw_device_ctx;
-+
-+ /**
-+ * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated
-+ * decoding (if active).
-+ * - encoding: unused
-+ * - decoding: Set by user (either before avcodec_open2(), or in the
-+ * AVCodecContext.get_format callback)
-+ */
-+ int hwaccel_flags;
-+
-+ /**
-+ * Video decoding only. Certain video codecs support cropping, meaning that
-+ * only a sub-rectangle of the decoded frame is intended for display. This
-+ * option controls how cropping is handled by libavcodec.
-+ *
-+ * When set to 1 (the default), libavcodec will apply cropping internally.
-+ * I.e. it will modify the output frame width/height fields and offset the
-+ * data pointers (only by as much as possible while preserving alignment, or
-+ * by the full amount if the AV_CODEC_FLAG_UNALIGNED flag is set) so that
-+ * the frames output by the decoder refer only to the cropped area. The
-+ * crop_* fields of the output frames will be zero.
-+ *
-+ * When set to 0, the width/height fields of the output frames will be set
-+ * to the coded dimensions and the crop_* fields will describe the cropping
-+ * rectangle. Applying the cropping is left to the caller.
-+ *
-+ * @warning When hardware acceleration with opaque output frames is used,
-+ * libavcodec is unable to apply cropping from the top/left border.
-+ *
-+ * @note when this option is set to zero, the width/height fields of the
-+ * AVCodecContext and output AVFrames have different meanings. The codec
-+ * context fields store display dimensions (with the coded dimensions in
-+ * coded_width/height), while the frame fields store the coded dimensions
-+ * (with the display dimensions being determined by the crop_* fields).
-+ */
-+ int apply_cropping;
-+
-+ /*
-+ * Video decoding only. Sets the number of extra hardware frames which
-+ * the decoder will allocate for use by the caller. This must be set
-+ * before avcodec_open2() is called.
-+ *
-+ * Some hardware decoders require all frames that they will use for
-+ * output to be defined in advance before decoding starts. For such
-+ * decoders, the hardware frame pool must therefore be of a fixed size.
-+ * The extra frames set here are on top of any number that the decoder
-+ * needs internally in order to operate normally (for example, frames
-+ * used as reference pictures).
-+ */
-+ int extra_hw_frames;
-+
-+ /**
-+ * The percentage of damaged samples to discard a frame.
-+ *
-+ * - decoding: set by user
-+ * - encoding: unused
-+ */
-+ int discard_damaged_percentage;
-+
-+ /**
-+ * The number of samples per frame to maximally accept.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int64_t max_samples;
-+
-+ /**
-+ * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of
-+ * metadata exported in frame, packet, or coded stream side data by
-+ * decoders and encoders.
-+ *
-+ * - decoding: set by user
-+ * - encoding: set by user
-+ */
-+ int export_side_data;
-+
-+ /**
-+ * This callback is called at the beginning of each packet to get a data
-+ * buffer for it.
-+ *
-+ * The following field will be set in the packet before this callback is
-+ * called:
-+ * - size
-+ * This callback must use the above value to calculate the required buffer
-+ * size, which must padded by at least AV_INPUT_BUFFER_PADDING_SIZE bytes.
-+ *
-+ * In some specific cases, the encoder may not use the entire buffer allocated
-+ * by this callback. This will be reflected in the size value in the packet
-+ * once returned by avcodec_receive_packet().
-+ *
-+ * This callback must fill the following fields in the packet:
-+ * - data: alignment requirements for AVPacket apply, if any. Some
-+ * architectures and encoders may benefit from having aligned data.
-+ * - buf: must contain a pointer to an AVBufferRef structure. The packet's
-+ * data pointer must be contained in it. See: av_buffer_create(),
-+ * av_buffer_alloc(), and av_buffer_ref().
-+ *
-+ * If AV_CODEC_CAP_DR1 is not set then get_encode_buffer() must call
-+ * avcodec_default_get_encode_buffer() instead of providing a buffer allocated
-+ * by some other means.
-+ *
-+ * The flags field may contain a combination of AV_GET_ENCODE_BUFFER_FLAG_
-+ * flags. They may be used for example to hint what use the buffer may get
-+ * after being created. Implementations of this callback may ignore flags they
-+ * don't understand. If AV_GET_ENCODE_BUFFER_FLAG_REF is set in flags then the
-+ * packet may be reused (read and/or written to if it is writable) later by
-+ * libavcodec.
-+ *
-+ * This callback must be thread-safe, as when frame threading is used, it may
-+ * be called from multiple threads simultaneously.
-+ *
-+ * @see avcodec_default_get_encode_buffer()
-+ *
-+ * - encoding: Set by libavcodec, user can override.
-+ * - decoding: unused
-+ */
-+ int (*get_encode_buffer)(struct AVCodecContext* s, AVPacket* pkt, int flags);
-+} AVCodecContext;
-+
-+struct MpegEncContext;
-+
-+/**
-+ * @defgroup lavc_hwaccel AVHWAccel
-+ *
-+ * @note Nothing in this structure should be accessed by the user. At some
-+ * point in future it will not be externally visible at all.
-+ *
-+ * @{
-+ */
-+typedef struct AVHWAccel {
-+ /**
-+ * Name of the hardware accelerated codec.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ */
-+ const char* name;
-+
-+ /**
-+ * Type of codec implemented by the hardware accelerator.
-+ *
-+ * See AVMEDIA_TYPE_xxx
-+ */
-+ enum AVMediaType type;
-+
-+ /**
-+ * Codec implemented by the hardware accelerator.
-+ *
-+ * See AV_CODEC_ID_xxx
-+ */
-+ enum AVCodecID id;
-+
-+ /**
-+ * Supported pixel format.
-+ *
-+ * Only hardware accelerated formats are supported here.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+
-+ /**
-+ * Hardware accelerated codec capabilities.
-+ * see AV_HWACCEL_CODEC_CAP_*
-+ */
-+ int capabilities;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ /**
-+ * Allocate a custom buffer
-+ */
-+ int (*alloc_frame)(AVCodecContext* avctx, AVFrame* frame);
-+
-+ /**
-+ * Called at the beginning of each frame or field picture.
-+ *
-+ * Meaningful frame information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ *
-+ * Note that buf can be NULL along with buf_size set to 0.
-+ * Otherwise, this means the whole frame is available at this point.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the frame data buffer base
-+ * @param buf_size the size of the frame in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*start_frame)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for parameter data (SPS/PPS/VPS etc).
-+ *
-+ * Useful for hardware decoders which keep persistent state about the
-+ * video parameters, and need to receive any changes to update that state.
-+ *
-+ * @param avctx the codec context
-+ * @param type the nal unit type
-+ * @param buf the nal unit data buffer
-+ * @param buf_size the size of the nal unit in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_params)(AVCodecContext* avctx, int type, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Callback for each slice.
-+ *
-+ * Meaningful slice information (codec specific) is guaranteed to
-+ * be parsed at this point. This function is mandatory.
-+ * The only exception is XvMC, that works on MB level.
-+ *
-+ * @param avctx the codec context
-+ * @param buf the slice data buffer base
-+ * @param buf_size the size of the slice in bytes
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*decode_slice)(AVCodecContext* avctx, const uint8_t* buf,
-+ uint32_t buf_size);
-+
-+ /**
-+ * Called at the end of each frame or field picture.
-+ *
-+ * The whole picture is parsed at this point and can now be sent
-+ * to the hardware accelerator. This function is mandatory.
-+ *
-+ * @param avctx the codec context
-+ * @return zero if successful, a negative value otherwise
-+ */
-+ int (*end_frame)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of per-frame hardware accelerator private data.
-+ *
-+ * Private data is allocated with av_mallocz() before
-+ * AVCodecContext.get_buffer() and deallocated after
-+ * AVCodecContext.release_buffer().
-+ */
-+ int frame_priv_data_size;
-+
-+ /**
-+ * Called for every Macroblock in a slice.
-+ *
-+ * XvMC uses it to replace the ff_mpv_reconstruct_mb().
-+ * Instead of decoding to raw picture, MB parameters are
-+ * stored in an array provided by the video driver.
-+ *
-+ * @param s the mpeg context
-+ */
-+ void (*decode_mb)(struct MpegEncContext* s);
-+
-+ /**
-+ * Initialize the hwaccel private data.
-+ *
-+ * This will be called from ff_get_format(), after hwaccel and
-+ * hwaccel_context are set and the hwaccel private data in AVCodecInternal
-+ * is allocated.
-+ */
-+ int (*init)(AVCodecContext* avctx);
-+
-+ /**
-+ * Uninitialize the hwaccel private data.
-+ *
-+ * This will be called from get_format() or avcodec_close(), after hwaccel
-+ * and hwaccel_context are already uninitialized.
-+ */
-+ int (*uninit)(AVCodecContext* avctx);
-+
-+ /**
-+ * Size of the private data to allocate in
-+ * AVCodecInternal.hwaccel_priv_data.
-+ */
-+ int priv_data_size;
-+
-+ /**
-+ * Internal hwaccel capabilities.
-+ */
-+ int caps_internal;
-+
-+ /**
-+ * Fill the given hw_frames context with current codec parameters. Called
-+ * from get_format. Refer to avcodec_get_hw_frames_parameters() for
-+ * details.
-+ *
-+ * This CAN be called before AVHWAccel.init is called, and you must assume
-+ * that avctx->hwaccel_priv_data is invalid.
-+ */
-+ int (*frame_params)(AVCodecContext* avctx, AVBufferRef* hw_frames_ctx);
-+} AVHWAccel;
-+
-+/**
-+ * HWAccel is experimental and is thus avoided in favor of non experimental
-+ * codecs
-+ */
-+#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
-+
-+/**
-+ * Hardware acceleration should be used for decoding even if the codec level
-+ * used is unknown or higher than the maximum supported level reported by the
-+ * hardware driver.
-+ *
-+ * It's generally a good idea to pass this flag unless you have a specific
-+ * reason not to, as hardware tends to under-report supported levels.
-+ */
-+#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
-+
-+/**
-+ * Hardware acceleration can output YUV pixel formats with a different chroma
-+ * sampling than 4:2:0 and/or other than 8 bits per component.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
-+
-+/**
-+ * Hardware acceleration should still be attempted for decoding when the
-+ * codec profile does not match the reported capabilities of the hardware.
-+ *
-+ * For example, this can be used to try to decode baseline profile H.264
-+ * streams in hardware - it will often succeed, because many streams marked
-+ * as baseline profile actually conform to constrained baseline profile.
-+ *
-+ * @warning If the stream is actually not supported then the behaviour is
-+ * undefined, and may include returning entirely incorrect output
-+ * while indicating success.
-+ */
-+#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
-+
-+/**
-+ * @}
-+ */
-+
-+enum AVSubtitleType {
-+ SUBTITLE_NONE,
-+
-+ SUBTITLE_BITMAP, ///< A bitmap, pict will be set
-+
-+ /**
-+ * Plain text, the text field must be set by the decoder and is
-+ * authoritative. ass and pict fields may contain approximations.
-+ */
-+ SUBTITLE_TEXT,
-+
-+ /**
-+ * Formatted text, the ass field must be set by the decoder and is
-+ * authoritative. pict and text fields may contain approximations.
-+ */
-+ SUBTITLE_ASS,
-+};
-+
-+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
-+
-+typedef struct AVSubtitleRect {
-+ int x; ///< top left corner of pict, undefined when pict is not set
-+ int y; ///< top left corner of pict, undefined when pict is not set
-+ int w; ///< width of pict, undefined when pict is not set
-+ int h; ///< height of pict, undefined when pict is not set
-+ int nb_colors; ///< number of colors in pict, undefined when pict is not set
-+
-+ /**
-+ * data+linesize for the bitmap of this subtitle.
-+ * Can be set for text/ass as well once they are rendered.
-+ */
-+ uint8_t* data[4];
-+ int linesize[4];
-+
-+ enum AVSubtitleType type;
-+
-+ char* text; ///< 0 terminated plain UTF-8 text
-+
-+ /**
-+ * 0 terminated ASS/SSA compatible event line.
-+ * The presentation of this is unaffected by the other values in this
-+ * struct.
-+ */
-+ char* ass;
-+
-+ int flags;
-+} AVSubtitleRect;
-+
-+typedef struct AVSubtitle {
-+ uint16_t format; /* 0 = graphics */
-+ uint32_t start_display_time; /* relative to packet pts, in ms */
-+ uint32_t end_display_time; /* relative to packet pts, in ms */
-+ unsigned num_rects;
-+ AVSubtitleRect** rects;
-+ int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
-+} AVSubtitle;
-+
-+/**
-+ * Return the LIBAVCODEC_VERSION_INT constant.
-+ */
-+unsigned avcodec_version(void);
-+
-+/**
-+ * Return the libavcodec build-time configuration.
-+ */
-+const char* avcodec_configuration(void);
-+
-+/**
-+ * Return the libavcodec license.
-+ */
-+const char* avcodec_license(void);
-+
-+/**
-+ * Allocate an AVCodecContext and set its fields to default values. The
-+ * resulting struct should be freed with avcodec_free_context().
-+ *
-+ * @param codec if non-NULL, allocate private data and initialize defaults
-+ * for the given codec. It is illegal to then call avcodec_open2()
-+ * with a different codec.
-+ * If NULL, then the codec-specific defaults won't be initialized,
-+ * which may result in suboptimal default settings (this is
-+ * important mainly for encoders, e.g. libx264).
-+ *
-+ * @return An AVCodecContext filled with default values or NULL on failure.
-+ */
-+AVCodecContext* avcodec_alloc_context3(const AVCodec* codec);
-+
-+/**
-+ * Free the codec context and everything associated with it and write NULL to
-+ * the provided pointer.
-+ */
-+void avcodec_free_context(AVCodecContext** avctx);
-+
-+/**
-+ * Get the AVClass for AVCodecContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_class(void);
-+
-+#if FF_API_GET_FRAME_CLASS
-+/**
-+ * @deprecated This function should not be used.
-+ */
-+attribute_deprecated const AVClass* avcodec_get_frame_class(void);
-+#endif
-+
-+/**
-+ * Get the AVClass for AVSubtitleRect. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* avcodec_get_subtitle_rect_class(void);
-+
-+/**
-+ * Fill the parameters struct based on the values from the supplied codec
-+ * context. Any allocated fields in par are freed and replaced with duplicates
-+ * of the corresponding fields in codec.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure
-+ */
-+int avcodec_parameters_from_context(AVCodecParameters* par,
-+ const AVCodecContext* codec);
-+
-+/**
-+ * Fill the codec context based on the values from the supplied codec
-+ * parameters. Any allocated fields in codec that have a corresponding field in
-+ * par are freed and replaced with duplicates of the corresponding field in par.
-+ * Fields in codec that do not have a counterpart in par are not touched.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_to_context(AVCodecContext* codec,
-+ const AVCodecParameters* par);
-+
-+/**
-+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
-+ * function the context has to be allocated with avcodec_alloc_context3().
-+ *
-+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
-+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
-+ * retrieving a codec.
-+ *
-+ * @warning This function is not thread safe!
-+ *
-+ * @note Always call this function before using decoding routines (such as
-+ * @ref avcodec_receive_frame()).
-+ *
-+ * @code
-+ * av_dict_set(&opts, "b", "2.5M", 0);
-+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
-+ * if (!codec)
-+ * exit(1);
-+ *
-+ * context = avcodec_alloc_context3(codec);
-+ *
-+ * if (avcodec_open2(context, codec, opts) < 0)
-+ * exit(1);
-+ * @endcode
-+ *
-+ * @param avctx The context to initialize.
-+ * @param codec The codec to open this context for. If a non-NULL codec has been
-+ * previously passed to avcodec_alloc_context3() or
-+ * for this context, then this parameter MUST be either NULL or
-+ * equal to the previously passed codec.
-+ * @param options A dictionary filled with AVCodecContext and codec-private
-+ * options. On return this object will be filled with options that were not
-+ * found.
-+ *
-+ * @return zero on success, a negative value on error
-+ * @see avcodec_alloc_context3(), avcodec_find_decoder(),
-+ * avcodec_find_encoder(), av_dict_set(), av_opt_find().
-+ */
-+int avcodec_open2(AVCodecContext* avctx, const AVCodec* codec,
-+ AVDictionary** options);
-+
-+/**
-+ * Close a given AVCodecContext and free all the data associated with it
-+ * (but not the AVCodecContext itself).
-+ *
-+ * Calling this function on an AVCodecContext that hasn't been opened will free
-+ * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
-+ * codec. Subsequent calls will do nothing.
-+ *
-+ * @note Do not use this function. Use avcodec_free_context() to destroy a
-+ * codec context (either open or closed). Opening and closing a codec context
-+ * multiple times is not supported anymore -- use multiple codec contexts
-+ * instead.
-+ */
-+int avcodec_close(AVCodecContext* avctx);
-+
-+/**
-+ * Free all allocated data in the given subtitle struct.
-+ *
-+ * @param sub AVSubtitle to free.
-+ */
-+void avsubtitle_free(AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_decoding
-+ * @{
-+ */
-+
-+/**
-+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
-+ * it can be called by custom get_buffer2() implementations for decoders without
-+ * AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_buffer2(AVCodecContext* s, AVFrame* frame, int flags);
-+
-+/**
-+ * The default callback for AVCodecContext.get_encode_buffer(). It is made
-+ * public so it can be called by custom get_encode_buffer() implementations for
-+ * encoders without AV_CODEC_CAP_DR1 set.
-+ */
-+int avcodec_default_get_encode_buffer(AVCodecContext* s, AVPacket* pkt,
-+ int flags);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you do not use any horizontal
-+ * padding.
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions(AVCodecContext* s, int* width, int* height);
-+
-+/**
-+ * Modify width and height values so that they will result in a memory
-+ * buffer that is acceptable for the codec if you also ensure that all
-+ * line sizes are a multiple of the respective linesize_align[i].
-+ *
-+ * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
-+ */
-+void avcodec_align_dimensions2(AVCodecContext* s, int* width, int* height,
-+ int linesize_align[AV_NUM_DATA_POINTERS]);
-+
-+/**
-+ * Converts AVChromaLocation to swscale x/y chroma position.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+int avcodec_enum_to_chroma_pos(int* xpos, int* ypos, enum AVChromaLocation pos);
-+
-+/**
-+ * Converts swscale x/y chroma position to AVChromaLocation.
-+ *
-+ * The positions represent the chroma (0,0) position in a coordinates system
-+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
-+ *
-+ * @param xpos horizontal chroma sample position
-+ * @param ypos vertical chroma sample position
-+ */
-+enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-+
-+/**
-+ * Decode a subtitle message.
-+ * Return a negative value on error, otherwise return the number of bytes used.
-+ * If no subtitle could be decompressed, got_sub_ptr is zero.
-+ * Otherwise, the subtitle is stored in *sub.
-+ * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
-+ * simplicity, because the performance difference is expected to be negligible
-+ * and reusing a get_buffer written for video codecs would probably perform
-+ * badly due to a potentially very different allocation pattern.
-+ *
-+ * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between
-+ * input and output. This means that for some packets they will not immediately
-+ * produce decoded output and need to be flushed at the end of decoding to get
-+ * all the decoded data. Flushing is done by calling this function with packets
-+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
-+ * returning subtitles. It is safe to flush even those decoders that are not
-+ * marked with AV_CODEC_CAP_DELAY, then no subtitles will be returned.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx the codec context
-+ * @param[out] sub The preallocated AVSubtitle in which the decoded subtitle
-+ * will be stored, must be freed with avsubtitle_free if *got_sub_ptr is set.
-+ * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed,
-+ * otherwise, it is nonzero.
-+ * @param[in] avpkt The input AVPacket containing the input buffer.
-+ */
-+int avcodec_decode_subtitle2(AVCodecContext* avctx, AVSubtitle* sub,
-+ int* got_sub_ptr, AVPacket* avpkt);
-+
-+/**
-+ * Supply raw packet data as input to a decoder.
-+ *
-+ * Internally, this call will copy relevant AVCodecContext fields, which can
-+ * influence decoding per-packet, and apply them when the packet is actually
-+ * decoded. (For example AVCodecContext.skip_frame, which might direct the
-+ * decoder to drop the frame contained by the packet sent with this function.)
-+ *
-+ * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE
-+ * larger than the actual read bytes because some optimized bitstream
-+ * readers read 32 or 64 bits at once and could read over the end.
-+ *
-+ * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
-+ * before packets may be fed to the decoder.
-+ *
-+ * @param avctx codec context
-+ * @param[in] avpkt The input AVPacket. Usually, this will be a single video
-+ * frame, or several complete audio frames.
-+ * Ownership of the packet remains with the caller, and the
-+ * decoder will not write to the packet. The decoder may create
-+ * a reference to the packet data (or copy it if the packet is
-+ * not reference-counted).
-+ * Unlike with older APIs, the packet is always fully consumed,
-+ * and if it contains multiple frames (e.g. some audio codecs),
-+ * will require you to call avcodec_receive_frame() multiple
-+ * times afterwards before you can send a new packet.
-+ * It can be NULL (or an AVPacket with data set to NULL and
-+ * size set to 0); in this case, it is considered a flush
-+ * packet, which signals the end of the stream. Sending the
-+ * first flush packet will return success. Subsequent ones are
-+ * unnecessary and will return AVERROR_EOF. If the decoder
-+ * still has frames buffered, it will return them after sending
-+ * a flush packet.
-+ *
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_frame() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the decoder has been flushed, and no new packets can
-+ * be sent to it (also returned if more than 1 flush
-+ * packet is sent)
-+ * AVERROR(EINVAL): codec not opened, it is an encoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate decoding errors
-+ */
-+int avcodec_send_packet(AVCodecContext* avctx, const AVPacket* avpkt);
-+
-+/**
-+ * Return decoded output data from a decoder.
-+ *
-+ * @param avctx codec context
-+ * @param frame This will be set to a reference-counted video or audio
-+ * frame (depending on the decoder type) allocated by the
-+ * decoder. Note that the function will always call
-+ * av_frame_unref(frame) before doing anything else.
-+ *
-+ * @return
-+ * 0: success, a frame was returned
-+ * AVERROR(EAGAIN): output is not available in this state - user must try
-+ * to send new input
-+ * AVERROR_EOF: the decoder has been fully flushed, and there will be
-+ * no more output frames
-+ * AVERROR(EINVAL): codec not opened, or it is an encoder
-+ * AVERROR_INPUT_CHANGED: current decoded frame has changed parameters
-+ * with respect to first decoded frame. Applicable
-+ * when flag AV_CODEC_FLAG_DROPCHANGED is set.
-+ * other negative values: legitimate decoding errors
-+ */
-+int avcodec_receive_frame(AVCodecContext* avctx, AVFrame* frame);
-+
-+/**
-+ * Supply a raw video or audio frame to the encoder. Use
-+ * avcodec_receive_packet() to retrieve buffered output packets.
-+ *
-+ * @param avctx codec context
-+ * @param[in] frame AVFrame containing the raw audio or video frame to be
-+ * encoded. Ownership of the frame remains with the caller, and the encoder will
-+ * not write to the frame. The encoder may create a reference to the frame data
-+ * (or copy it if the frame is not reference-counted). It can be NULL, in which
-+ * case it is considered a flush packet. This signals the end of the stream. If
-+ * the encoder still has packets buffered, it will return them after this call.
-+ * Once flushing mode has been entered, additional flush packets are ignored,
-+ * and sending frames will return AVERROR_EOF.
-+ *
-+ * For audio:
-+ * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame
-+ * can have any number of samples.
-+ * If it is not set, frame->nb_samples must be equal to
-+ * avctx->frame_size for all frames except the last.
-+ * The final frame may be smaller than avctx->frame_size.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): input is not accepted in the current state - user
-+ * must read output with avcodec_receive_packet() (once
-+ * all output is read, the packet should be resent, and
-+ * the call will not fail with EAGAIN).
-+ * AVERROR_EOF: the encoder has been flushed, and no new frames can
-+ * be sent to it
-+ * AVERROR(EINVAL): codec not opened, it is a decoder, or requires flush
-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_send_frame(AVCodecContext* avctx, const AVFrame* frame);
-+
-+/**
-+ * Read encoded data from the encoder.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt This will be set to a reference-counted packet allocated by the
-+ * encoder. Note that the function will always call
-+ * av_packet_unref(avpkt) before doing anything else.
-+ * @return 0 on success, otherwise negative error code:
-+ * AVERROR(EAGAIN): output is not available in the current state - user
-+ * must try to send input
-+ * AVERROR_EOF: the encoder has been fully flushed, and there will be
-+ * no more output packets
-+ * AVERROR(EINVAL): codec not opened, or it is a decoder
-+ * other errors: legitimate encoding errors
-+ */
-+int avcodec_receive_packet(AVCodecContext* avctx, AVPacket* avpkt);
-+
-+/**
-+ * Create and return a AVHWFramesContext with values adequate for hardware
-+ * decoding. This is meant to get called from the get_format callback, and is
-+ * a helper for preparing a AVHWFramesContext for AVCodecContext.hw_frames_ctx.
-+ * This API is for decoding with certain hardware acceleration modes/APIs only.
-+ *
-+ * The returned AVHWFramesContext is not initialized. The caller must do this
-+ * with av_hwframe_ctx_init().
-+ *
-+ * Calling this function is not a requirement, but makes it simpler to avoid
-+ * codec or hardware API specific details when manually allocating frames.
-+ *
-+ * Alternatively to this, an API user can set AVCodecContext.hw_device_ctx,
-+ * which sets up AVCodecContext.hw_frames_ctx fully automatically, and makes
-+ * it unnecessary to call this function or having to care about
-+ * AVHWFramesContext initialization at all.
-+ *
-+ * There are a number of requirements for calling this function:
-+ *
-+ * - It must be called from get_format with the same avctx parameter that was
-+ * passed to get_format. Calling it outside of get_format is not allowed, and
-+ * can trigger undefined behavior.
-+ * - The function is not always supported (see description of return values).
-+ * Even if this function returns successfully, hwaccel initialization could
-+ * fail later. (The degree to which implementations check whether the stream
-+ * is actually supported varies. Some do this check only after the user's
-+ * get_format callback returns.)
-+ * - The hw_pix_fmt must be one of the choices suggested by get_format. If the
-+ * user decides to use a AVHWFramesContext prepared with this API function,
-+ * the user must return the same hw_pix_fmt from get_format.
-+ * - The device_ref passed to this function must support the given hw_pix_fmt.
-+ * - After calling this API function, it is the user's responsibility to
-+ * initialize the AVHWFramesContext (returned by the out_frames_ref
-+ * parameter), and to set AVCodecContext.hw_frames_ctx to it. If done, this must
-+ * be done before returning from get_format (this is implied by the normal
-+ * AVCodecContext.hw_frames_ctx API rules).
-+ * - The AVHWFramesContext parameters may change every time time get_format is
-+ * called. Also, AVCodecContext.hw_frames_ctx is reset before get_format. So
-+ * you are inherently required to go through this process again on every
-+ * get_format call.
-+ * - It is perfectly possible to call this function without actually using
-+ * the resulting AVHWFramesContext. One use-case might be trying to reuse a
-+ * previously initialized AVHWFramesContext, and calling this API function
-+ * only to test whether the required frame parameters have changed.
-+ * - Fields that use dynamically allocated values of any kind must not be set
-+ * by the user unless setting them is explicitly allowed by the documentation.
-+ * If the user sets AVHWFramesContext.free and AVHWFramesContext.user_opaque,
-+ * the new free callback must call the potentially set previous free callback.
-+ * This API call may set any dynamically allocated fields, including the free
-+ * callback.
-+ *
-+ * The function will set at least the following fields on AVHWFramesContext
-+ * (potentially more, depending on hwaccel API):
-+ *
-+ * - All fields set by av_hwframe_ctx_alloc().
-+ * - Set the format field to hw_pix_fmt.
-+ * - Set the sw_format field to the most suited and most versatile format. (An
-+ * implication is that this will prefer generic formats over opaque formats
-+ * with arbitrary restrictions, if possible.)
-+ * - Set the width/height fields to the coded frame size, rounded up to the
-+ * API-specific minimum alignment.
-+ * - Only _if_ the hwaccel requires a pre-allocated pool: set the
-+ * initial_pool_size field to the number of maximum reference surfaces possible
-+ * with the codec, plus 1 surface for the user to work (meaning the user can
-+ * safely reference at most 1 decoded surface at a time), plus additional
-+ * buffering introduced by frame threading. If the hwaccel does not require
-+ * pre-allocation, the field is left to 0, and the decoder will allocate new
-+ * surfaces on demand during decoding.
-+ * - Possibly AVHWFramesContext.hwctx fields, depending on the underlying
-+ * hardware API.
-+ *
-+ * Essentially, out_frames_ref returns the same as av_hwframe_ctx_alloc(), but
-+ * with basic frame parameters set.
-+ *
-+ * The function is stateless, and does not change the AVCodecContext or the
-+ * device_ref AVHWDeviceContext.
-+ *
-+ * @param avctx The context which is currently calling get_format, and which
-+ * implicitly contains all state needed for filling the returned
-+ * AVHWFramesContext properly.
-+ * @param device_ref A reference to the AVHWDeviceContext describing the device
-+ * which will be used by the hardware decoder.
-+ * @param hw_pix_fmt The hwaccel format you are going to return from get_format.
-+ * @param out_frames_ref On success, set to a reference to an _uninitialized_
-+ * AVHWFramesContext, created from the given device_ref.
-+ * Fields will be set to values required for decoding.
-+ * Not changed if an error is returned.
-+ * @return zero on success, a negative value on error. The following error codes
-+ * have special semantics:
-+ * AVERROR(ENOENT): the decoder does not support this functionality. Setup
-+ * is always manual, or it is a decoder which does not
-+ * support setting AVCodecContext.hw_frames_ctx at all,
-+ * or it is a software format.
-+ * AVERROR(EINVAL): it is known that hardware decoding is not supported for
-+ * this configuration, or the device_ref is not supported
-+ * for the hwaccel referenced by hw_pix_fmt.
-+ */
-+int avcodec_get_hw_frames_parameters(AVCodecContext* avctx,
-+ AVBufferRef* device_ref,
-+ enum AVPixelFormat hw_pix_fmt,
-+ AVBufferRef** out_frames_ref);
-+
-+/**
-+ * @defgroup lavc_parsing Frame parsing
-+ * @{
-+ */
-+
-+enum AVPictureStructure {
-+ AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
-+ AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
-+ AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
-+ AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
-+};
-+
-+typedef struct AVCodecParserContext {
-+ void* priv_data;
-+ const struct AVCodecParser* parser;
-+ int64_t frame_offset; /* offset of the current frame */
-+ int64_t cur_offset; /* current offset
-+ (incremented by each av_parser_parse()) */
-+ int64_t next_frame_offset; /* offset of the next frame */
-+ /* video info */
-+ int pict_type; /* XXX: Put it back in AVCodecContext. */
-+ /**
-+ * This field is used for proper frame duration computation in lavf.
-+ * It signals, how much longer the frame duration of the current frame
-+ * is compared to normal frame duration.
-+ *
-+ * frame_duration = (1 + repeat_pict) * time_base
-+ *
-+ * It is used by codecs like H.264 to display telecined material.
-+ */
-+ int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-+ int64_t pts; /* pts of the current frame */
-+ int64_t dts; /* dts of the current frame */
-+
-+ /* private data */
-+ int64_t last_pts;
-+ int64_t last_dts;
-+ int fetch_timestamp;
-+
-+#define AV_PARSER_PTS_NB 4
-+ int cur_frame_start_index;
-+ int64_t cur_frame_offset[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_pts[AV_PARSER_PTS_NB];
-+ int64_t cur_frame_dts[AV_PARSER_PTS_NB];
-+
-+ int flags;
-+#define PARSER_FLAG_COMPLETE_FRAMES 0x0001
-+#define PARSER_FLAG_ONCE 0x0002
-+/// Set if the parser has a valid file offset
-+#define PARSER_FLAG_FETCHED_OFFSET 0x0004
-+#define PARSER_FLAG_USE_CODEC_TS 0x1000
-+
-+ int64_t offset; ///< byte offset from starting packet start
-+ int64_t cur_frame_end[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Set by parser to 1 for key frames and 0 for non-key frames.
-+ * It is initialized to -1, so if the parser doesn't set this flag,
-+ * old-style fallback using AV_PICTURE_TYPE_I picture type as key frames
-+ * will be used.
-+ */
-+ int key_frame;
-+
-+ // Timestamp generation support:
-+ /**
-+ * Synchronization point for start of timestamp generation.
-+ *
-+ * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-+ * (default).
-+ *
-+ * For example, this corresponds to presence of H.264 buffering period
-+ * SEI message.
-+ */
-+ int dts_sync_point;
-+
-+ /**
-+ * Offset of the current timestamp against last timestamp sync point in
-+ * units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain a valid timestamp offset.
-+ *
-+ * Note that the timestamp of sync point has usually a nonzero
-+ * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-+ * the next frame after timestamp sync point will be usually 1.
-+ *
-+ * For example, this corresponds to H.264 cpb_removal_delay.
-+ */
-+ int dts_ref_dts_delta;
-+
-+ /**
-+ * Presentation delay of current frame in units of AVCodecContext.time_base.
-+ *
-+ * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-+ * contain valid non-negative timestamp delta (presentation time of a frame
-+ * must not lie in the past).
-+ *
-+ * This delay represents the difference between decoding and presentation
-+ * time of the frame.
-+ *
-+ * For example, this corresponds to H.264 dpb_output_delay.
-+ */
-+ int pts_dts_delta;
-+
-+ /**
-+ * Position of the packet in file.
-+ *
-+ * Analogous to cur_frame_pts/dts
-+ */
-+ int64_t cur_frame_pos[AV_PARSER_PTS_NB];
-+
-+ /**
-+ * Byte position of currently parsed frame in stream.
-+ */
-+ int64_t pos;
-+
-+ /**
-+ * Previous frame byte position.
-+ */
-+ int64_t last_pos;
-+
-+ /**
-+ * Duration of the current frame.
-+ * For audio, this is in units of 1 / AVCodecContext.sample_rate.
-+ * For all other types, this is in units of AVCodecContext.time_base.
-+ */
-+ int duration;
-+
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Indicate whether a picture is coded as a frame, top field or bottom field.
-+ *
-+ * For example, H.264 field_pic_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
-+ * equal to 1 and bottom_field_flag equal to 0 corresponds to
-+ * AV_PICTURE_STRUCTURE_TOP_FIELD.
-+ */
-+ enum AVPictureStructure picture_structure;
-+
-+ /**
-+ * Picture number incremented in presentation or output order.
-+ * This field may be reinitialized at the first picture of a new sequence.
-+ *
-+ * For example, this corresponds to H.264 PicOrderCnt.
-+ */
-+ int output_picture_number;
-+
-+ /**
-+ * Dimensions of the decoded video intended for presentation.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Dimensions of the coded video.
-+ */
-+ int coded_width;
-+ int coded_height;
-+
-+ /**
-+ * The format of the coded data, corresponds to enum AVPixelFormat for video
-+ * and for enum AVSampleFormat for audio.
-+ *
-+ * Note that a decoder can have considerable freedom in how exactly it
-+ * decodes the data, so the format reported here might be different from the
-+ * one returned by a decoder.
-+ */
-+ int format;
-+} AVCodecParserContext;
-+
-+typedef struct AVCodecParser {
-+ int codec_ids[7]; /* several codec IDs are permitted */
-+ int priv_data_size;
-+ int (*parser_init)(AVCodecParserContext* s);
-+ /* This callback never returns an error, a negative value means that
-+ * the frame start was in a previous packet. */
-+ int (*parser_parse)(AVCodecParserContext* s, AVCodecContext* avctx,
-+ const uint8_t** poutbuf, int* poutbuf_size,
-+ const uint8_t* buf, int buf_size);
-+ void (*parser_close)(AVCodecParserContext* s);
-+ int (*split)(AVCodecContext* avctx, const uint8_t* buf, int buf_size);
-+} AVCodecParser;
-+
-+/**
-+ * Iterate over all registered codec parsers.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec parser or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodecParser* av_parser_iterate(void** opaque);
-+
-+AVCodecParserContext* av_parser_init(int codec_id);
-+
-+/**
-+ * Parse a packet.
-+ *
-+ * @param s parser context.
-+ * @param avctx codec context.
-+ * @param poutbuf set to pointer to parsed buffer or NULL if not yet
-+ finished.
-+ * @param poutbuf_size set to size of parsed buffer or zero if not yet
-+ finished.
-+ * @param buf input buffer.
-+ * @param buf_size buffer size in bytes without the padding. I.e. the full
-+ buffer size is assumed to be buf_size + AV_INPUT_BUFFER_PADDING_SIZE. To signal
-+ EOF, this should be 0 (so that the last frame can be output).
-+ * @param pts input presentation timestamp.
-+ * @param dts input decoding timestamp.
-+ * @param pos input byte position in stream.
-+ * @return the number of bytes of the input bitstream used.
-+ *
-+ * Example:
-+ * @code
-+ * while(in_len){
-+ * len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
-+ * in_data, in_len,
-+ * pts, dts, pos);
-+ * in_data += len;
-+ * in_len -= len;
-+ *
-+ * if(size)
-+ * decode_frame(data, size);
-+ * }
-+ * @endcode
-+ */
-+int av_parser_parse2(AVCodecParserContext* s, AVCodecContext* avctx,
-+ uint8_t** poutbuf, int* poutbuf_size, const uint8_t* buf,
-+ int buf_size, int64_t pts, int64_t dts, int64_t pos);
-+
-+void av_parser_close(AVCodecParserContext* s);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavc_encoding
-+ * @{
-+ */
-+
-+int avcodec_encode_subtitle(AVCodecContext* avctx, uint8_t* buf, int buf_size,
-+ const AVSubtitle* sub);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavc_misc Utility functions
-+ * @ingroup libavc
-+ *
-+ * Miscellaneous utility functions related to both encoding and decoding
-+ * (or neither).
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup lavc_misc_pixfmt Pixel formats
-+ *
-+ * Functions for working with pixel formats.
-+ * @{
-+ */
-+
-+/**
-+ * Return a value representing the fourCC code associated to the
-+ * pixel format pix_fmt, or 0 if no associated fourCC code can be
-+ * found.
-+ */
-+unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt);
-+
-+/**
-+ * Find the best pixel format to convert to given a certain source pixel
-+ * format. When converting from one pixel format to another, information loss
-+ * may occur. For example, when converting from RGB24 to GRAY, the color
-+ * information will be lost. Similarly, other losses occur when converting from
-+ * some formats to other formats. avcodec_find_best_pix_fmt_of_2() searches
-+ * which of the given pixel formats should be used to suffer the least amount of
-+ * loss. The pixel formats from which it chooses one, are determined by the
-+ * pix_fmt_list parameter.
-+ *
-+ *
-+ * @param[in] pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to
-+ * choose from
-+ * @param[in] src_pix_fmt source pixel format
-+ * @param[in] has_alpha Whether the source pixel format alpha channel is used.
-+ * @param[out] loss_ptr Combination of flags informing you what kind of losses
-+ * will occur.
-+ * @return The best pixel format to convert to or -1 if none was found.
-+ */
-+enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(
-+ const enum AVPixelFormat* pix_fmt_list, enum AVPixelFormat src_pix_fmt,
-+ int has_alpha, int* loss_ptr);
-+
-+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext* s,
-+ const enum AVPixelFormat* fmt);
-+
-+/**
-+ * @}
-+ */
-+
-+void avcodec_string(char* buf, int buf_size, AVCodecContext* enc, int encode);
-+
-+int avcodec_default_execute(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2),
-+ void* arg, int* ret, int count, int size);
-+int avcodec_default_execute2(AVCodecContext* c,
-+ int (*func)(AVCodecContext* c2, void* arg2, int,
-+ int),
-+ void* arg, int* ret, int count);
-+// FIXME func typedef
-+
-+/**
-+ * Fill AVFrame audio data and linesize pointers.
-+ *
-+ * The buffer buf must be a preallocated buffer with a size big enough
-+ * to contain the specified samples amount. The filled AVFrame data
-+ * pointers will point to this buffer.
-+ *
-+ * AVFrame extended_data channel pointers are allocated if necessary for
-+ * planar audio.
-+ *
-+ * @param frame the AVFrame
-+ * frame->nb_samples must be set prior to calling the
-+ * function. This function fills in frame->data,
-+ * frame->extended_data, frame->linesize[0].
-+ * @param nb_channels channel count
-+ * @param sample_fmt sample format
-+ * @param buf buffer to use for frame data
-+ * @param buf_size size of buffer
-+ * @param align plane size sample alignment (0 = default)
-+ * @return >=0 on success, negative error code on failure
-+ * @todo return the size in bytes required to store the samples in
-+ * case of success, at the next libavutil bump
-+ */
-+int avcodec_fill_audio_frame(AVFrame* frame, int nb_channels,
-+ enum AVSampleFormat sample_fmt, const uint8_t* buf,
-+ int buf_size, int align);
-+
-+/**
-+ * Reset the internal codec state / flush internal buffers. Should be called
-+ * e.g. when seeking or when switching to a different stream.
-+ *
-+ * @note for decoders, this function just releases any references the decoder
-+ * might keep internally, but the caller's references remain valid.
-+ *
-+ * @note for encoders, this function will only do something if the encoder
-+ * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
-+ * will drain any remaining packets, and can then be re-used for a different
-+ * stream (as opposed to sending a null frame which will leave the encoder
-+ * in a permanent EOF state after draining). This can be desirable if the
-+ * cost of tearing down and replacing the encoder instance is high.
-+ */
-+void avcodec_flush_buffers(AVCodecContext* avctx);
-+
-+/**
-+ * Return audio frame duration.
-+ *
-+ * @param avctx codec context
-+ * @param frame_bytes size of the frame, or 0 if unknown
-+ * @return frame duration, in samples, if known. 0 if not able to
-+ * determine.
-+ */
-+int av_get_audio_frame_duration(AVCodecContext* avctx, int frame_bytes);
-+
-+/* memory */
-+
-+/**
-+ * Same behaviour av_fast_malloc but the buffer has additional
-+ * AV_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
-+ *
-+ * In addition the whole buffer will initially and after resizes
-+ * be 0-initialized so that no uninitialized data will ever appear.
-+ */
-+void av_fast_padded_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Same behaviour av_fast_padded_malloc except that buffer will always
-+ * be 0-initialized after call.
-+ */
-+void av_fast_padded_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
-+ * with no corresponding avcodec_close()), 0 otherwise.
-+ */
-+int avcodec_is_open(AVCodecContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVCODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/avfft.h
-@@ -0,0 +1,119 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AVFFT_H
-+#define AVCODEC_AVFFT_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_fft
-+ * FFT functions
-+ */
-+
-+/**
-+ * @defgroup lavc_fft FFT functions
-+ * @ingroup lavc_misc
-+ *
-+ * @{
-+ */
-+
-+typedef float FFTSample;
-+
-+typedef struct FFTComplex {
-+ FFTSample re, im;
-+} FFTComplex;
-+
-+typedef struct FFTContext FFTContext;
-+
-+/**
-+ * Set up a complex FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param inverse if 0 perform the forward transform, if 1 perform the
-+ * inverse
-+ */
-+FFTContext* av_fft_init(int nbits, int inverse);
-+
-+/**
-+ * Do the permutation needed BEFORE calling ff_fft_calc().
-+ */
-+void av_fft_permute(FFTContext* s, FFTComplex* z);
-+
-+/**
-+ * Do a complex FFT with the parameters defined in av_fft_init(). The
-+ * input data must be permuted before. No 1.0/sqrt(n) normalization is done.
-+ */
-+void av_fft_calc(FFTContext* s, FFTComplex* z);
-+
-+void av_fft_end(FFTContext* s);
-+
-+FFTContext* av_mdct_init(int nbits, int inverse, double scale);
-+void av_imdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_imdct_half(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_calc(FFTContext* s, FFTSample* output, const FFTSample* input);
-+void av_mdct_end(FFTContext* s);
-+
-+/* Real Discrete Fourier Transform */
-+
-+enum RDFTransformType {
-+ DFT_R2C,
-+ IDFT_C2R,
-+ IDFT_R2C,
-+ DFT_C2R,
-+};
-+
-+typedef struct RDFTContext RDFTContext;
-+
-+/**
-+ * Set up a real FFT.
-+ * @param nbits log2 of the length of the input array
-+ * @param trans the type of transform
-+ */
-+RDFTContext* av_rdft_init(int nbits, enum RDFTransformType trans);
-+void av_rdft_calc(RDFTContext* s, FFTSample* data);
-+void av_rdft_end(RDFTContext* s);
-+
-+/* Discrete Cosine Transform */
-+
-+typedef struct DCTContext DCTContext;
-+
-+enum DCTTransformType {
-+ DCT_II = 0,
-+ DCT_III,
-+ DCT_I,
-+ DST_I,
-+};
-+
-+/**
-+ * Set up DCT.
-+ *
-+ * @param nbits size of the input array:
-+ * (1 << nbits) for DCT-II, DCT-III and DST-I
-+ * (1 << nbits) + 1 for DCT-I
-+ * @param type the type of transform
-+ *
-+ * @note the first element of the input of DST-I is ignored
-+ */
-+DCTContext* av_dct_init(int nbits, enum DCTTransformType type);
-+void av_dct_calc(DCTContext* s, FFTSample* data);
-+void av_dct_end(DCTContext* s);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_AVFFT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/bsf.h
-@@ -0,0 +1,320 @@
-+/*
-+ * Bitstream filters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_BSF_H
-+#define AVCODEC_BSF_H
-+
-+#include "libavutil/dict.h"
-+#include "libavutil/log.h"
-+#include "libavutil/rational.h"
-+
-+#include "codec_id.h"
-+#include "codec_par.h"
-+#include "packet.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * The bitstream filter state.
-+ *
-+ * This struct must be allocated with av_bsf_alloc() and freed with
-+ * av_bsf_free().
-+ *
-+ * The fields in the struct will only be changed (by the caller or by the
-+ * filter) as described in their documentation, and are to be considered
-+ * immutable otherwise.
-+ */
-+typedef struct AVBSFContext {
-+ /**
-+ * A class for logging and AVOptions
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * The bitstream filter this context is an instance of.
-+ */
-+ const struct AVBitStreamFilter* filter;
-+
-+ /**
-+ * Opaque filter-specific private data. If filter->priv_class is non-NULL,
-+ * this is an AVOptions-enabled struct.
-+ */
-+ void* priv_data;
-+
-+ /**
-+ * Parameters of the input stream. This field is allocated in
-+ * av_bsf_alloc(), it needs to be filled by the caller before
-+ * av_bsf_init().
-+ */
-+ AVCodecParameters* par_in;
-+
-+ /**
-+ * Parameters of the output stream. This field is allocated in
-+ * av_bsf_alloc(), it is set by the filter in av_bsf_init().
-+ */
-+ AVCodecParameters* par_out;
-+
-+ /**
-+ * The timebase used for the timestamps of the input packets. Set by the
-+ * caller before av_bsf_init().
-+ */
-+ AVRational time_base_in;
-+
-+ /**
-+ * The timebase used for the timestamps of the output packets. Set by the
-+ * filter in av_bsf_init().
-+ */
-+ AVRational time_base_out;
-+} AVBSFContext;
-+
-+typedef struct AVBitStreamFilter {
-+ const char* name;
-+
-+ /**
-+ * A list of codec ids supported by the filter, terminated by
-+ * AV_CODEC_ID_NONE.
-+ * May be NULL, in that case the bitstream filter works with any codec id.
-+ */
-+ const enum AVCodecID* codec_ids;
-+
-+ /**
-+ * A class for the private data, used to declare bitstream filter private
-+ * AVOptions. This field is NULL for bitstream filters that do not declare
-+ * any options.
-+ *
-+ * If this field is non-NULL, the first member of the filter private data
-+ * must be a pointer to AVClass, which will be set by libavcodec generic
-+ * code to this class.
-+ */
-+ const AVClass* priv_class;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+
-+ int priv_data_size;
-+ int (*init)(AVBSFContext* ctx);
-+ int (*filter)(AVBSFContext* ctx, AVPacket* pkt);
-+ void (*close)(AVBSFContext* ctx);
-+ void (*flush)(AVBSFContext* ctx);
-+} AVBitStreamFilter;
-+
-+/**
-+ * @return a bitstream filter with the specified name or NULL if no such
-+ * bitstream filter exists.
-+ */
-+const AVBitStreamFilter* av_bsf_get_by_name(const char* name);
-+
-+/**
-+ * Iterate over all registered bitstream filters.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered bitstream filter or NULL when the iteration is
-+ * finished
-+ */
-+const AVBitStreamFilter* av_bsf_iterate(void** opaque);
-+
-+/**
-+ * Allocate a context for a given bitstream filter. The caller must fill in the
-+ * context parameters as described in the documentation and then call
-+ * av_bsf_init() before sending any data to the filter.
-+ *
-+ * @param filter the filter for which to allocate an instance.
-+ * @param ctx a pointer into which the pointer to the newly-allocated context
-+ * will be written. It must be freed with av_bsf_free() after the
-+ * filtering is done.
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_bsf_alloc(const AVBitStreamFilter* filter, AVBSFContext** ctx);
-+
-+/**
-+ * Prepare the filter for use, after all the parameters and options have been
-+ * set.
-+ */
-+int av_bsf_init(AVBSFContext* ctx);
-+
-+/**
-+ * Submit a packet for filtering.
-+ *
-+ * After sending each packet, the filter must be completely drained by calling
-+ * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or
-+ * AVERROR_EOF.
-+ *
-+ * @param pkt the packet to filter. The bitstream filter will take ownership of
-+ * the packet and reset the contents of pkt. pkt is not touched if an error
-+ * occurs. If pkt is empty (i.e. NULL, or pkt->data is NULL and
-+ * pkt->side_data_elems zero), it signals the end of the stream (i.e. no more
-+ * non-empty packets will be sent; sending more empty packets does nothing) and
-+ * will cause the filter to output any packets it may have buffered internally.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if packets need to be retrieved from
-+ * the filter (using av_bsf_receive_packet()) before new input can be consumed.
-+ * Another negative AVERROR value if an error occurs.
-+ */
-+int av_bsf_send_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Retrieve a filtered packet.
-+ *
-+ * @param[out] pkt this struct will be filled with the contents of the filtered
-+ * packet. It is owned by the caller and must be freed using
-+ * av_packet_unref() when it is no longer needed.
-+ * This parameter should be "clean" (i.e. freshly allocated
-+ * with av_packet_alloc() or unreffed with av_packet_unref())
-+ * when this function is called. If this function returns
-+ * successfully, the contents of pkt will be completely
-+ * overwritten by the returned data. On failure, pkt is not
-+ * touched.
-+ *
-+ * @return 0 on success. AVERROR(EAGAIN) if more packets need to be sent to the
-+ * filter (using av_bsf_send_packet()) to get more output. AVERROR_EOF if there
-+ * will be no further output from the filter. Another negative AVERROR value if
-+ * an error occurs.
-+ *
-+ * @note one input packet may result in several output packets, so after sending
-+ * a packet with av_bsf_send_packet(), this function needs to be called
-+ * repeatedly until it stops returning 0. It is also possible for a filter to
-+ * output fewer packets than were sent to it, so this function may return
-+ * AVERROR(EAGAIN) immediately after a successful av_bsf_send_packet() call.
-+ */
-+int av_bsf_receive_packet(AVBSFContext* ctx, AVPacket* pkt);
-+
-+/**
-+ * Reset the internal bitstream filter state. Should be called e.g. when
-+ * seeking.
-+ */
-+void av_bsf_flush(AVBSFContext* ctx);
-+
-+/**
-+ * Free a bitstream filter context and everything associated with it; write NULL
-+ * into the supplied pointer.
-+ */
-+void av_bsf_free(AVBSFContext** ctx);
-+
-+/**
-+ * Get the AVClass for AVBSFContext. It can be used in combination with
-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
-+ *
-+ * @see av_opt_find().
-+ */
-+const AVClass* av_bsf_get_class(void);
-+
-+/**
-+ * Structure for chain/list of bitstream filters.
-+ * Empty list can be allocated by av_bsf_list_alloc().
-+ */
-+typedef struct AVBSFList AVBSFList;
-+
-+/**
-+ * Allocate empty list of bitstream filters.
-+ * The list must be later freed by av_bsf_list_free()
-+ * or finalized by av_bsf_list_finalize().
-+ *
-+ * @return Pointer to @ref AVBSFList on success, NULL in case of failure
-+ */
-+AVBSFList* av_bsf_list_alloc(void);
-+
-+/**
-+ * Free list of bitstream filters.
-+ *
-+ * @param lst Pointer to pointer returned by av_bsf_list_alloc()
-+ */
-+void av_bsf_list_free(AVBSFList** lst);
-+
-+/**
-+ * Append bitstream filter to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf Filter context to be appended
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append(AVBSFList* lst, AVBSFContext* bsf);
-+
-+/**
-+ * Construct new bitstream filter context given it's name and options
-+ * and append it to the list of bitstream filters.
-+ *
-+ * @param lst List to append to
-+ * @param bsf_name Name of the bitstream filter
-+ * @param options Options for the bitstream filter, can be set to NULL
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_append2(AVBSFList* lst, const char* bsf_name,
-+ AVDictionary** options);
-+/**
-+ * Finalize list of bitstream filters.
-+ *
-+ * This function will transform @ref AVBSFList to single @ref AVBSFContext,
-+ * so the whole chain of bitstream filters can be treated as single filter
-+ * freshly allocated by av_bsf_alloc().
-+ * If the call is successful, @ref AVBSFList structure is freed and lst
-+ * will be set to NULL. In case of failure, caller is responsible for
-+ * freeing the structure by av_bsf_list_free()
-+ *
-+ * @param lst Filter list structure to be transformed
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_finalize(AVBSFList** lst, AVBSFContext** bsf);
-+
-+/**
-+ * Parse string describing list of bitstream filters and create single
-+ * @ref AVBSFContext describing the whole chain of bitstream filters.
-+ * Resulting @ref AVBSFContext can be treated as any other @ref AVBSFContext
-+ * freshly allocated by av_bsf_alloc().
-+ *
-+ * @param str String describing chain of bitstream filters in format
-+ * `bsf1[=opt1=val1:opt2=val2][,bsf2]`
-+ * @param[out] bsf Pointer to be set to newly created @ref AVBSFContext
-+ * structure representing the chain of bitstream filters
-+ *
-+ * @return >=0 on success, negative AVERROR in case of failure
-+ */
-+int av_bsf_list_parse_str(const char* str, AVBSFContext** bsf);
-+
-+/**
-+ * Get null/pass-through bitstream filter.
-+ *
-+ * @param[out] bsf Pointer to be set to new instance of pass-through bitstream
-+ * filter
-+ *
-+ * @return
-+ */
-+int av_bsf_get_null_filter(AVBSFContext** bsf);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_BSF_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec.h
-@@ -0,0 +1,513 @@
-+/*
-+ * AVCodec public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_H
-+#define AVCODEC_CODEC_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/hwcontext.h"
-+#include "libavutil/log.h"
-+#include "libavutil/pixfmt.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/samplefmt.h"
-+
-+#include "libavcodec/codec_id.h"
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Decoder can use draw_horiz_band callback.
-+ */
-+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
-+/**
-+ * Codec uses get_buffer() or get_encode_buffer() for allocating buffers and
-+ * supports custom allocators.
-+ * If not set, it might not use get_buffer() or get_encode_buffer() at all, or
-+ * use operations that assume the buffer was allocated by
-+ * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
-+ */
-+#define AV_CODEC_CAP_DR1 (1 << 1)
-+#if FF_API_FLAG_TRUNCATED
-+/**
-+ * @deprecated Use parsers to always send proper frames.
-+ */
-+# define AV_CODEC_CAP_TRUNCATED (1 << 3)
-+#endif
-+/**
-+ * Encoder or decoder requires flushing with NULL input at the end in order to
-+ * give the complete and correct output.
-+ *
-+ * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
-+ * with NULL data. The user can still send NULL data to the public encode
-+ * or decode function, but libavcodec will not pass it along to the codec
-+ * unless this flag is set.
-+ *
-+ * Decoders:
-+ * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
-+ * avpkt->size=0 at the end to get the delayed data until the decoder no longer
-+ * returns frames.
-+ *
-+ * Encoders:
-+ * The encoder needs to be fed with NULL data at the end of encoding until the
-+ * encoder no longer returns data.
-+ *
-+ * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
-+ * flag also means that the encoder must set the pts and duration for
-+ * each output packet. If this flag is not set, the pts and duration will
-+ * be determined by libavcodec from the input frame.
-+ */
-+#define AV_CODEC_CAP_DELAY (1 << 5)
-+/**
-+ * Codec can be fed a final frame with a smaller size.
-+ * This can be used to prevent truncation of the last audio samples.
-+ */
-+#define AV_CODEC_CAP_SMALL_LAST_FRAME (1 << 6)
-+
-+/**
-+ * Codec can output multiple frames per AVPacket
-+ * Normally demuxers return one frame at a time, demuxers which do not do
-+ * are connected to a parser to split what they return into proper frames.
-+ * This flag is reserved to the very rare category of codecs which have a
-+ * bitstream that cannot be split into frames without timeconsuming
-+ * operations like full decoding. Demuxers carrying such bitstreams thus
-+ * may return multiple frames in a packet. This has many disadvantages like
-+ * prohibiting stream copy in many cases thus it should only be considered
-+ * as a last resort.
-+ */
-+#define AV_CODEC_CAP_SUBFRAMES (1 << 8)
-+/**
-+ * Codec is experimental and is thus avoided in favor of non experimental
-+ * encoders
-+ */
-+#define AV_CODEC_CAP_EXPERIMENTAL (1 << 9)
-+/**
-+ * Codec should fill in channel configuration and samplerate instead of
-+ * container
-+ */
-+#define AV_CODEC_CAP_CHANNEL_CONF (1 << 10)
-+/**
-+ * Codec supports frame-level multithreading.
-+ */
-+#define AV_CODEC_CAP_FRAME_THREADS (1 << 12)
-+/**
-+ * Codec supports slice-based (or partition-based) multithreading.
-+ */
-+#define AV_CODEC_CAP_SLICE_THREADS (1 << 13)
-+/**
-+ * Codec supports changed parameters at any point.
-+ */
-+#define AV_CODEC_CAP_PARAM_CHANGE (1 << 14)
-+/**
-+ * Codec supports multithreading through a method other than slice- or
-+ * frame-level multithreading. Typically this marks wrappers around
-+ * multithreading-capable external libraries.
-+ */
-+#define AV_CODEC_CAP_OTHER_THREADS (1 << 15)
-+#if FF_API_AUTO_THREADS
-+# define AV_CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_OTHER_THREADS
-+#endif
-+/**
-+ * Audio encoder supports receiving a different number of samples in each call.
-+ */
-+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-+/**
-+ * Decoder is not a preferred choice for probing.
-+ * This indicates that the decoder is not a good choice for probing.
-+ * It could for example be an expensive to spin up hardware decoder,
-+ * or it could simply not provide a lot of useful information about
-+ * the stream.
-+ * A decoder marked with this flag should only be used as last resort
-+ * choice for probing.
-+ */
-+#define AV_CODEC_CAP_AVOID_PROBING (1 << 17)
-+
-+#if FF_API_UNUSED_CODEC_CAPS
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_INTRA_ONLY 0x40000000
-+/**
-+ * Deprecated and unused. Use AVCodecDescriptor.props instead
-+ */
-+# define AV_CODEC_CAP_LOSSLESS 0x80000000
-+#endif
-+
-+/**
-+ * Codec is backed by a hardware implementation. Typically used to
-+ * identify a non-hwaccel hardware decoder. For information about hwaccels, use
-+ * avcodec_get_hw_config() instead.
-+ */
-+#define AV_CODEC_CAP_HARDWARE (1 << 18)
-+
-+/**
-+ * Codec is potentially backed by a hardware implementation, but not
-+ * necessarily. This is used instead of AV_CODEC_CAP_HARDWARE, if the
-+ * implementation provides some sort of internal fallback.
-+ */
-+#define AV_CODEC_CAP_HYBRID (1 << 19)
-+
-+/**
-+ * This codec takes the reordered_opaque field from input AVFrames
-+ * and returns it in the corresponding field in AVCodecContext after
-+ * encoding.
-+ */
-+#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
-+
-+/**
-+ * This encoder can be flushed using avcodec_flush_buffers(). If this flag is
-+ * not set, the encoder must be closed and reopened to ensure that no frames
-+ * remain pending.
-+ */
-+#define AV_CODEC_CAP_ENCODER_FLUSH (1 << 21)
-+
-+/**
-+ * AVProfile.
-+ */
-+typedef struct AVProfile {
-+ int profile;
-+ const char* name; ///< short name for the profile
-+} AVProfile;
-+
-+typedef struct AVCodecDefault AVCodecDefault;
-+
-+struct AVCodecContext;
-+struct AVSubtitle;
-+struct AVPacket;
-+
-+/**
-+ * AVCodec.
-+ */
-+typedef struct AVCodec {
-+ /**
-+ * Name of the codec implementation.
-+ * The name is globally unique among encoders and among decoders (but an
-+ * encoder and a decoder can share the same name).
-+ * This is the primary way to find a codec from the user perspective.
-+ */
-+ const char* name;
-+ /**
-+ * Descriptive name for the codec, meant to be more human readable than name.
-+ * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-+ */
-+ const char* long_name;
-+ enum AVMediaType type;
-+ enum AVCodecID id;
-+ /**
-+ * Codec capabilities.
-+ * see AV_CODEC_CAP_*
-+ */
-+ int capabilities;
-+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
-+ const AVRational*
-+ supported_framerates; ///< array of supported framerates, or NULL if any,
-+ ///< array is terminated by {0,0}
-+ const enum AVPixelFormat*
-+ pix_fmts; ///< array of supported pixel formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const int*
-+ supported_samplerates; ///< array of supported audio samplerates, or NULL
-+ ///< if unknown, array is terminated by 0
-+ const enum AVSampleFormat*
-+ sample_fmts; ///< array of supported sample formats, or NULL if unknown,
-+ ///< array is terminated by -1
-+ const uint64_t*
-+ channel_layouts; ///< array of support channel layouts, or NULL if
-+ ///< unknown. array is terminated by 0
-+ const AVClass* priv_class; ///< AVClass for the private context
-+ const AVProfile*
-+ profiles; ///< array of recognized profiles, or NULL if unknown, array is
-+ ///< terminated by {FF_PROFILE_UNKNOWN}
-+
-+ /**
-+ * Group name of the codec implementation.
-+ * This is a short symbolic name of the wrapper backing this codec. A
-+ * wrapper uses some kind of external implementation for the codec, such
-+ * as an external library, or a codec implementation provided by the OS or
-+ * the hardware.
-+ * If this field is NULL, this is a builtin, libavcodec native codec.
-+ * If non-NULL, this will be the suffix in AVCodec.name in most cases
-+ * (usually AVCodec.name will be of the form "<codec_name>_<wrapper_name>").
-+ */
-+ const char* wrapper_name;
-+
-+ /*****************************************************************
-+ * No fields below this line are part of the public API. They
-+ * may not be used outside of libavcodec and can be changed and
-+ * removed at will.
-+ * New public fields should be added right above.
-+ *****************************************************************
-+ */
-+ /**
-+ * Internal codec capabilities.
-+ * See FF_CODEC_CAP_* in internal.h
-+ */
-+ int caps_internal;
-+
-+ int priv_data_size;
-+ /**
-+ * @name Frame-level threading support functions
-+ * @{
-+ */
-+ /**
-+ * Copy necessary context variables from a previous thread context to the
-+ * current one. If not defined, the next thread will start automatically;
-+ * otherwise, the codec must call ff_thread_finish_setup().
-+ *
-+ * dst and src will (rarely) point to the same context, in which case memcpy
-+ * should be skipped.
-+ */
-+ int (*update_thread_context)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+
-+ /**
-+ * Copy variables back to the user-facing context
-+ */
-+ int (*update_thread_context_for_user)(struct AVCodecContext* dst,
-+ const struct AVCodecContext* src);
-+ /** @} */
-+
-+ /**
-+ * Private codec-specific defaults.
-+ */
-+ const AVCodecDefault* defaults;
-+
-+ /**
-+ * Initialize codec static data, called from av_codec_iterate().
-+ *
-+ * This is not intended for time consuming operations as it is
-+ * run for every codec regardless of that codec being used.
-+ */
-+ void (*init_static_data)(struct AVCodec* codec);
-+
-+ int (*init)(struct AVCodecContext*);
-+ int (*encode_sub)(struct AVCodecContext*, uint8_t* buf, int buf_size,
-+ const struct AVSubtitle* sub);
-+ /**
-+ * Encode data to an AVPacket.
-+ *
-+ * @param avctx codec context
-+ * @param avpkt output AVPacket
-+ * @param[in] frame AVFrame containing the raw data to be encoded
-+ * @param[out] got_packet_ptr encoder sets to 0 or 1 to indicate that a
-+ * non-empty packet was returned in avpkt.
-+ * @return 0 on success, negative error code on failure
-+ */
-+ int (*encode2)(struct AVCodecContext* avctx, struct AVPacket* avpkt,
-+ const struct AVFrame* frame, int* got_packet_ptr);
-+ /**
-+ * Decode picture or subtitle data.
-+ *
-+ * @param avctx codec context
-+ * @param outdata codec type dependent output struct
-+ * @param[out] got_frame_ptr decoder sets to 0 or 1 to indicate that a
-+ * non-empty frame or subtitle was returned in
-+ * outdata.
-+ * @param[in] avpkt AVPacket containing the data to be decoded
-+ * @return amount of bytes read from the packet on success, negative error
-+ * code on failure
-+ */
-+ int (*decode)(struct AVCodecContext* avctx, void* outdata, int* got_frame_ptr,
-+ struct AVPacket* avpkt);
-+ int (*close)(struct AVCodecContext*);
-+ /**
-+ * Encode API with decoupled frame/packet dataflow. This function is called
-+ * to get one output packet. It should call ff_encode_get_frame() to obtain
-+ * input data.
-+ */
-+ int (*receive_packet)(struct AVCodecContext* avctx, struct AVPacket* avpkt);
-+
-+ /**
-+ * Decode API with decoupled packet/frame dataflow. This function is called
-+ * to get one output frame. It should call ff_decode_get_packet() to obtain
-+ * input data.
-+ */
-+ int (*receive_frame)(struct AVCodecContext* avctx, struct AVFrame* frame);
-+ /**
-+ * Flush buffers.
-+ * Will be called when seeking
-+ */
-+ void (*flush)(struct AVCodecContext*);
-+
-+ /**
-+ * Decoding only, a comma-separated list of bitstream filters to apply to
-+ * packets before decoding.
-+ */
-+ const char* bsfs;
-+
-+ /**
-+ * Array of pointers to hardware configurations supported by the codec,
-+ * or NULL if no hardware supported. The array is terminated by a NULL
-+ * pointer.
-+ *
-+ * The user can only access this field via avcodec_get_hw_config().
-+ */
-+ const struct AVCodecHWConfigInternal* const* hw_configs;
-+
-+ /**
-+ * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.
-+ */
-+ const uint32_t* codec_tags;
-+} AVCodec;
-+
-+/**
-+ * Iterate over all registered codecs.
-+ *
-+ * @param opaque a pointer where libavcodec will store the iteration state. Must
-+ * point to NULL to start the iteration.
-+ *
-+ * @return the next registered codec or NULL when the iteration is
-+ * finished
-+ */
-+const AVCodec* av_codec_iterate(void** opaque);
-+
-+/**
-+ * Find a registered decoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered decoder with the specified name.
-+ *
-+ * @param name name of the requested decoder
-+ * @return A decoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_decoder_by_name(const char* name);
-+
-+/**
-+ * Find a registered encoder with a matching codec ID.
-+ *
-+ * @param id AVCodecID of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder(enum AVCodecID id);
-+
-+/**
-+ * Find a registered encoder with the specified name.
-+ *
-+ * @param name name of the requested encoder
-+ * @return An encoder if one was found, NULL otherwise.
-+ */
-+const AVCodec* avcodec_find_encoder_by_name(const char* name);
-+/**
-+ * @return a non-zero number if codec is an encoder, zero otherwise
-+ */
-+int av_codec_is_encoder(const AVCodec* codec);
-+
-+/**
-+ * @return a non-zero number if codec is a decoder, zero otherwise
-+ */
-+int av_codec_is_decoder(const AVCodec* codec);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec the codec that is searched for the given profile
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ */
-+const char* av_get_profile_name(const AVCodec* codec, int profile);
-+
-+enum {
-+ /**
-+ * The codec supports this format via the hw_device_ctx interface.
-+ *
-+ * When selecting this format, AVCodecContext.hw_device_ctx should
-+ * have been set to a device of the specified type before calling
-+ * avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
-+ /**
-+ * The codec supports this format via the hw_frames_ctx interface.
-+ *
-+ * When selecting this format for a decoder,
-+ * AVCodecContext.hw_frames_ctx should be set to a suitable frames
-+ * context inside the get_format() callback. The frames context
-+ * must have been created on a device of the specified type.
-+ *
-+ * When selecting this format for an encoder,
-+ * AVCodecContext.hw_frames_ctx should be set to the context which
-+ * will be used for the input frames before calling avcodec_open2().
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
-+ /**
-+ * The codec supports this format by some internal method.
-+ *
-+ * This format can be selected without any additional configuration -
-+ * no device or frames context is required.
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_INTERNAL = 0x04,
-+ /**
-+ * The codec supports this format by some ad-hoc method.
-+ *
-+ * Additional settings and/or function calls are required. See the
-+ * codec-specific documentation for details. (Methods requiring
-+ * this sort of configuration are deprecated and others should be
-+ * used in preference.)
-+ */
-+ AV_CODEC_HW_CONFIG_METHOD_AD_HOC = 0x08,
-+};
-+
-+typedef struct AVCodecHWConfig {
-+ /**
-+ * For decoders, a hardware pixel format which that decoder may be
-+ * able to decode to if suitable hardware is available.
-+ *
-+ * For encoders, a pixel format which the encoder may be able to
-+ * accept. If set to AV_PIX_FMT_NONE, this applies to all pixel
-+ * formats supported by the codec.
-+ */
-+ enum AVPixelFormat pix_fmt;
-+ /**
-+ * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
-+ * setup methods which can be used with this configuration.
-+ */
-+ int methods;
-+ /**
-+ * The device type associated with the configuration.
-+ *
-+ * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
-+ * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
-+ */
-+ enum AVHWDeviceType device_type;
-+} AVCodecHWConfig;
-+
-+/**
-+ * Retrieve supported hardware configurations for a codec.
-+ *
-+ * Values of index from zero to some maximum return the indexed configuration
-+ * descriptor; all other values return NULL. If the codec does not support
-+ * any hardware configurations then it will always return NULL.
-+ */
-+const AVCodecHWConfig* avcodec_get_hw_config(const AVCodec* codec, int index);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVCODEC_CODEC_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_desc.h
-@@ -0,0 +1,128 @@
-+/*
-+ * Codec descriptors public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_DESC_H
-+#define AVCODEC_CODEC_DESC_H
-+
-+#include "libavutil/avutil.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * This struct describes the properties of a single codec described by an
-+ * AVCodecID.
-+ * @see avcodec_descriptor_get()
-+ */
-+typedef struct AVCodecDescriptor {
-+ enum AVCodecID id;
-+ enum AVMediaType type;
-+ /**
-+ * Name of the codec described by this descriptor. It is non-empty and
-+ * unique for each codec descriptor. It should contain alphanumeric
-+ * characters and '_' only.
-+ */
-+ const char* name;
-+ /**
-+ * A more descriptive name for this codec. May be NULL.
-+ */
-+ const char* long_name;
-+ /**
-+ * Codec properties, a combination of AV_CODEC_PROP_* flags.
-+ */
-+ int props;
-+ /**
-+ * MIME type(s) associated with the codec.
-+ * May be NULL; if not, a NULL-terminated array of MIME types.
-+ * The first item is always non-NULL and is the preferred MIME type.
-+ */
-+ const char* const* mime_types;
-+ /**
-+ * If non-NULL, an array of profiles recognized for this codec.
-+ * Terminated with FF_PROFILE_UNKNOWN.
-+ */
-+ const struct AVProfile* profiles;
-+} AVCodecDescriptor;
-+
-+/**
-+ * Codec uses only intra compression.
-+ * Video and audio codecs only.
-+ */
-+#define AV_CODEC_PROP_INTRA_ONLY (1 << 0)
-+/**
-+ * Codec supports lossy compression. Audio and video codecs only.
-+ * @note a codec may support both lossy and lossless
-+ * compression modes
-+ */
-+#define AV_CODEC_PROP_LOSSY (1 << 1)
-+/**
-+ * Codec supports lossless compression. Audio and video codecs only.
-+ */
-+#define AV_CODEC_PROP_LOSSLESS (1 << 2)
-+/**
-+ * Codec supports frame reordering. That is, the coded order (the order in which
-+ * the encoded packets are output by the encoders / stored / input to the
-+ * decoders) may be different from the presentation order of the corresponding
-+ * frames.
-+ *
-+ * For codecs that do not have this property set, PTS and DTS should always be
-+ * equal.
-+ */
-+#define AV_CODEC_PROP_REORDER (1 << 3)
-+/**
-+ * Subtitle codec is bitmap based
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
-+ */
-+#define AV_CODEC_PROP_BITMAP_SUB (1 << 16)
-+/**
-+ * Subtitle codec is text based.
-+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
-+ */
-+#define AV_CODEC_PROP_TEXT_SUB (1 << 17)
-+
-+/**
-+ * @return descriptor for given codec ID or NULL if no descriptor exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get(enum AVCodecID id);
-+
-+/**
-+ * Iterate over all codec descriptors known to libavcodec.
-+ *
-+ * @param prev previous descriptor. NULL to get the first descriptor.
-+ *
-+ * @return next descriptor or NULL after the last descriptor
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_next(const AVCodecDescriptor* prev);
-+
-+/**
-+ * @return codec descriptor with the given name or NULL if no such descriptor
-+ * exists.
-+ */
-+const AVCodecDescriptor* avcodec_descriptor_get_by_name(const char* name);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_DESC_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_id.h
-@@ -0,0 +1,637 @@
-+/*
-+ * Codec IDs
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_ID_H
-+#define AVCODEC_CODEC_ID_H
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/samplefmt.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ * @{
-+ */
-+
-+/**
-+ * Identify the syntax and semantics of the bitstream.
-+ * The principle is roughly:
-+ * Two decoders with the same ID can decode the same streams.
-+ * Two encoders with the same ID can encode compatible streams.
-+ * There may be slight deviations from the principle due to implementation
-+ * details.
-+ *
-+ * If you add a codec ID to this list, add it so that
-+ * 1. no value of an existing codec ID changes (that would break ABI),
-+ * 2. it is as close as possible to similar codecs
-+ *
-+ * After adding new codec IDs, do not forget to add an entry to the codec
-+ * descriptor list and bump libavcodec minor version.
-+ */
-+enum AVCodecID {
-+ AV_CODEC_ID_NONE,
-+
-+ /* video codecs */
-+ AV_CODEC_ID_MPEG1VIDEO,
-+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-+ AV_CODEC_ID_H261,
-+ AV_CODEC_ID_H263,
-+ AV_CODEC_ID_RV10,
-+ AV_CODEC_ID_RV20,
-+ AV_CODEC_ID_MJPEG,
-+ AV_CODEC_ID_MJPEGB,
-+ AV_CODEC_ID_LJPEG,
-+ AV_CODEC_ID_SP5X,
-+ AV_CODEC_ID_JPEGLS,
-+ AV_CODEC_ID_MPEG4,
-+ AV_CODEC_ID_RAWVIDEO,
-+ AV_CODEC_ID_MSMPEG4V1,
-+ AV_CODEC_ID_MSMPEG4V2,
-+ AV_CODEC_ID_MSMPEG4V3,
-+ AV_CODEC_ID_WMV1,
-+ AV_CODEC_ID_WMV2,
-+ AV_CODEC_ID_H263P,
-+ AV_CODEC_ID_H263I,
-+ AV_CODEC_ID_FLV1,
-+ AV_CODEC_ID_SVQ1,
-+ AV_CODEC_ID_SVQ3,
-+ AV_CODEC_ID_DVVIDEO,
-+ AV_CODEC_ID_HUFFYUV,
-+ AV_CODEC_ID_CYUV,
-+ AV_CODEC_ID_H264,
-+ AV_CODEC_ID_INDEO3,
-+ AV_CODEC_ID_VP3,
-+ AV_CODEC_ID_THEORA,
-+ AV_CODEC_ID_ASV1,
-+ AV_CODEC_ID_ASV2,
-+ AV_CODEC_ID_FFV1,
-+ AV_CODEC_ID_4XM,
-+ AV_CODEC_ID_VCR1,
-+ AV_CODEC_ID_CLJR,
-+ AV_CODEC_ID_MDEC,
-+ AV_CODEC_ID_ROQ,
-+ AV_CODEC_ID_INTERPLAY_VIDEO,
-+ AV_CODEC_ID_XAN_WC3,
-+ AV_CODEC_ID_XAN_WC4,
-+ AV_CODEC_ID_RPZA,
-+ AV_CODEC_ID_CINEPAK,
-+ AV_CODEC_ID_WS_VQA,
-+ AV_CODEC_ID_MSRLE,
-+ AV_CODEC_ID_MSVIDEO1,
-+ AV_CODEC_ID_IDCIN,
-+ AV_CODEC_ID_8BPS,
-+ AV_CODEC_ID_SMC,
-+ AV_CODEC_ID_FLIC,
-+ AV_CODEC_ID_TRUEMOTION1,
-+ AV_CODEC_ID_VMDVIDEO,
-+ AV_CODEC_ID_MSZH,
-+ AV_CODEC_ID_ZLIB,
-+ AV_CODEC_ID_QTRLE,
-+ AV_CODEC_ID_TSCC,
-+ AV_CODEC_ID_ULTI,
-+ AV_CODEC_ID_QDRAW,
-+ AV_CODEC_ID_VIXL,
-+ AV_CODEC_ID_QPEG,
-+ AV_CODEC_ID_PNG,
-+ AV_CODEC_ID_PPM,
-+ AV_CODEC_ID_PBM,
-+ AV_CODEC_ID_PGM,
-+ AV_CODEC_ID_PGMYUV,
-+ AV_CODEC_ID_PAM,
-+ AV_CODEC_ID_FFVHUFF,
-+ AV_CODEC_ID_RV30,
-+ AV_CODEC_ID_RV40,
-+ AV_CODEC_ID_VC1,
-+ AV_CODEC_ID_WMV3,
-+ AV_CODEC_ID_LOCO,
-+ AV_CODEC_ID_WNV1,
-+ AV_CODEC_ID_AASC,
-+ AV_CODEC_ID_INDEO2,
-+ AV_CODEC_ID_FRAPS,
-+ AV_CODEC_ID_TRUEMOTION2,
-+ AV_CODEC_ID_BMP,
-+ AV_CODEC_ID_CSCD,
-+ AV_CODEC_ID_MMVIDEO,
-+ AV_CODEC_ID_ZMBV,
-+ AV_CODEC_ID_AVS,
-+ AV_CODEC_ID_SMACKVIDEO,
-+ AV_CODEC_ID_NUV,
-+ AV_CODEC_ID_KMVC,
-+ AV_CODEC_ID_FLASHSV,
-+ AV_CODEC_ID_CAVS,
-+ AV_CODEC_ID_JPEG2000,
-+ AV_CODEC_ID_VMNC,
-+ AV_CODEC_ID_VP5,
-+ AV_CODEC_ID_VP6,
-+ AV_CODEC_ID_VP6F,
-+ AV_CODEC_ID_TARGA,
-+ AV_CODEC_ID_DSICINVIDEO,
-+ AV_CODEC_ID_TIERTEXSEQVIDEO,
-+ AV_CODEC_ID_TIFF,
-+ AV_CODEC_ID_GIF,
-+ AV_CODEC_ID_DXA,
-+ AV_CODEC_ID_DNXHD,
-+ AV_CODEC_ID_THP,
-+ AV_CODEC_ID_SGI,
-+ AV_CODEC_ID_C93,
-+ AV_CODEC_ID_BETHSOFTVID,
-+ AV_CODEC_ID_PTX,
-+ AV_CODEC_ID_TXD,
-+ AV_CODEC_ID_VP6A,
-+ AV_CODEC_ID_AMV,
-+ AV_CODEC_ID_VB,
-+ AV_CODEC_ID_PCX,
-+ AV_CODEC_ID_SUNRAST,
-+ AV_CODEC_ID_INDEO4,
-+ AV_CODEC_ID_INDEO5,
-+ AV_CODEC_ID_MIMIC,
-+ AV_CODEC_ID_RL2,
-+ AV_CODEC_ID_ESCAPE124,
-+ AV_CODEC_ID_DIRAC,
-+ AV_CODEC_ID_BFI,
-+ AV_CODEC_ID_CMV,
-+ AV_CODEC_ID_MOTIONPIXELS,
-+ AV_CODEC_ID_TGV,
-+ AV_CODEC_ID_TGQ,
-+ AV_CODEC_ID_TQI,
-+ AV_CODEC_ID_AURA,
-+ AV_CODEC_ID_AURA2,
-+ AV_CODEC_ID_V210X,
-+ AV_CODEC_ID_TMV,
-+ AV_CODEC_ID_V210,
-+ AV_CODEC_ID_DPX,
-+ AV_CODEC_ID_MAD,
-+ AV_CODEC_ID_FRWU,
-+ AV_CODEC_ID_FLASHSV2,
-+ AV_CODEC_ID_CDGRAPHICS,
-+ AV_CODEC_ID_R210,
-+ AV_CODEC_ID_ANM,
-+ AV_CODEC_ID_BINKVIDEO,
-+ AV_CODEC_ID_IFF_ILBM,
-+#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
-+ AV_CODEC_ID_KGV1,
-+ AV_CODEC_ID_YOP,
-+ AV_CODEC_ID_VP8,
-+ AV_CODEC_ID_PICTOR,
-+ AV_CODEC_ID_ANSI,
-+ AV_CODEC_ID_A64_MULTI,
-+ AV_CODEC_ID_A64_MULTI5,
-+ AV_CODEC_ID_R10K,
-+ AV_CODEC_ID_MXPEG,
-+ AV_CODEC_ID_LAGARITH,
-+ AV_CODEC_ID_PRORES,
-+ AV_CODEC_ID_JV,
-+ AV_CODEC_ID_DFA,
-+ AV_CODEC_ID_WMV3IMAGE,
-+ AV_CODEC_ID_VC1IMAGE,
-+ AV_CODEC_ID_UTVIDEO,
-+ AV_CODEC_ID_BMV_VIDEO,
-+ AV_CODEC_ID_VBLE,
-+ AV_CODEC_ID_DXTORY,
-+ AV_CODEC_ID_V410,
-+ AV_CODEC_ID_XWD,
-+ AV_CODEC_ID_CDXL,
-+ AV_CODEC_ID_XBM,
-+ AV_CODEC_ID_ZEROCODEC,
-+ AV_CODEC_ID_MSS1,
-+ AV_CODEC_ID_MSA1,
-+ AV_CODEC_ID_TSCC2,
-+ AV_CODEC_ID_MTS2,
-+ AV_CODEC_ID_CLLC,
-+ AV_CODEC_ID_MSS2,
-+ AV_CODEC_ID_VP9,
-+ AV_CODEC_ID_AIC,
-+ AV_CODEC_ID_ESCAPE130,
-+ AV_CODEC_ID_G2M,
-+ AV_CODEC_ID_WEBP,
-+ AV_CODEC_ID_HNM4_VIDEO,
-+ AV_CODEC_ID_HEVC,
-+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
-+ AV_CODEC_ID_FIC,
-+ AV_CODEC_ID_ALIAS_PIX,
-+ AV_CODEC_ID_BRENDER_PIX,
-+ AV_CODEC_ID_PAF_VIDEO,
-+ AV_CODEC_ID_EXR,
-+ AV_CODEC_ID_VP7,
-+ AV_CODEC_ID_SANM,
-+ AV_CODEC_ID_SGIRLE,
-+ AV_CODEC_ID_MVC1,
-+ AV_CODEC_ID_MVC2,
-+ AV_CODEC_ID_HQX,
-+ AV_CODEC_ID_TDSC,
-+ AV_CODEC_ID_HQ_HQA,
-+ AV_CODEC_ID_HAP,
-+ AV_CODEC_ID_DDS,
-+ AV_CODEC_ID_DXV,
-+ AV_CODEC_ID_SCREENPRESSO,
-+ AV_CODEC_ID_RSCC,
-+ AV_CODEC_ID_AVS2,
-+ AV_CODEC_ID_PGX,
-+ AV_CODEC_ID_AVS3,
-+ AV_CODEC_ID_MSP2,
-+ AV_CODEC_ID_VVC,
-+#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC
-+ AV_CODEC_ID_Y41P,
-+ AV_CODEC_ID_AVRP,
-+ AV_CODEC_ID_012V,
-+ AV_CODEC_ID_AVUI,
-+ AV_CODEC_ID_AYUV,
-+ AV_CODEC_ID_TARGA_Y216,
-+ AV_CODEC_ID_V308,
-+ AV_CODEC_ID_V408,
-+ AV_CODEC_ID_YUV4,
-+ AV_CODEC_ID_AVRN,
-+ AV_CODEC_ID_CPIA,
-+ AV_CODEC_ID_XFACE,
-+ AV_CODEC_ID_SNOW,
-+ AV_CODEC_ID_SMVJPEG,
-+ AV_CODEC_ID_APNG,
-+ AV_CODEC_ID_DAALA,
-+ AV_CODEC_ID_CFHD,
-+ AV_CODEC_ID_TRUEMOTION2RT,
-+ AV_CODEC_ID_M101,
-+ AV_CODEC_ID_MAGICYUV,
-+ AV_CODEC_ID_SHEERVIDEO,
-+ AV_CODEC_ID_YLC,
-+ AV_CODEC_ID_PSD,
-+ AV_CODEC_ID_PIXLET,
-+ AV_CODEC_ID_SPEEDHQ,
-+ AV_CODEC_ID_FMVC,
-+ AV_CODEC_ID_SCPR,
-+ AV_CODEC_ID_CLEARVIDEO,
-+ AV_CODEC_ID_XPM,
-+ AV_CODEC_ID_AV1,
-+ AV_CODEC_ID_BITPACKED,
-+ AV_CODEC_ID_MSCC,
-+ AV_CODEC_ID_SRGC,
-+ AV_CODEC_ID_SVG,
-+ AV_CODEC_ID_GDV,
-+ AV_CODEC_ID_FITS,
-+ AV_CODEC_ID_IMM4,
-+ AV_CODEC_ID_PROSUMER,
-+ AV_CODEC_ID_MWSC,
-+ AV_CODEC_ID_WCMV,
-+ AV_CODEC_ID_RASC,
-+ AV_CODEC_ID_HYMT,
-+ AV_CODEC_ID_ARBC,
-+ AV_CODEC_ID_AGM,
-+ AV_CODEC_ID_LSCR,
-+ AV_CODEC_ID_VP4,
-+ AV_CODEC_ID_IMM5,
-+ AV_CODEC_ID_MVDV,
-+ AV_CODEC_ID_MVHA,
-+ AV_CODEC_ID_CDTOONS,
-+ AV_CODEC_ID_MV30,
-+ AV_CODEC_ID_NOTCHLC,
-+ AV_CODEC_ID_PFM,
-+ AV_CODEC_ID_MOBICLIP,
-+ AV_CODEC_ID_PHOTOCD,
-+ AV_CODEC_ID_IPU,
-+ AV_CODEC_ID_ARGO,
-+ AV_CODEC_ID_CRI,
-+ AV_CODEC_ID_SIMBIOSIS_IMX,
-+ AV_CODEC_ID_SGA_VIDEO,
-+ AV_CODEC_ID_GEM,
-+
-+ /* various PCM "codecs" */
-+ AV_CODEC_ID_FIRST_AUDIO =
-+ 0x10000, ///< A dummy id pointing at the start of audio codecs
-+ AV_CODEC_ID_PCM_S16LE = 0x10000,
-+ AV_CODEC_ID_PCM_S16BE,
-+ AV_CODEC_ID_PCM_U16LE,
-+ AV_CODEC_ID_PCM_U16BE,
-+ AV_CODEC_ID_PCM_S8,
-+ AV_CODEC_ID_PCM_U8,
-+ AV_CODEC_ID_PCM_MULAW,
-+ AV_CODEC_ID_PCM_ALAW,
-+ AV_CODEC_ID_PCM_S32LE,
-+ AV_CODEC_ID_PCM_S32BE,
-+ AV_CODEC_ID_PCM_U32LE,
-+ AV_CODEC_ID_PCM_U32BE,
-+ AV_CODEC_ID_PCM_S24LE,
-+ AV_CODEC_ID_PCM_S24BE,
-+ AV_CODEC_ID_PCM_U24LE,
-+ AV_CODEC_ID_PCM_U24BE,
-+ AV_CODEC_ID_PCM_S24DAUD,
-+ AV_CODEC_ID_PCM_ZORK,
-+ AV_CODEC_ID_PCM_S16LE_PLANAR,
-+ AV_CODEC_ID_PCM_DVD,
-+ AV_CODEC_ID_PCM_F32BE,
-+ AV_CODEC_ID_PCM_F32LE,
-+ AV_CODEC_ID_PCM_F64BE,
-+ AV_CODEC_ID_PCM_F64LE,
-+ AV_CODEC_ID_PCM_BLURAY,
-+ AV_CODEC_ID_PCM_LXF,
-+ AV_CODEC_ID_S302M,
-+ AV_CODEC_ID_PCM_S8_PLANAR,
-+ AV_CODEC_ID_PCM_S24LE_PLANAR,
-+ AV_CODEC_ID_PCM_S32LE_PLANAR,
-+ AV_CODEC_ID_PCM_S16BE_PLANAR,
-+ AV_CODEC_ID_PCM_S64LE,
-+ AV_CODEC_ID_PCM_S64BE,
-+ AV_CODEC_ID_PCM_F16LE,
-+ AV_CODEC_ID_PCM_F24LE,
-+ AV_CODEC_ID_PCM_VIDC,
-+ AV_CODEC_ID_PCM_SGA,
-+
-+ /* various ADPCM codecs */
-+ AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
-+ AV_CODEC_ID_ADPCM_IMA_WAV,
-+ AV_CODEC_ID_ADPCM_IMA_DK3,
-+ AV_CODEC_ID_ADPCM_IMA_DK4,
-+ AV_CODEC_ID_ADPCM_IMA_WS,
-+ AV_CODEC_ID_ADPCM_IMA_SMJPEG,
-+ AV_CODEC_ID_ADPCM_MS,
-+ AV_CODEC_ID_ADPCM_4XM,
-+ AV_CODEC_ID_ADPCM_XA,
-+ AV_CODEC_ID_ADPCM_ADX,
-+ AV_CODEC_ID_ADPCM_EA,
-+ AV_CODEC_ID_ADPCM_G726,
-+ AV_CODEC_ID_ADPCM_CT,
-+ AV_CODEC_ID_ADPCM_SWF,
-+ AV_CODEC_ID_ADPCM_YAMAHA,
-+ AV_CODEC_ID_ADPCM_SBPRO_4,
-+ AV_CODEC_ID_ADPCM_SBPRO_3,
-+ AV_CODEC_ID_ADPCM_SBPRO_2,
-+ AV_CODEC_ID_ADPCM_THP,
-+ AV_CODEC_ID_ADPCM_IMA_AMV,
-+ AV_CODEC_ID_ADPCM_EA_R1,
-+ AV_CODEC_ID_ADPCM_EA_R3,
-+ AV_CODEC_ID_ADPCM_EA_R2,
-+ AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
-+ AV_CODEC_ID_ADPCM_IMA_EA_EACS,
-+ AV_CODEC_ID_ADPCM_EA_XAS,
-+ AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
-+ AV_CODEC_ID_ADPCM_IMA_ISS,
-+ AV_CODEC_ID_ADPCM_G722,
-+ AV_CODEC_ID_ADPCM_IMA_APC,
-+ AV_CODEC_ID_ADPCM_VIMA,
-+ AV_CODEC_ID_ADPCM_AFC,
-+ AV_CODEC_ID_ADPCM_IMA_OKI,
-+ AV_CODEC_ID_ADPCM_DTK,
-+ AV_CODEC_ID_ADPCM_IMA_RAD,
-+ AV_CODEC_ID_ADPCM_G726LE,
-+ AV_CODEC_ID_ADPCM_THP_LE,
-+ AV_CODEC_ID_ADPCM_PSX,
-+ AV_CODEC_ID_ADPCM_AICA,
-+ AV_CODEC_ID_ADPCM_IMA_DAT4,
-+ AV_CODEC_ID_ADPCM_MTAF,
-+ AV_CODEC_ID_ADPCM_AGM,
-+ AV_CODEC_ID_ADPCM_ARGO,
-+ AV_CODEC_ID_ADPCM_IMA_SSI,
-+ AV_CODEC_ID_ADPCM_ZORK,
-+ AV_CODEC_ID_ADPCM_IMA_APM,
-+ AV_CODEC_ID_ADPCM_IMA_ALP,
-+ AV_CODEC_ID_ADPCM_IMA_MTF,
-+ AV_CODEC_ID_ADPCM_IMA_CUNNING,
-+ AV_CODEC_ID_ADPCM_IMA_MOFLEX,
-+ AV_CODEC_ID_ADPCM_IMA_ACORN,
-+
-+ /* AMR */
-+ AV_CODEC_ID_AMR_NB = 0x12000,
-+ AV_CODEC_ID_AMR_WB,
-+
-+ /* RealAudio codecs*/
-+ AV_CODEC_ID_RA_144 = 0x13000,
-+ AV_CODEC_ID_RA_288,
-+
-+ /* various DPCM codecs */
-+ AV_CODEC_ID_ROQ_DPCM = 0x14000,
-+ AV_CODEC_ID_INTERPLAY_DPCM,
-+ AV_CODEC_ID_XAN_DPCM,
-+ AV_CODEC_ID_SOL_DPCM,
-+ AV_CODEC_ID_SDX2_DPCM,
-+ AV_CODEC_ID_GREMLIN_DPCM,
-+ AV_CODEC_ID_DERF_DPCM,
-+
-+ /* audio codecs */
-+ AV_CODEC_ID_MP2 = 0x15000,
-+ AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-+ AV_CODEC_ID_AAC,
-+ AV_CODEC_ID_AC3,
-+ AV_CODEC_ID_DTS,
-+ AV_CODEC_ID_VORBIS,
-+ AV_CODEC_ID_DVAUDIO,
-+ AV_CODEC_ID_WMAV1,
-+ AV_CODEC_ID_WMAV2,
-+ AV_CODEC_ID_MACE3,
-+ AV_CODEC_ID_MACE6,
-+ AV_CODEC_ID_VMDAUDIO,
-+ AV_CODEC_ID_FLAC,
-+ AV_CODEC_ID_MP3ADU,
-+ AV_CODEC_ID_MP3ON4,
-+ AV_CODEC_ID_SHORTEN,
-+ AV_CODEC_ID_ALAC,
-+ AV_CODEC_ID_WESTWOOD_SND1,
-+ AV_CODEC_ID_GSM, ///< as in Berlin toast format
-+ AV_CODEC_ID_QDM2,
-+ AV_CODEC_ID_COOK,
-+ AV_CODEC_ID_TRUESPEECH,
-+ AV_CODEC_ID_TTA,
-+ AV_CODEC_ID_SMACKAUDIO,
-+ AV_CODEC_ID_QCELP,
-+ AV_CODEC_ID_WAVPACK,
-+ AV_CODEC_ID_DSICINAUDIO,
-+ AV_CODEC_ID_IMC,
-+ AV_CODEC_ID_MUSEPACK7,
-+ AV_CODEC_ID_MLP,
-+ AV_CODEC_ID_GSM_MS, /* as found in WAV */
-+ AV_CODEC_ID_ATRAC3,
-+ AV_CODEC_ID_APE,
-+ AV_CODEC_ID_NELLYMOSER,
-+ AV_CODEC_ID_MUSEPACK8,
-+ AV_CODEC_ID_SPEEX,
-+ AV_CODEC_ID_WMAVOICE,
-+ AV_CODEC_ID_WMAPRO,
-+ AV_CODEC_ID_WMALOSSLESS,
-+ AV_CODEC_ID_ATRAC3P,
-+ AV_CODEC_ID_EAC3,
-+ AV_CODEC_ID_SIPR,
-+ AV_CODEC_ID_MP1,
-+ AV_CODEC_ID_TWINVQ,
-+ AV_CODEC_ID_TRUEHD,
-+ AV_CODEC_ID_MP4ALS,
-+ AV_CODEC_ID_ATRAC1,
-+ AV_CODEC_ID_BINKAUDIO_RDFT,
-+ AV_CODEC_ID_BINKAUDIO_DCT,
-+ AV_CODEC_ID_AAC_LATM,
-+ AV_CODEC_ID_QDMC,
-+ AV_CODEC_ID_CELT,
-+ AV_CODEC_ID_G723_1,
-+ AV_CODEC_ID_G729,
-+ AV_CODEC_ID_8SVX_EXP,
-+ AV_CODEC_ID_8SVX_FIB,
-+ AV_CODEC_ID_BMV_AUDIO,
-+ AV_CODEC_ID_RALF,
-+ AV_CODEC_ID_IAC,
-+ AV_CODEC_ID_ILBC,
-+ AV_CODEC_ID_OPUS,
-+ AV_CODEC_ID_COMFORT_NOISE,
-+ AV_CODEC_ID_TAK,
-+ AV_CODEC_ID_METASOUND,
-+ AV_CODEC_ID_PAF_AUDIO,
-+ AV_CODEC_ID_ON2AVC,
-+ AV_CODEC_ID_DSS_SP,
-+ AV_CODEC_ID_CODEC2,
-+ AV_CODEC_ID_FFWAVESYNTH,
-+ AV_CODEC_ID_SONIC,
-+ AV_CODEC_ID_SONIC_LS,
-+ AV_CODEC_ID_EVRC,
-+ AV_CODEC_ID_SMV,
-+ AV_CODEC_ID_DSD_LSBF,
-+ AV_CODEC_ID_DSD_MSBF,
-+ AV_CODEC_ID_DSD_LSBF_PLANAR,
-+ AV_CODEC_ID_DSD_MSBF_PLANAR,
-+ AV_CODEC_ID_4GV,
-+ AV_CODEC_ID_INTERPLAY_ACM,
-+ AV_CODEC_ID_XMA1,
-+ AV_CODEC_ID_XMA2,
-+ AV_CODEC_ID_DST,
-+ AV_CODEC_ID_ATRAC3AL,
-+ AV_CODEC_ID_ATRAC3PAL,
-+ AV_CODEC_ID_DOLBY_E,
-+ AV_CODEC_ID_APTX,
-+ AV_CODEC_ID_APTX_HD,
-+ AV_CODEC_ID_SBC,
-+ AV_CODEC_ID_ATRAC9,
-+ AV_CODEC_ID_HCOM,
-+ AV_CODEC_ID_ACELP_KELVIN,
-+ AV_CODEC_ID_MPEGH_3D_AUDIO,
-+ AV_CODEC_ID_SIREN,
-+ AV_CODEC_ID_HCA,
-+ AV_CODEC_ID_FASTAUDIO,
-+ AV_CODEC_ID_MSNSIREN,
-+
-+ /* subtitle codecs */
-+ AV_CODEC_ID_FIRST_SUBTITLE =
-+ 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
-+ AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
-+ AV_CODEC_ID_DVB_SUBTITLE,
-+ AV_CODEC_ID_TEXT, ///< raw UTF-8 text
-+ AV_CODEC_ID_XSUB,
-+ AV_CODEC_ID_SSA,
-+ AV_CODEC_ID_MOV_TEXT,
-+ AV_CODEC_ID_HDMV_PGS_SUBTITLE,
-+ AV_CODEC_ID_DVB_TELETEXT,
-+ AV_CODEC_ID_SRT,
-+ AV_CODEC_ID_MICRODVD,
-+ AV_CODEC_ID_EIA_608,
-+ AV_CODEC_ID_JACOSUB,
-+ AV_CODEC_ID_SAMI,
-+ AV_CODEC_ID_REALTEXT,
-+ AV_CODEC_ID_STL,
-+ AV_CODEC_ID_SUBVIEWER1,
-+ AV_CODEC_ID_SUBVIEWER,
-+ AV_CODEC_ID_SUBRIP,
-+ AV_CODEC_ID_WEBVTT,
-+ AV_CODEC_ID_MPL2,
-+ AV_CODEC_ID_VPLAYER,
-+ AV_CODEC_ID_PJS,
-+ AV_CODEC_ID_ASS,
-+ AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
-+ AV_CODEC_ID_TTML,
-+ AV_CODEC_ID_ARIB_CAPTION,
-+
-+ /* other specific kind of codecs (generally used for attachments) */
-+ AV_CODEC_ID_FIRST_UNKNOWN =
-+ 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
-+ AV_CODEC_ID_TTF = 0x18000,
-+
-+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program
-+ ///< stream.
-+ AV_CODEC_ID_EPG,
-+ AV_CODEC_ID_BINTEXT,
-+ AV_CODEC_ID_XBIN,
-+ AV_CODEC_ID_IDF,
-+ AV_CODEC_ID_OTF,
-+ AV_CODEC_ID_SMPTE_KLV,
-+ AV_CODEC_ID_DVD_NAV,
-+ AV_CODEC_ID_TIMED_ID3,
-+ AV_CODEC_ID_BIN_DATA,
-+
-+ AV_CODEC_ID_PROBE =
-+ 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf
-+ ///< should attempt to identify it
-+
-+ AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_MPEG4SYSTEMS =
-+ 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-+ * stream (only used by libavformat) */
-+ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing
-+ ///< only metadata information.
-+ AV_CODEC_ID_WRAPPED_AVFRAME =
-+ 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
-+};
-+
-+/**
-+ * Get the type of the given codec.
-+ */
-+enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
-+
-+/**
-+ * Get the name of a codec.
-+ * @return a static string identifying the codec; never NULL
-+ */
-+const char* avcodec_get_name(enum AVCodecID id);
-+
-+/**
-+ * Return codec bits per sample.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return codec bits per sample.
-+ * Only return non-zero if the bits per sample is exactly correct, not an
-+ * approximation.
-+ *
-+ * @param[in] codec_id the codec
-+ * @return Number of bits per sample or zero if unknown for the given codec.
-+ */
-+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-+
-+/**
-+ * Return a name for the specified profile, if available.
-+ *
-+ * @param codec_id the ID of the codec to which the requested profile belongs
-+ * @param profile the profile value for which a name is requested
-+ * @return A name for the profile if found, NULL otherwise.
-+ *
-+ * @note unlike av_get_profile_name(), which searches a list of profiles
-+ * supported by a specific decoder or encoder implementation, this
-+ * function searches the list of profiles from the AVCodecDescriptor
-+ */
-+const char* avcodec_profile_name(enum AVCodecID codec_id, int profile);
-+
-+/**
-+ * Return the PCM codec associated with a sample format.
-+ * @param be endianness, 0 for little, 1 for big,
-+ * -1 (or anything else) for native
-+ * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
-+ */
-+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_ID_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/codec_par.h
-@@ -0,0 +1,236 @@
-+/*
-+ * Codec parameters public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_CODEC_PAR_H
-+#define AVCODEC_CODEC_PAR_H
-+
-+#include <stdint.h>
-+
-+#include "libavutil/avutil.h"
-+#include "libavutil/rational.h"
-+#include "libavutil/pixfmt.h"
-+
-+#include "codec_id.h"
-+
-+/**
-+ * @addtogroup lavc_core
-+ */
-+
-+enum AVFieldOrder {
-+ AV_FIELD_UNKNOWN,
-+ AV_FIELD_PROGRESSIVE,
-+ AV_FIELD_TT, //< Top coded_first, top displayed first
-+ AV_FIELD_BB, //< Bottom coded first, bottom displayed first
-+ AV_FIELD_TB, //< Top coded first, bottom displayed first
-+ AV_FIELD_BT, //< Bottom coded first, top displayed first
-+};
-+
-+/**
-+ * This struct describes the properties of an encoded stream.
-+ *
-+ * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must
-+ * be allocated with avcodec_parameters_alloc() and freed with
-+ * avcodec_parameters_free().
-+ */
-+typedef struct AVCodecParameters {
-+ /**
-+ * General type of the encoded data.
-+ */
-+ enum AVMediaType codec_type;
-+ /**
-+ * Specific type of the encoded data (the codec used).
-+ */
-+ enum AVCodecID codec_id;
-+ /**
-+ * Additional information about the codec (corresponds to the AVI FOURCC).
-+ */
-+ uint32_t codec_tag;
-+
-+ /**
-+ * Extra binary data needed for initializing the decoder, codec-dependent.
-+ *
-+ * Must be allocated with av_malloc() and will be freed by
-+ * avcodec_parameters_free(). The allocated size of extradata must be at
-+ * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding
-+ * bytes zeroed.
-+ */
-+ uint8_t* extradata;
-+ /**
-+ * Size of the extradata content in bytes.
-+ */
-+ int extradata_size;
-+
-+ /**
-+ * - video: the pixel format, the value corresponds to enum AVPixelFormat.
-+ * - audio: the sample format, the value corresponds to enum AVSampleFormat.
-+ */
-+ int format;
-+
-+ /**
-+ * The average bitrate of the encoded data (in bits per second).
-+ */
-+ int64_t bit_rate;
-+
-+ /**
-+ * The number of bits per sample in the codedwords.
-+ *
-+ * This is basically the bitrate per sample. It is mandatory for a bunch of
-+ * formats to actually decode them. It's the number of bits for one sample in
-+ * the actual coded bitstream.
-+ *
-+ * This could be for example 4 for ADPCM
-+ * For PCM formats this matches bits_per_raw_sample
-+ * Can be 0
-+ */
-+ int bits_per_coded_sample;
-+
-+ /**
-+ * This is the number of valid bits in each output sample. If the
-+ * sample format has more bits, the least significant bits are additional
-+ * padding bits, which are always 0. Use right shifts to reduce the sample
-+ * to its actual size. For example, audio formats with 24 bit samples will
-+ * have bits_per_raw_sample set to 24, and format set to AV_SAMPLE_FMT_S32.
-+ * To get the original sample use "(int32_t)sample >> 8"."
-+ *
-+ * For ADPCM this might be 12 or 16 or similar
-+ * Can be 0
-+ */
-+ int bits_per_raw_sample;
-+
-+ /**
-+ * Codec-specific bitstream restrictions that the stream conforms to.
-+ */
-+ int profile;
-+ int level;
-+
-+ /**
-+ * Video only. The dimensions of the video frame in pixels.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * Video only. The aspect ratio (width / height) which a single pixel
-+ * should have when displayed.
-+ *
-+ * When the aspect ratio is unknown / undefined, the numerator should be
-+ * set to 0 (the denominator may have any value).
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Video only. The order of the fields in interlaced video.
-+ */
-+ enum AVFieldOrder field_order;
-+
-+ /**
-+ * Video only. Additional colorspace characteristics.
-+ */
-+ enum AVColorRange color_range;
-+ enum AVColorPrimaries color_primaries;
-+ enum AVColorTransferCharacteristic color_trc;
-+ enum AVColorSpace color_space;
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * Video only. Number of delayed frames.
-+ */
-+ int video_delay;
-+
-+ /**
-+ * Audio only. The channel layout bitmask. May be 0 if the channel layout is
-+ * unknown or unspecified, otherwise the number of bits set must be equal to
-+ * the channels field.
-+ */
-+ uint64_t channel_layout;
-+ /**
-+ * Audio only. The number of audio channels.
-+ */
-+ int channels;
-+ /**
-+ * Audio only. The number of audio samples per second.
-+ */
-+ int sample_rate;
-+ /**
-+ * Audio only. The number of bytes per coded audio frame, required by some
-+ * formats.
-+ *
-+ * Corresponds to nBlockAlign in WAVEFORMATEX.
-+ */
-+ int block_align;
-+ /**
-+ * Audio only. Audio frame size, if known. Required by some formats to be
-+ * static.
-+ */
-+ int frame_size;
-+
-+ /**
-+ * Audio only. The amount of padding (in samples) inserted by the encoder at
-+ * the beginning of the audio. I.e. this number of leading decoded samples
-+ * must be discarded by the caller to get the original audio without leading
-+ * padding.
-+ */
-+ int initial_padding;
-+ /**
-+ * Audio only. The amount of padding (in samples) appended by the encoder to
-+ * the end of the audio. I.e. this number of decoded samples must be
-+ * discarded by the caller from the end of the stream to get the original
-+ * audio without any trailing padding.
-+ */
-+ int trailing_padding;
-+ /**
-+ * Audio only. Number of samples to skip after a discontinuity.
-+ */
-+ int seek_preroll;
-+} AVCodecParameters;
-+
-+/**
-+ * Allocate a new AVCodecParameters and set its fields to default values
-+ * (unknown/invalid/0). The returned struct must be freed with
-+ * avcodec_parameters_free().
-+ */
-+AVCodecParameters* avcodec_parameters_alloc(void);
-+
-+/**
-+ * Free an AVCodecParameters instance and everything associated with it and
-+ * write NULL to the supplied pointer.
-+ */
-+void avcodec_parameters_free(AVCodecParameters** par);
-+
-+/**
-+ * Copy the contents of src to dst. Any allocated fields in dst are freed and
-+ * replaced with newly allocated duplicates of the corresponding fields in src.
-+ *
-+ * @return >= 0 on success, a negative AVERROR code on failure.
-+ */
-+int avcodec_parameters_copy(AVCodecParameters* dst,
-+ const AVCodecParameters* src);
-+
-+/**
-+ * This function is the same as av_get_audio_frame_duration(), except it works
-+ * with AVCodecParameters instead of an AVCodecContext.
-+ */
-+int av_get_audio_frame_duration2(AVCodecParameters* par, int frame_bytes);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_CODEC_PAR_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/defs.h
-@@ -0,0 +1,171 @@
-+/*
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_DEFS_H
-+#define AVCODEC_DEFS_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Misc types and constants that do not belong anywhere else.
-+ */
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+
-+/**
-+ * @ingroup lavc_decoding
-+ * Required number of additionally allocated bytes at the end of the input
-+ * bitstream for decoding. This is mainly needed because some optimized
-+ * bitstream readers read 32 or 64 bit at once and could read over the end.<br>
-+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged
-+ * MPEG bitstreams could cause overread and segfault.
-+ */
-+#define AV_INPUT_BUFFER_PADDING_SIZE 64
-+
-+/**
-+ * @ingroup lavc_decoding
-+ */
-+enum AVDiscard {
-+ /* We leave some space between them for extensions (drop some
-+ * keyframes for intra-only or drop just some bidir frames). */
-+ AVDISCARD_NONE = -16, ///< discard nothing
-+ AVDISCARD_DEFAULT =
-+ 0, ///< discard useless packets like 0 size packets in avi
-+ AVDISCARD_NONREF = 8, ///< discard all non reference
-+ AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames
-+ AVDISCARD_NONINTRA = 24, ///< discard all non intra frames
-+ AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes
-+ AVDISCARD_ALL = 48, ///< discard all
-+};
-+
-+enum AVAudioServiceType {
-+ AV_AUDIO_SERVICE_TYPE_MAIN = 0,
-+ AV_AUDIO_SERVICE_TYPE_EFFECTS = 1,
-+ AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2,
-+ AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3,
-+ AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4,
-+ AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5,
-+ AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6,
-+ AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7,
-+ AV_AUDIO_SERVICE_TYPE_KARAOKE = 8,
-+ AV_AUDIO_SERVICE_TYPE_NB, ///< Not part of ABI
-+};
-+
-+/**
-+ * Pan Scan area.
-+ * This specifies the area which should be displayed.
-+ * Note there may be multiple such areas for one frame.
-+ */
-+typedef struct AVPanScan {
-+ /**
-+ * id
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int id;
-+
-+ /**
-+ * width and height in 1/16 pel
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int width;
-+ int height;
-+
-+ /**
-+ * position of the top left corner in 1/16 pel for up to 3 fields/frames
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ int16_t position[3][2];
-+} AVPanScan;
-+
-+/**
-+ * This structure describes the bitrate properties of an encoded bitstream. It
-+ * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD
-+ * parameters for H.264/HEVC.
-+ */
-+typedef struct AVCPBProperties {
-+ /**
-+ * Maximum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t max_bitrate;
-+ /**
-+ * Minimum bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t min_bitrate;
-+ /**
-+ * Average bitrate of the stream, in bits per second.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t avg_bitrate;
-+
-+ /**
-+ * The size of the buffer to which the ratecontrol is applied, in bits.
-+ * Zero if unknown or unspecified.
-+ */
-+ int64_t buffer_size;
-+
-+ /**
-+ * The delay between the time the packet this structure is associated with
-+ * is received and the time when it should be decoded, in periods of a 27MHz
-+ * clock.
-+ *
-+ * UINT64_MAX when unknown or unspecified.
-+ */
-+ uint64_t vbv_delay;
-+} AVCPBProperties;
-+
-+/**
-+ * Allocate a CPB properties structure and initialize its fields to default
-+ * values.
-+ *
-+ * @param size if non-NULL, the size of the allocated struct will be written
-+ * here. This is useful for embedding it in side data.
-+ *
-+ * @return the newly allocated struct or NULL on failure
-+ */
-+AVCPBProperties* av_cpb_properties_alloc(size_t* size);
-+
-+/**
-+ * This structure supplies correlation between a packet timestamp and a wall
-+ * clock production time. The definition follows the Producer Reference Time
-+ * ('prft') as defined in ISO/IEC 14496-12
-+ */
-+typedef struct AVProducerReferenceTime {
-+ /**
-+ * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()).
-+ */
-+ int64_t wallclock;
-+ int flags;
-+} AVProducerReferenceTime;
-+
-+/**
-+ * Encode extradata length to a buffer. Used by xiph codecs.
-+ *
-+ * @param s buffer to write to; must be at least (v/255+1) bytes long
-+ * @param v size of extradata in bytes
-+ * @return number of bytes written to the buffer.
-+ */
-+unsigned int av_xiphlacing(unsigned char* s, unsigned int v);
-+
-+#endif // AVCODEC_DEFS_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/packet.h
-@@ -0,0 +1,724 @@
-+/*
-+ * AVPacket public API
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_PACKET_H
-+#define AVCODEC_PACKET_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "libavutil/attributes.h"
-+#include "libavutil/buffer.h"
-+#include "libavutil/dict.h"
-+#include "libavutil/rational.h"
-+
-+#include "libavcodec/version.h"
-+
-+/**
-+ * @defgroup lavc_packet AVPacket
-+ *
-+ * Types and functions for working with AVPacket.
-+ * @{
-+ */
-+enum AVPacketSideDataType {
-+ /**
-+ * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
-+ * bytes worth of palette. This side data signals that a new palette is
-+ * present.
-+ */
-+ AV_PKT_DATA_PALETTE,
-+
-+ /**
-+ * The AV_PKT_DATA_NEW_EXTRADATA is used to notify the codec or the format
-+ * that the extradata buffer was changed and the receiving side should
-+ * act upon it appropriately. The new extradata is embedded in the side
-+ * data buffer and should be immediately used for processing the current
-+ * frame or packet.
-+ */
-+ AV_PKT_DATA_NEW_EXTRADATA,
-+
-+ /**
-+ * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
-+ * @code
-+ * u32le param_flags
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
-+ * s32le channel_count
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
-+ * u64le channel_layout
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
-+ * s32le sample_rate
-+ * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
-+ * s32le width
-+ * s32le height
-+ * @endcode
-+ */
-+ AV_PKT_DATA_PARAM_CHANGE,
-+
-+ /**
-+ * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of
-+ * structures with info about macroblocks relevant to splitting the
-+ * packet into smaller packets on macroblock edges (e.g. as for RFC 2190).
-+ * That is, it does not necessarily contain info about all macroblocks,
-+ * as long as the distance between macroblocks in the info is smaller
-+ * than the target payload size.
-+ * Each MB info structure is 12 bytes, and is laid out as follows:
-+ * @code
-+ * u32le bit offset from the start of the packet
-+ * u8 current quantizer at the start of the macroblock
-+ * u8 GOB number
-+ * u16le macroblock address within the GOB
-+ * u8 horizontal MV predictor
-+ * u8 vertical MV predictor
-+ * u8 horizontal MV predictor for block number 3
-+ * u8 vertical MV predictor for block number 3
-+ * @endcode
-+ */
-+ AV_PKT_DATA_H263_MB_INFO,
-+
-+ /**
-+ * This side data should be associated with an audio stream and contains
-+ * ReplayGain information in form of the AVReplayGain struct.
-+ */
-+ AV_PKT_DATA_REPLAYGAIN,
-+
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the decoded video frames for
-+ * correct presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_PKT_DATA_DISPLAYMATRIX,
-+
-+ /**
-+ * This side data should be associated with a video stream and contains
-+ * Stereoscopic 3D information in form of the AVStereo3D struct.
-+ */
-+ AV_PKT_DATA_STEREO3D,
-+
-+ /**
-+ * This side data should be associated with an audio stream and corresponds
-+ * to enum AVAudioServiceType.
-+ */
-+ AV_PKT_DATA_AUDIO_SERVICE_TYPE,
-+
-+ /**
-+ * This side data contains quality related information from the encoder.
-+ * @code
-+ * u32le quality factor of the compressed frame. Allowed range is between 1
-+ * (good) and FF_LAMBDA_MAX (bad). u8 picture type u8 error count u16
-+ * reserved u64le[error count] sum of squared differences between encoder in
-+ * and output
-+ * @endcode
-+ */
-+ AV_PKT_DATA_QUALITY_STATS,
-+
-+ /**
-+ * This side data contains an integer value representing the stream index
-+ * of a "fallback" track. A fallback track indicates an alternate
-+ * track to use when the current track can not be decoded for some reason.
-+ * e.g. no decoder available for codec.
-+ */
-+ AV_PKT_DATA_FALLBACK_TRACK,
-+
-+ /**
-+ * This side data corresponds to the AVCPBProperties struct.
-+ */
-+ AV_PKT_DATA_CPB_PROPERTIES,
-+
-+ /**
-+ * Recommmends skipping the specified number of samples
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SKIP_SAMPLES,
-+
-+ /**
-+ * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
-+ * the packet may contain "dual mono" audio specific to Japanese DTV
-+ * and if it is true, recommends only the selected channel to be used.
-+ * @code
-+ * u8 selected channels (0=mail/left, 1=sub/right, 2=both)
-+ * @endcode
-+ */
-+ AV_PKT_DATA_JP_DUALMONO,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop.
-+ */
-+ AV_PKT_DATA_STRINGS_METADATA,
-+
-+ /**
-+ * Subtitle event position
-+ * @code
-+ * u32le x1
-+ * u32le y1
-+ * u32le x2
-+ * u32le y2
-+ * @endcode
-+ */
-+ AV_PKT_DATA_SUBTITLE_POSITION,
-+
-+ /**
-+ * Data found in BlockAdditional element of matroska container. There is
-+ * no end marker for the data, so it is required to rely on the side data
-+ * size to recognize the end. 8 byte id (as found in BlockAddId) followed
-+ * by data.
-+ */
-+ AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
-+
-+ /**
-+ * The optional first identifier line of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_IDENTIFIER,
-+
-+ /**
-+ * The optional settings (rendering instructions) that immediately
-+ * follow the timestamp specifier of a WebVTT cue.
-+ */
-+ AV_PKT_DATA_WEBVTT_SETTINGS,
-+
-+ /**
-+ * A list of zero terminated key/value strings. There is no end marker for
-+ * the list, so it is required to rely on the side data size to stop. This
-+ * side data includes updated metadata which appeared in the stream.
-+ */
-+ AV_PKT_DATA_METADATA_UPDATE,
-+
-+ /**
-+ * MPEGTS stream ID as uint8_t, this is required to pass the stream ID
-+ * information from the demuxer to the corresponding muxer.
-+ */
-+ AV_PKT_DATA_MPEGTS_STREAM_ID,
-+
-+ /**
-+ * Mastering display metadata (based on SMPTE-2086:2014). This metadata
-+ * should be associated with a video stream and contains data in the form
-+ * of the AVMasteringDisplayMetadata struct.
-+ */
-+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
-+
-+ /**
-+ * This side data should be associated with a video stream and corresponds
-+ * to the AVSphericalMapping structure.
-+ */
-+ AV_PKT_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This metadata should be
-+ * associated with a video stream and contains data in the form of the
-+ * AVContentLightMetadata struct.
-+ */
-+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
-+ * a video stream. A53 CC bitstream is stored as uint8_t in
-+ * AVPacketSideData.data. The number of bytes of CC data is
-+ * AVPacketSideData.size.
-+ */
-+ AV_PKT_DATA_A53_CC,
-+
-+ /**
-+ * This side data is encryption initialization data.
-+ * The format is not part of ABI, use av_encryption_init_info_* methods to
-+ * access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INIT_INFO,
-+
-+ /**
-+ * This side data contains encryption info for how to decrypt the packet.
-+ * The format is not part of ABI, use av_encryption_info_* methods to access.
-+ */
-+ AV_PKT_DATA_ENCRYPTION_INFO,
-+
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_PKT_DATA_AFD,
-+
-+ /**
-+ * Producer Reference Time data corresponding to the AVProducerReferenceTime
-+ * struct, usually exported by some encoders (on demand through the prft flag
-+ * set in the AVCodecContext export_side_data field).
-+ */
-+ AV_PKT_DATA_PRFT,
-+
-+ /**
-+ * ICC profile data consisting of an opaque octet buffer following the
-+ * format described by ISO 15076-1.
-+ */
-+ AV_PKT_DATA_ICC_PROFILE,
-+
-+ /**
-+ * DOVI configuration
-+ * ref:
-+ * dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2,
-+ * section 2.2
-+ * dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2,
-+ * section 3.3 Tags are stored in struct AVDOVIDecoderConfigurationRecord.
-+ */
-+ AV_PKT_DATA_DOVI_CONF,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_PKT_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR10+ dynamic metadata associated with a video frame. The metadata is in
-+ * the form of the AVDynamicHDRPlus struct and contains
-+ * information for color volume transform - application 4 of
-+ * SMPTE 2094-40:2016 standard.
-+ */
-+ AV_PKT_DATA_DYNAMIC_HDR10_PLUS,
-+
-+ /**
-+ * The number of side data types.
-+ * This is not part of the public API/ABI in the sense that it may
-+ * change when new side data types are added.
-+ * This must stay the last enum value.
-+ * If its value becomes huge, some code using it
-+ * needs to be updated as it assumes it to be smaller than other limits.
-+ */
-+ AV_PKT_DATA_NB
-+};
-+
-+#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS // DEPRECATED
-+
-+typedef struct AVPacketSideData {
-+ uint8_t* data;
-+ size_t size;
-+ enum AVPacketSideDataType type;
-+} AVPacketSideData;
-+
-+/**
-+ * This structure stores compressed data. It is typically exported by demuxers
-+ * and then passed as input to decoders, or received as output from encoders and
-+ * then passed to muxers.
-+ *
-+ * For video, it should typically contain one compressed frame. For audio it may
-+ * contain several compressed frames. Encoders are allowed to output empty
-+ * packets, with no compressed data, containing only side data
-+ * (e.g. to update some stream parameters at the end of encoding).
-+ *
-+ * The semantics of data ownership depends on the buf field.
-+ * If it is set, the packet data is dynamically allocated and is
-+ * valid indefinitely until a call to av_packet_unref() reduces the
-+ * reference count to 0.
-+ *
-+ * If the buf field is not set av_packet_ref() would make a copy instead
-+ * of increasing the reference count.
-+ *
-+ * The side data is always allocated with av_malloc(), copied by
-+ * av_packet_ref() and freed by av_packet_unref().
-+ *
-+ * sizeof(AVPacket) being a part of the public ABI is deprecated. once
-+ * av_init_packet() is removed, new packets will only be able to be allocated
-+ * with av_packet_alloc(), and new fields may be added to the end of the struct
-+ * with a minor bump.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ * @see av_packet_unref
-+ */
-+typedef struct AVPacket {
-+ /**
-+ * A reference to the reference-counted buffer where the packet data is
-+ * stored.
-+ * May be NULL, then the packet data is not reference-counted.
-+ */
-+ AVBufferRef* buf;
-+ /**
-+ * Presentation timestamp in AVStream->time_base units; the time at which
-+ * the decompressed packet will be presented to the user.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ * pts MUST be larger or equal to dts as presentation cannot happen before
-+ * decompression, unless one wants to view hex dumps. Some formats misuse
-+ * the terms dts and pts/cts to mean something different. Such timestamps
-+ * must be converted to true pts/dts before they are stored in AVPacket.
-+ */
-+ int64_t pts;
-+ /**
-+ * Decompression timestamp in AVStream->time_base units; the time at which
-+ * the packet is decompressed.
-+ * Can be AV_NOPTS_VALUE if it is not stored in the file.
-+ */
-+ int64_t dts;
-+ uint8_t* data;
-+ int size;
-+ int stream_index;
-+ /**
-+ * A combination of AV_PKT_FLAG values
-+ */
-+ int flags;
-+ /**
-+ * Additional packet data that can be provided by the container.
-+ * Packet can contain several types of side information.
-+ */
-+ AVPacketSideData* side_data;
-+ int side_data_elems;
-+
-+ /**
-+ * Duration of this packet in AVStream->time_base units, 0 if unknown.
-+ * Equals next_pts - this_pts in presentation order.
-+ */
-+ int64_t duration;
-+
-+ int64_t pos; ///< byte position in stream, -1 if unknown
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the packet is unreferenced. av_packet_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target packet's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * Time base of the packet's timestamps.
-+ * In the future, this field may be set on packets output by encoders or
-+ * demuxers, but its value will be by default ignored on input to decoders
-+ * or muxers.
-+ */
-+ AVRational time_base;
-+} AVPacket;
-+
-+#if FF_API_INIT_PACKET
-+attribute_deprecated typedef struct AVPacketList {
-+ AVPacket pkt;
-+ struct AVPacketList* next;
-+} AVPacketList;
-+#endif
-+
-+#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
-+#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-+/**
-+ * Flag is used to discard packets which are required to maintain valid
-+ * decoder state but are not required for output and should be dropped
-+ * after decoding.
-+ **/
-+#define AV_PKT_FLAG_DISCARD 0x0004
-+/**
-+ * The packet comes from a trusted source.
-+ *
-+ * Otherwise-unsafe constructs such as arbitrary pointers to data
-+ * outside the packet may be followed.
-+ */
-+#define AV_PKT_FLAG_TRUSTED 0x0008
-+/**
-+ * Flag is used to indicate packets that contain frames that can
-+ * be discarded by the decoder. I.e. Non-reference frames.
-+ */
-+#define AV_PKT_FLAG_DISPOSABLE 0x0010
-+
-+enum AVSideDataParamChangeFlags {
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001,
-+ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002,
-+ AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004,
-+ AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008,
-+};
-+
-+/**
-+ * Allocate an AVPacket and set its fields to default values. The resulting
-+ * struct must be freed using av_packet_free().
-+ *
-+ * @return An AVPacket filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVPacket itself, not the data buffers. Those
-+ * must be allocated through other means such as av_new_packet.
-+ *
-+ * @see av_new_packet
-+ */
-+AVPacket* av_packet_alloc(void);
-+
-+/**
-+ * Create a new packet that references the same data as src.
-+ *
-+ * This is a shortcut for av_packet_alloc()+av_packet_ref().
-+ *
-+ * @return newly created AVPacket on success, NULL on error.
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_ref
-+ */
-+AVPacket* av_packet_clone(const AVPacket* src);
-+
-+/**
-+ * Free the packet, if the packet is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param pkt packet to be freed. The pointer will be set to NULL.
-+ * @note passing NULL is a no-op.
-+ */
-+void av_packet_free(AVPacket** pkt);
-+
-+#if FF_API_INIT_PACKET
-+/**
-+ * Initialize optional fields of a packet with default values.
-+ *
-+ * Note, this does not touch the data and size members, which have to be
-+ * initialized separately.
-+ *
-+ * @param pkt packet
-+ *
-+ * @see av_packet_alloc
-+ * @see av_packet_unref
-+ *
-+ * @deprecated This function is deprecated. Once it's removed,
-+ sizeof(AVPacket) will not be a part of the ABI anymore.
-+ */
-+attribute_deprecated void av_init_packet(AVPacket* pkt);
-+#endif
-+
-+/**
-+ * Allocate the payload of a packet and initialize its fields with
-+ * default values.
-+ *
-+ * @param pkt packet
-+ * @param size wanted payload size
-+ * @return 0 if OK, AVERROR_xxx otherwise
-+ */
-+int av_new_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Reduce packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param size new size
-+ */
-+void av_shrink_packet(AVPacket* pkt, int size);
-+
-+/**
-+ * Increase packet size, correctly zeroing padding
-+ *
-+ * @param pkt packet
-+ * @param grow_by number of bytes by which to increase the size of the packet
-+ */
-+int av_grow_packet(AVPacket* pkt, int grow_by);
-+
-+/**
-+ * Initialize a reference-counted packet from av_malloc()ed data.
-+ *
-+ * @param pkt packet to be initialized. This function will set the data, size,
-+ * and buf fields, all others are left untouched.
-+ * @param data Data allocated by av_malloc() to be used as packet data. If this
-+ * function returns successfully, the data is owned by the underlying
-+ * AVBuffer. The caller may not access the data through other means.
-+ * @param size size of data in bytes, without the padding. I.e. the full buffer
-+ * size is assumed to be size + AV_INPUT_BUFFER_PADDING_SIZE.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_packet_from_data(AVPacket* pkt, uint8_t* data, int size);
-+
-+/**
-+ * Allocate new information of a packet.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size side information size
-+ * @return pointer to fresh allocated data or NULL otherwise
-+ */
-+uint8_t* av_packet_new_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Wrap an existing array as a packet side data.
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param data the side data array. It must be allocated with the av_malloc()
-+ * family of functions. The ownership of the data is transferred to
-+ * pkt.
-+ * @param size side information size
-+ * @return a non-negative number on success, a negative AVERROR code on
-+ * failure. On failure, the packet is unchanged and the data remains
-+ * owned by the caller.
-+ */
-+int av_packet_add_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ uint8_t* data, size_t size);
-+
-+/**
-+ * Shrink the already allocated side data buffer
-+ *
-+ * @param pkt packet
-+ * @param type side information type
-+ * @param size new side information size
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_shrink_side_data(AVPacket* pkt, enum AVPacketSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Get side information from packet.
-+ *
-+ * @param pkt packet
-+ * @param type desired side information type
-+ * @param size If supplied, *size will be set to the size of the side data
-+ * or to zero if the desired side data is not present.
-+ * @return pointer to data if present or NULL otherwise
-+ */
-+uint8_t* av_packet_get_side_data(const AVPacket* pkt,
-+ enum AVPacketSideDataType type, size_t* size);
-+
-+const char* av_packet_side_data_name(enum AVPacketSideDataType type);
-+
-+/**
-+ * Pack a dictionary for use in side_data.
-+ *
-+ * @param dict The dictionary to pack.
-+ * @param size pointer to store the size of the returned data
-+ * @return pointer to data if successful, NULL otherwise
-+ */
-+uint8_t* av_packet_pack_dictionary(AVDictionary* dict, size_t* size);
-+/**
-+ * Unpack a dictionary from side_data.
-+ *
-+ * @param data data from side_data
-+ * @param size size of the data
-+ * @param dict the metadata storage dictionary
-+ * @return 0 on success, < 0 on failure
-+ */
-+int av_packet_unpack_dictionary(const uint8_t* data, size_t size,
-+ AVDictionary** dict);
-+
-+/**
-+ * Convenience function to free all the side data stored.
-+ * All the other fields stay untouched.
-+ *
-+ * @param pkt packet
-+ */
-+void av_packet_free_side_data(AVPacket* pkt);
-+
-+/**
-+ * Setup a new reference to the data described by a given packet
-+ *
-+ * If src is reference-counted, setup dst as a new reference to the
-+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
-+ * data from src into it.
-+ *
-+ * All the other fields are copied from src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param dst Destination packet. Will be completely overwritten.
-+ * @param src Source packet
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On error, dst
-+ * will be blank (as if returned by av_packet_alloc()).
-+ */
-+int av_packet_ref(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Wipe the packet.
-+ *
-+ * Unreference the buffer referenced by the packet and reset the
-+ * remaining packet fields to their default values.
-+ *
-+ * @param pkt The packet to be unreferenced.
-+ */
-+void av_packet_unref(AVPacket* pkt);
-+
-+/**
-+ * Move every field in src to dst and reset src.
-+ *
-+ * @see av_packet_unref
-+ *
-+ * @param src Source packet, will be reset
-+ * @param dst Destination packet
-+ */
-+void av_packet_move_ref(AVPacket* dst, AVPacket* src);
-+
-+/**
-+ * Copy only "properties" fields from src to dst.
-+ *
-+ * Properties for the purpose of this function are all the fields
-+ * beside those related to the packet data (buf, data, size)
-+ *
-+ * @param dst Destination packet
-+ * @param src Source packet
-+ *
-+ * @return 0 on success AVERROR on failure.
-+ */
-+int av_packet_copy_props(AVPacket* dst, const AVPacket* src);
-+
-+/**
-+ * Ensure the data described by a given packet is reference counted.
-+ *
-+ * @note This function does not ensure that the reference will be writable.
-+ * Use av_packet_make_writable instead for that purpose.
-+ *
-+ * @see av_packet_ref
-+ * @see av_packet_make_writable
-+ *
-+ * @param pkt packet whose data should be made reference counted.
-+ *
-+ * @return 0 on success, a negative AVERROR on error. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_refcounted(AVPacket* pkt);
-+
-+/**
-+ * Create a writable reference for the data described by a given packet,
-+ * avoiding data copy if possible.
-+ *
-+ * @param pkt Packet whose data should be made writable.
-+ *
-+ * @return 0 on success, a negative AVERROR on failure. On failure, the
-+ * packet is unchanged.
-+ */
-+int av_packet_make_writable(AVPacket* pkt);
-+
-+/**
-+ * Convert valid timing fields (timestamps / durations) in a packet from one
-+ * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
-+ * ignored.
-+ *
-+ * @param pkt packet on which the conversion will be performed
-+ * @param tb_src source timebase, in which the timing fields in pkt are
-+ * expressed
-+ * @param tb_dst destination timebase, to which the timing fields will be
-+ * converted
-+ */
-+void av_packet_rescale_ts(AVPacket* pkt, AVRational tb_src, AVRational tb_dst);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif // AVCODEC_PACKET_H
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/vdpau.h
-@@ -0,0 +1,156 @@
-+/*
-+ * The Video Decode and Presentation API for UNIX (VDPAU) is used for
-+ * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
-+ *
-+ * Copyright (C) 2008 NVIDIA
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VDPAU_H
-+#define AVCODEC_VDPAU_H
-+
-+/**
-+ * @file
-+ * @ingroup lavc_codec_hwaccel_vdpau
-+ * Public libavcodec VDPAU header.
-+ */
-+
-+/**
-+ * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
-+ * @ingroup lavc_codec_hwaccel
-+ *
-+ * VDPAU hardware acceleration has two modules
-+ * - VDPAU decoding
-+ * - VDPAU presentation
-+ *
-+ * The VDPAU decoding module parses all headers using FFmpeg
-+ * parsing mechanisms and uses VDPAU for the actual decoding.
-+ *
-+ * As per the current implementation, the actual decoding
-+ * and rendering (API calls) are done as part of the VDPAU
-+ * presentation (vo_vdpau.c) module.
-+ *
-+ * @{
-+ */
-+
-+#include <vdpau/vdpau.h>
-+
-+#include "libavutil/avconfig.h"
-+#include "libavutil/attributes.h"
-+
-+#include "avcodec.h"
-+
-+struct AVCodecContext;
-+struct AVFrame;
-+
-+typedef int (*AVVDPAU_Render2)(struct AVCodecContext*, struct AVFrame*,
-+ const VdpPictureInfo*, uint32_t,
-+ const VdpBitstreamBuffer*);
-+
-+/**
-+ * This structure is used to share data between the libavcodec library and
-+ * the client video application.
-+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
-+ * function and make it available as
-+ * AVCodecContext.hwaccel_context. Members can be set by the user once
-+ * during initialization or through each AVCodecContext.get_buffer()
-+ * function call. In any case, they must be valid prior to calling
-+ * decoding functions.
-+ *
-+ * The size of this structure is not a part of the public ABI and must not
-+ * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
-+ * AVVDPAUContext.
-+ */
-+typedef struct AVVDPAUContext {
-+ /**
-+ * VDPAU decoder handle
-+ *
-+ * Set by user.
-+ */
-+ VdpDecoder decoder;
-+
-+ /**
-+ * VDPAU decoder render callback
-+ *
-+ * Set by the user.
-+ */
-+ VdpDecoderRender* render;
-+
-+ AVVDPAU_Render2 render2;
-+} AVVDPAUContext;
-+
-+/**
-+ * @brief allocation function for AVVDPAUContext
-+ *
-+ * Allows extending the struct without breaking API/ABI
-+ */
-+AVVDPAUContext* av_alloc_vdpaucontext(void);
-+
-+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext*);
-+void av_vdpau_hwaccel_set_render2(AVVDPAUContext*, AVVDPAU_Render2);
-+
-+/**
-+ * Associate a VDPAU device with a codec context for hardware acceleration.
-+ * This function is meant to be called from the get_format() codec callback,
-+ * or earlier. It can also be called after avcodec_flush_buffers() to change
-+ * the underlying VDPAU device mid-stream (e.g. to recover from non-transparent
-+ * display preemption).
-+ *
-+ * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
-+ * successfully.
-+ *
-+ * @param avctx decoding context whose get_format() callback is invoked
-+ * @param device VDPAU device handle to use for hardware acceleration
-+ * @param get_proc_address VDPAU device driver
-+ * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags
-+ *
-+ * @return 0 on success, an AVERROR code on failure.
-+ */
-+int av_vdpau_bind_context(AVCodecContext* avctx, VdpDevice device,
-+ VdpGetProcAddress* get_proc_address, unsigned flags);
-+
-+/**
-+ * Gets the parameters to create an adequate VDPAU video surface for the codec
-+ * context using VDPAU hardware decoding acceleration.
-+ *
-+ * @note Behavior is undefined if the context was not successfully bound to a
-+ * VDPAU device using av_vdpau_bind_context().
-+ *
-+ * @param avctx the codec context being used for decoding the stream
-+ * @param type storage space for the VDPAU video surface chroma type
-+ * (or NULL to ignore)
-+ * @param width storage space for the VDPAU video surface pixel width
-+ * (or NULL to ignore)
-+ * @param height storage space for the VDPAU video surface pixel height
-+ * (or NULL to ignore)
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_vdpau_get_surface_parameters(AVCodecContext* avctx, VdpChromaType* type,
-+ uint32_t* width, uint32_t* height);
-+
-+/**
-+ * Allocate an AVVDPAUContext.
-+ *
-+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
-+ */
-+AVVDPAUContext* av_vdpau_alloc_context(void);
-+
-+/* @}*/
-+
-+#endif /* AVCODEC_VDPAU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavcodec/version.h
-@@ -0,0 +1,67 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_VERSION_H
-+#define AVCODEC_VERSION_H
-+
-+/**
-+ * @file
-+ * @ingroup libavc
-+ * Libavcodec version macros.
-+ */
-+
-+#include "libavutil/version.h"
-+
-+#define LIBAVCODEC_VERSION_MAJOR 59
-+#define LIBAVCODEC_VERSION_MINOR 18
-+#define LIBAVCODEC_VERSION_MICRO 100
-+
-+#define LIBAVCODEC_VERSION_INT \
-+ AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_VERSION \
-+ AV_VERSION(LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, \
-+ LIBAVCODEC_VERSION_MICRO)
-+#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-+
-+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-+
-+/**
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ */
-+
-+#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60)
-+#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60)
-+
-+#endif /* AVCODEC_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/attributes.h
-@@ -0,0 +1,173 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Macro definitions for various function/variable attributes
-+ */
-+
-+#ifndef AVUTIL_ATTRIBUTES_H
-+#define AVUTIL_ATTRIBUTES_H
-+
-+#ifdef __GNUC__
-+# define AV_GCC_VERSION_AT_LEAST(x, y) \
-+ (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-+# define AV_GCC_VERSION_AT_MOST(x, y) \
-+ (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y))
-+#else
-+# define AV_GCC_VERSION_AT_LEAST(x, y) 0
-+# define AV_GCC_VERSION_AT_MOST(x, y) 0
-+#endif
-+
-+#ifdef __has_builtin
-+# define AV_HAS_BUILTIN(x) __has_builtin(x)
-+#else
-+# define AV_HAS_BUILTIN(x) 0
-+#endif
-+
-+#ifndef av_always_inline
-+# if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_always_inline __attribute__((always_inline)) inline
-+# elif defined(_MSC_VER)
-+# define av_always_inline __forceinline
-+# else
-+# define av_always_inline inline
-+# endif
-+#endif
-+
-+#ifndef av_extern_inline
-+# if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
-+# define av_extern_inline extern inline
-+# else
-+# define av_extern_inline inline
-+# endif
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 4)
-+# define av_warn_unused_result __attribute__((warn_unused_result))
-+#else
-+# define av_warn_unused_result
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_noinline __attribute__((noinline))
-+#elif defined(_MSC_VER)
-+# define av_noinline __declspec(noinline)
-+#else
-+# define av_noinline
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_pure __attribute__((pure))
-+#else
-+# define av_pure
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 6) || defined(__clang__)
-+# define av_const __attribute__((const))
-+#else
-+# define av_const
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3) || defined(__clang__)
-+# define av_cold __attribute__((cold))
-+#else
-+# define av_cold
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 1) && !defined(__llvm__)
-+# define av_flatten __attribute__((flatten))
-+#else
-+# define av_flatten
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define attribute_deprecated __attribute__((deprecated))
-+#elif defined(_MSC_VER)
-+# define attribute_deprecated __declspec(deprecated)
-+#else
-+# define attribute_deprecated
-+#endif
-+
-+/**
-+ * Disable warnings about deprecated features
-+ * This is useful for sections of code kept for backward compatibility and
-+ * scheduled for removal.
-+ */
-+#ifndef AV_NOWARN_DEPRECATED
-+# if AV_GCC_VERSION_AT_LEAST(4, 6)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ _Pragma("GCC diagnostic push") \
-+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
-+ code _Pragma("GCC diagnostic pop")
-+# elif defined(_MSC_VER)
-+# define AV_NOWARN_DEPRECATED(code) \
-+ __pragma(warning(push)) __pragma(warning(disable : 4996)) code; \
-+ __pragma(warning(pop))
-+# else
-+# define AV_NOWARN_DEPRECATED(code) code
-+# endif
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_unused __attribute__((unused))
-+#else
-+# define av_unused
-+#endif
-+
-+/**
-+ * Mark a variable as used and prevent the compiler from optimizing it
-+ * away. This is useful for variables accessed only from inline
-+ * assembler without the compiler being aware.
-+ */
-+#if AV_GCC_VERSION_AT_LEAST(3, 1) || defined(__clang__)
-+# define av_used __attribute__((used))
-+#else
-+# define av_used
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 3) || defined(__clang__)
-+# define av_alias __attribute__((may_alias))
-+#else
-+# define av_alias
-+#endif
-+
-+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
-+# define av_uninit(x) x = x
-+#else
-+# define av_uninit(x) x
-+#endif
-+
-+#if defined(__GNUC__) || defined(__clang__)
-+# define av_builtin_constant_p __builtin_constant_p
-+# define av_printf_format(fmtpos, attrpos) \
-+ __attribute__((__format__(__printf__, fmtpos, attrpos)))
-+#else
-+# define av_builtin_constant_p(x) 0
-+# define av_printf_format(fmtpos, attrpos)
-+#endif
-+
-+#if AV_GCC_VERSION_AT_LEAST(2, 5) || defined(__clang__)
-+# define av_noreturn __attribute__((noreturn))
-+#else
-+# define av_noreturn
-+#endif
-+
-+#endif /* AVUTIL_ATTRIBUTES_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avconfig.h
-@@ -0,0 +1,6 @@
-+/* Generated by ffmpeg configure */
-+#ifndef AVUTIL_AVCONFIG_H
-+#define AVUTIL_AVCONFIG_H
-+#define AV_HAVE_BIGENDIAN 0
-+#define AV_HAVE_FAST_UNALIGNED 1
-+#endif /* AVUTIL_AVCONFIG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/avutil.h
-@@ -0,0 +1,366 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_AVUTIL_H
-+#define AVUTIL_AVUTIL_H
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Convenience header that includes @ref lavu "libavutil"'s core.
-+ */
-+
-+/**
-+ * @mainpage
-+ *
-+ * @section ffmpeg_intro Introduction
-+ *
-+ * This document describes the usage of the different libraries
-+ * provided by FFmpeg.
-+ *
-+ * @li @ref libavc "libavcodec" encoding/decoding library
-+ * @li @ref lavfi "libavfilter" graph-based frame editing library
-+ * @li @ref libavf "libavformat" I/O and muxing/demuxing library
-+ * @li @ref lavd "libavdevice" special devices muxing/demuxing library
-+ * @li @ref lavu "libavutil" common utility library
-+ * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
-+ * @li @ref lpp "libpostproc" post processing library
-+ * @li @ref libsws "libswscale" color conversion and scaling library
-+ *
-+ * @section ffmpeg_versioning Versioning and compatibility
-+ *
-+ * Each of the FFmpeg libraries contains a version.h header, which defines a
-+ * major, minor and micro version number with the
-+ * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
-+ * number is incremented with backward incompatible changes - e.g. removing
-+ * parts of the public API, reordering public struct members, etc. The minor
-+ * version number is incremented for backward compatible API changes or major
-+ * new features - e.g. adding a new public function or a new decoder. The micro
-+ * version number is incremented for smaller changes that a calling program
-+ * might still want to check for - e.g. changing behavior in a previously
-+ * unspecified situation.
-+ *
-+ * FFmpeg guarantees backward API and ABI compatibility for each library as long
-+ * as its major version number is unchanged. This means that no public symbols
-+ * will be removed or renamed. Types and names of the public struct members and
-+ * values of public macros and enums will remain the same (unless they were
-+ * explicitly declared as not part of the public API). Documented behavior will
-+ * not change.
-+ *
-+ * In other words, any correct program that works with a given FFmpeg snapshot
-+ * should work just as well without any changes with any later snapshot with the
-+ * same major versions. This applies to both rebuilding the program against new
-+ * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
-+ * links against.
-+ *
-+ * However, new public symbols may be added and new members may be appended to
-+ * public structs whose size is not part of public ABI (most public structs in
-+ * FFmpeg). New macros and enum values may be added. Behavior in undocumented
-+ * situations may change slightly (and be documented). All those are accompanied
-+ * by an entry in doc/APIchanges and incrementing either the minor or micro
-+ * version number.
-+ */
-+
-+/**
-+ * @defgroup lavu libavutil
-+ * Common code shared across all FFmpeg libraries.
-+ *
-+ * @note
-+ * libavutil is designed to be modular. In most cases, in order to use the
-+ * functions provided by one component of libavutil you must explicitly include
-+ * the specific header containing that feature. If you are only using
-+ * media-related components, you could simply include libavutil/avutil.h, which
-+ * brings in most of the "core" components.
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_crypto Crypto and Hashing
-+ *
-+ * @{
-+ * @}
-+ *
-+ * @defgroup lavu_math Mathematics
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_string String Manipulation
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_mem Memory Management
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_data Data Structures
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_video Video related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_audio Audio related
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_error Error Codes
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_log Logging Facility
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup lavu_misc Other
-+ *
-+ * @{
-+ *
-+ * @defgroup preproc_misc Preprocessor String Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ *
-+ * @defgroup version_utils Library Version Macros
-+ *
-+ * @{
-+ *
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_ver
-+ * @{
-+ */
-+
-+/**
-+ * Return the LIBAVUTIL_VERSION_INT constant.
-+ */
-+unsigned avutil_version(void);
-+
-+/**
-+ * Return an informative version string. This usually is the actual release
-+ * version number or a git commit description. This string has no fixed format
-+ * and can change any time. It should never be parsed by code.
-+ */
-+const char* av_version_info(void);
-+
-+/**
-+ * Return the libavutil build-time configuration.
-+ */
-+const char* avutil_configuration(void);
-+
-+/**
-+ * Return the libavutil license.
-+ */
-+const char* avutil_license(void);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @addtogroup lavu_media Media Type
-+ * @brief Media Type
-+ */
-+
-+enum AVMediaType {
-+ AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA
-+ AVMEDIA_TYPE_VIDEO,
-+ AVMEDIA_TYPE_AUDIO,
-+ AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous
-+ AVMEDIA_TYPE_SUBTITLE,
-+ AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse
-+ AVMEDIA_TYPE_NB
-+};
-+
-+/**
-+ * Return a string describing the media_type enum, NULL if media_type
-+ * is unknown.
-+ */
-+const char* av_get_media_type_string(enum AVMediaType media_type);
-+
-+/**
-+ * @defgroup lavu_const Constants
-+ * @{
-+ *
-+ * @defgroup lavu_enc Encoding specific
-+ *
-+ * @note those definition should move to avcodec
-+ * @{
-+ */
-+
-+#define FF_LAMBDA_SHIFT 7
-+#define FF_LAMBDA_SCALE (1 << FF_LAMBDA_SHIFT)
-+#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-+#define FF_LAMBDA_MAX (256 * 128 - 1)
-+
-+#define FF_QUALITY_SCALE FF_LAMBDA_SCALE // FIXME maybe remove
-+
-+/**
-+ * @}
-+ * @defgroup lavu_time Timestamp specific
-+ *
-+ * FFmpeg internal timebase and timestamp definitions
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * @brief Undefined timestamp value
-+ *
-+ * Usually reported by demuxer that work on containers that do not provide
-+ * either pts or dts.
-+ */
-+
-+#define AV_NOPTS_VALUE ((int64_t)UINT64_C(0x8000000000000000))
-+
-+/**
-+ * Internal time base represented as integer
-+ */
-+
-+#define AV_TIME_BASE 1000000
-+
-+/**
-+ * Internal time base represented as fractional value
-+ */
-+
-+#define AV_TIME_BASE_Q \
-+ (AVRational) { 1, AV_TIME_BASE }
-+
-+/**
-+ * @}
-+ * @}
-+ * @defgroup lavu_picture Image related
-+ *
-+ * AVPicture types, pixel formats and basic image planes manipulation.
-+ *
-+ * @{
-+ */
-+
-+enum AVPictureType {
-+ AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-+ AV_PICTURE_TYPE_I, ///< Intra
-+ AV_PICTURE_TYPE_P, ///< Predicted
-+ AV_PICTURE_TYPE_B, ///< Bi-dir predicted
-+ AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4
-+ AV_PICTURE_TYPE_SI, ///< Switching Intra
-+ AV_PICTURE_TYPE_SP, ///< Switching Predicted
-+ AV_PICTURE_TYPE_BI, ///< BI type
-+};
-+
-+/**
-+ * Return a single letter to describe the given picture type
-+ * pict_type.
-+ *
-+ * @param[in] pict_type the picture type @return a single character
-+ * representing the picture type, '?' if pict_type is unknown
-+ */
-+char av_get_picture_type_char(enum AVPictureType pict_type);
-+
-+/**
-+ * @}
-+ */
-+
-+#include "common.h"
-+#include "error.h"
-+#include "rational.h"
-+#include "version.h"
-+#include "macros.h"
-+#include "mathematics.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+/**
-+ * Return x default pointer in case p is NULL.
-+ */
-+static inline void* av_x_if_null(const void* p, const void* x) {
-+ return (void*)(intptr_t)(p ? p : x);
-+}
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param elsize size in bytes of each list element (only 1, 2, 4 or 8)
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+unsigned av_int_list_length_for_size(unsigned elsize, const void* list,
-+ uint64_t term) av_pure;
-+
-+/**
-+ * Compute the length of an integer list.
-+ *
-+ * @param term list terminator (usually 0 or -1)
-+ * @param list pointer to the list
-+ * @return length of the list, in elements, not counting the terminator
-+ */
-+#define av_int_list_length(list, term) \
-+ av_int_list_length_for_size(sizeof(*(list)), list, term)
-+
-+/**
-+ * Open a file using a UTF-8 filename.
-+ * The API of this function matches POSIX fopen(), errors are returned through
-+ * errno.
-+ */
-+FILE* av_fopen_utf8(const char* path, const char* mode);
-+
-+/**
-+ * Return the fractional representation of the internal time base.
-+ */
-+AVRational av_get_time_base_q(void);
-+
-+#define AV_FOURCC_MAX_STRING_SIZE 32
-+
-+#define av_fourcc2str(fourcc) \
-+ av_fourcc_make_string((char[AV_FOURCC_MAX_STRING_SIZE]){0}, fourcc)
-+
-+/**
-+ * Fill the provided buffer with a string containing a FourCC (four-character
-+ * code) representation.
-+ *
-+ * @param buf a buffer with size in bytes of at least
-+ * AV_FOURCC_MAX_STRING_SIZE
-+ * @param fourcc the fourcc to represent
-+ * @return the buffer in input
-+ */
-+char* av_fourcc_make_string(char* buf, uint32_t fourcc);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_AVUTIL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/buffer.h
-@@ -0,0 +1,324 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_buffer
-+ * refcounted data buffer API
-+ */
-+
-+#ifndef AVUTIL_BUFFER_H
-+#define AVUTIL_BUFFER_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+/**
-+ * @defgroup lavu_buffer AVBuffer
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBuffer is an API for reference-counted data buffers.
-+ *
-+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
-+ * represents the data buffer itself; it is opaque and not meant to be accessed
-+ * by the caller directly, but only through AVBufferRef. However, the caller may
-+ * e.g. compare two AVBuffer pointers to check whether two different references
-+ * are describing the same data buffer. AVBufferRef represents a single
-+ * reference to an AVBuffer and it is the object that may be manipulated by the
-+ * caller directly.
-+ *
-+ * There are two functions provided for creating a new AVBuffer with a single
-+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
-+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
-+ * reference, additional references may be created with av_buffer_ref().
-+ * Use av_buffer_unref() to free a reference (this will automatically free the
-+ * data once all the references are freed).
-+ *
-+ * The convention throughout this API and the rest of FFmpeg is such that the
-+ * buffer is considered writable if there exists only one reference to it (and
-+ * it has not been marked as read-only). The av_buffer_is_writable() function is
-+ * provided to check whether this is true and av_buffer_make_writable() will
-+ * automatically create a new writable buffer when necessary.
-+ * Of course nothing prevents the calling code from violating this convention,
-+ * however that is safe only when all the existing references are under its
-+ * control.
-+ *
-+ * @note Referencing and unreferencing the buffers is thread-safe and thus
-+ * may be done from multiple threads simultaneously without any need for
-+ * additional locking.
-+ *
-+ * @note Two different references to the same buffer can point to different
-+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
-+ */
-+
-+/**
-+ * A reference counted buffer type. It is opaque and is meant to be used through
-+ * references (AVBufferRef).
-+ */
-+typedef struct AVBuffer AVBuffer;
-+
-+/**
-+ * A reference to a data buffer.
-+ *
-+ * The size of this struct is not a part of the public ABI and it is not meant
-+ * to be allocated directly.
-+ */
-+typedef struct AVBufferRef {
-+ AVBuffer* buffer;
-+
-+ /**
-+ * The data buffer. It is considered writable if and only if
-+ * this is the only reference to the buffer, in which case
-+ * av_buffer_is_writable() returns 1.
-+ */
-+ uint8_t* data;
-+ /**
-+ * Size of data in bytes.
-+ */
-+ size_t size;
-+} AVBufferRef;
-+
-+/**
-+ * Allocate an AVBuffer of the given size using av_malloc().
-+ *
-+ * @return an AVBufferRef of given size or NULL when out of memory
-+ */
-+AVBufferRef* av_buffer_alloc(size_t size);
-+
-+/**
-+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
-+ * to zero.
-+ */
-+AVBufferRef* av_buffer_allocz(size_t size);
-+
-+/**
-+ * Always treat the buffer as read-only, even when it has only one
-+ * reference.
-+ */
-+#define AV_BUFFER_FLAG_READONLY (1 << 0)
-+
-+/**
-+ * Create an AVBuffer from an existing array.
-+ *
-+ * If this function is successful, data is owned by the AVBuffer. The caller may
-+ * only access data through the returned AVBufferRef and references derived from
-+ * it.
-+ * If this function fails, data is left untouched.
-+ * @param data data array
-+ * @param size size of data in bytes
-+ * @param free a callback for freeing this buffer's data
-+ * @param opaque parameter to be got for processing or passed to free
-+ * @param flags a combination of AV_BUFFER_FLAG_*
-+ *
-+ * @return an AVBufferRef referring to data on success, NULL on failure.
-+ */
-+AVBufferRef* av_buffer_create(uint8_t* data, size_t size,
-+ void (*free)(void* opaque, uint8_t* data),
-+ void* opaque, int flags);
-+
-+/**
-+ * Default free callback, which calls av_free() on the buffer data.
-+ * This function is meant to be passed to av_buffer_create(), not called
-+ * directly.
-+ */
-+void av_buffer_default_free(void* opaque, uint8_t* data);
-+
-+/**
-+ * Create a new reference to an AVBuffer.
-+ *
-+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
-+ * failure.
-+ */
-+AVBufferRef* av_buffer_ref(const AVBufferRef* buf);
-+
-+/**
-+ * Free a given reference and automatically free the buffer if there are no more
-+ * references to it.
-+ *
-+ * @param buf the reference to be freed. The pointer is set to NULL on return.
-+ */
-+void av_buffer_unref(AVBufferRef** buf);
-+
-+/**
-+ * @return 1 if the caller may write to the data referred to by buf (which is
-+ * true if and only if buf is the only reference to the underlying AVBuffer).
-+ * Return 0 otherwise.
-+ * A positive answer is valid until av_buffer_ref() is called on buf.
-+ */
-+int av_buffer_is_writable(const AVBufferRef* buf);
-+
-+/**
-+ * @return the opaque parameter set by av_buffer_create.
-+ */
-+void* av_buffer_get_opaque(const AVBufferRef* buf);
-+
-+int av_buffer_get_ref_count(const AVBufferRef* buf);
-+
-+/**
-+ * Create a writable reference from a given buffer reference, avoiding data copy
-+ * if possible.
-+ *
-+ * @param buf buffer reference to make writable. On success, buf is either left
-+ * untouched, or it is unreferenced and a new writable AVBufferRef is
-+ * written in its place. On failure, buf is left untouched.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ */
-+int av_buffer_make_writable(AVBufferRef** buf);
-+
-+/**
-+ * Reallocate a given buffer.
-+ *
-+ * @param buf a buffer reference to reallocate. On success, buf will be
-+ * unreferenced and a new reference with the required size will be
-+ * written in its place. On failure buf will be left untouched. *buf
-+ * may be NULL, then a new buffer is allocated.
-+ * @param size required new buffer size.
-+ * @return 0 on success, a negative AVERROR on failure.
-+ *
-+ * @note the buffer is actually reallocated with av_realloc() only if it was
-+ * initially allocated through av_buffer_realloc(NULL) and there is only one
-+ * reference to it (i.e. the one passed to this function). In all other cases
-+ * a new buffer is allocated and the data is copied.
-+ */
-+int av_buffer_realloc(AVBufferRef** buf, size_t size);
-+
-+/**
-+ * Ensure dst refers to the same data as src.
-+ *
-+ * When *dst is already equivalent to src, do nothing. Otherwise unreference dst
-+ * and replace it with a new reference to src.
-+ *
-+ * @param dst Pointer to either a valid buffer reference or NULL. On success,
-+ * this will point to a buffer reference equivalent to src. On
-+ * failure, dst will be left untouched.
-+ * @param src A buffer reference to replace dst with. May be NULL, then this
-+ * function is equivalent to av_buffer_unref(dst).
-+ * @return 0 on success
-+ * AVERROR(ENOMEM) on memory allocation failure.
-+ */
-+int av_buffer_replace(AVBufferRef** dst, const AVBufferRef* src);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_bufferpool AVBufferPool
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
-+ *
-+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
-+ * meant to solve this in cases when the caller needs a set of buffers of the
-+ * same size (the most obvious use case being buffers for raw video or audio
-+ * frames).
-+ *
-+ * At the beginning, the user must call av_buffer_pool_init() to create the
-+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
-+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
-+ * reference works in all aspects the same way as the one created by
-+ * av_buffer_alloc(). However, when the last reference to this buffer is
-+ * unreferenced, it is returned to the pool instead of being freed and will be
-+ * reused for subsequent av_buffer_pool_get() calls.
-+ *
-+ * When the caller is done with the pool and no longer needs to allocate any new
-+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
-+ * Once all the buffers are released, it will automatically be freed.
-+ *
-+ * Allocating and releasing buffers with this API is thread-safe as long as
-+ * either the default alloc callback is used, or the user-supplied one is
-+ * thread-safe.
-+ */
-+
-+/**
-+ * The buffer pool. This structure is opaque and not meant to be accessed
-+ * directly. It is allocated with av_buffer_pool_init() and freed with
-+ * av_buffer_pool_uninit().
-+ */
-+typedef struct AVBufferPool AVBufferPool;
-+
-+/**
-+ * Allocate and initialize a buffer pool.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be used
-+ * (av_buffer_alloc()).
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init(size_t size,
-+ AVBufferRef* (*alloc)(size_t size));
-+
-+/**
-+ * Allocate and initialize a buffer pool with a more complex allocator.
-+ *
-+ * @param size size of each buffer in this pool
-+ * @param opaque arbitrary user data used by the allocator
-+ * @param alloc a function that will be used to allocate new buffers when the
-+ * pool is empty. May be NULL, then the default allocator will be
-+ * used (av_buffer_alloc()).
-+ * @param pool_free a function that will be called immediately before the pool
-+ * is freed. I.e. after av_buffer_pool_uninit() is called
-+ * by the caller and all the frames are returned to the pool
-+ * and freed. It is intended to uninitialize the user opaque
-+ * data. May be NULL.
-+ * @return newly created buffer pool on success, NULL on error.
-+ */
-+AVBufferPool* av_buffer_pool_init2(size_t size, void* opaque,
-+ AVBufferRef* (*alloc)(void* opaque,
-+ size_t size),
-+ void (*pool_free)(void* opaque));
-+
-+/**
-+ * Mark the pool as being available for freeing. It will actually be freed only
-+ * once all the allocated buffers associated with the pool are released. Thus it
-+ * is safe to call this function while some of the allocated buffers are still
-+ * in use.
-+ *
-+ * @param pool pointer to the pool to be freed. It will be set to NULL.
-+ */
-+void av_buffer_pool_uninit(AVBufferPool** pool);
-+
-+/**
-+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
-+ * This function may be called simultaneously from multiple threads.
-+ *
-+ * @return a reference to the new buffer on success, NULL on error.
-+ */
-+AVBufferRef* av_buffer_pool_get(AVBufferPool* pool);
-+
-+/**
-+ * Query the original opaque parameter of an allocated buffer in the pool.
-+ *
-+ * @param ref a buffer reference to a buffer returned by av_buffer_pool_get.
-+ * @return the opaque parameter set by the buffer allocator function of the
-+ * buffer pool.
-+ *
-+ * @note the opaque parameter of ref is used by the buffer pool implementation,
-+ * therefore you have to use this function to access the original opaque
-+ * parameter of an allocated buffer.
-+ */
-+void* av_buffer_pool_buffer_get_opaque(const AVBufferRef* ref);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_BUFFER_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/channel_layout.h
-@@ -0,0 +1,270 @@
-+/*
-+ * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ * Copyright (c) 2008 Peter Ross
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CHANNEL_LAYOUT_H
-+#define AVUTIL_CHANNEL_LAYOUT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @file
-+ * audio channel layout utility functions
-+ */
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ */
-+
-+/**
-+ * @defgroup channel_masks Audio channel masks
-+ *
-+ * A channel layout is a 64-bits integer with a bit set for every channel.
-+ * The number of bits set must be equal to the number of channels.
-+ * The value 0 means that the channel layout is not known.
-+ * @note this data structure is not powerful enough to handle channels
-+ * combinations that have the same channel multiple times, such as
-+ * dual-mono.
-+ *
-+ * @{
-+ */
-+#define AV_CH_FRONT_LEFT 0x00000001
-+#define AV_CH_FRONT_RIGHT 0x00000002
-+#define AV_CH_FRONT_CENTER 0x00000004
-+#define AV_CH_LOW_FREQUENCY 0x00000008
-+#define AV_CH_BACK_LEFT 0x00000010
-+#define AV_CH_BACK_RIGHT 0x00000020
-+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
-+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
-+#define AV_CH_BACK_CENTER 0x00000100
-+#define AV_CH_SIDE_LEFT 0x00000200
-+#define AV_CH_SIDE_RIGHT 0x00000400
-+#define AV_CH_TOP_CENTER 0x00000800
-+#define AV_CH_TOP_FRONT_LEFT 0x00001000
-+#define AV_CH_TOP_FRONT_CENTER 0x00002000
-+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
-+#define AV_CH_TOP_BACK_LEFT 0x00008000
-+#define AV_CH_TOP_BACK_CENTER 0x00010000
-+#define AV_CH_TOP_BACK_RIGHT 0x00020000
-+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
-+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
-+#define AV_CH_WIDE_LEFT 0x0000000080000000ULL
-+#define AV_CH_WIDE_RIGHT 0x0000000100000000ULL
-+#define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL
-+#define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL
-+#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL
-+#define AV_CH_TOP_SIDE_LEFT 0x0000001000000000ULL
-+#define AV_CH_TOP_SIDE_RIGHT 0x0000002000000000ULL
-+#define AV_CH_BOTTOM_FRONT_CENTER 0x0000004000000000ULL
-+#define AV_CH_BOTTOM_FRONT_LEFT 0x0000008000000000ULL
-+#define AV_CH_BOTTOM_FRONT_RIGHT 0x0000010000000000ULL
-+
-+/** Channel mask value used for AVCodecContext.request_channel_layout
-+ to indicate that the user requests the channel order of the decoder output
-+ to be the native codec channel order. */
-+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000ULL
-+
-+/**
-+ * @}
-+ * @defgroup channel_mask_c Audio channel layouts
-+ * @{
-+ * */
-+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_2POINT1 (AV_CH_LAYOUT_STEREO | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER)
-+#define AV_CH_LAYOUT_3POINT1 (AV_CH_LAYOUT_SURROUND | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_4POINT1 (AV_CH_LAYOUT_4POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_2_2 \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_QUAD \
-+ (AV_CH_LAYOUT_STEREO | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT0 \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0 | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_5POINT0_BACK \
-+ (AV_CH_LAYOUT_SURROUND | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_5POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_6POINT0 (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT0_FRONT \
-+ (AV_CH_LAYOUT_2_2 | AV_CH_FRONT_LEFT_OF_CENTER | AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_HEXAGONAL (AV_CH_LAYOUT_5POINT0_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1 (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_BACK_CENTER)
-+#define AV_CH_LAYOUT_6POINT1_FRONT \
-+ (AV_CH_LAYOUT_6POINT0_FRONT | AV_CH_LOW_FREQUENCY)
-+#define AV_CH_LAYOUT_7POINT0 \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT0_FRONT \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1 \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_7POINT1_WIDE \
-+ (AV_CH_LAYOUT_5POINT1 | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER)
-+#define AV_CH_LAYOUT_OCTAGONAL \
-+ (AV_CH_LAYOUT_5POINT0 | AV_CH_BACK_LEFT | AV_CH_BACK_CENTER | \
-+ AV_CH_BACK_RIGHT)
-+#define AV_CH_LAYOUT_HEXADECAGONAL \
-+ (AV_CH_LAYOUT_OCTAGONAL | AV_CH_WIDE_LEFT | AV_CH_WIDE_RIGHT | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_BACK_CENTER | \
-+ AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT)
-+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT | AV_CH_STEREO_RIGHT)
-+#define AV_CH_LAYOUT_22POINT2 \
-+ (AV_CH_LAYOUT_5POINT1_BACK | AV_CH_FRONT_LEFT_OF_CENTER | \
-+ AV_CH_FRONT_RIGHT_OF_CENTER | AV_CH_BACK_CENTER | AV_CH_LOW_FREQUENCY_2 | \
-+ AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT | AV_CH_TOP_FRONT_LEFT | \
-+ AV_CH_TOP_FRONT_RIGHT | AV_CH_TOP_FRONT_CENTER | AV_CH_TOP_CENTER | \
-+ AV_CH_TOP_BACK_LEFT | AV_CH_TOP_BACK_RIGHT | AV_CH_TOP_SIDE_LEFT | \
-+ AV_CH_TOP_SIDE_RIGHT | AV_CH_TOP_BACK_CENTER | AV_CH_BOTTOM_FRONT_CENTER | \
-+ AV_CH_BOTTOM_FRONT_LEFT | AV_CH_BOTTOM_FRONT_RIGHT)
-+
-+enum AVMatrixEncoding {
-+ AV_MATRIX_ENCODING_NONE,
-+ AV_MATRIX_ENCODING_DOLBY,
-+ AV_MATRIX_ENCODING_DPLII,
-+ AV_MATRIX_ENCODING_DPLIIX,
-+ AV_MATRIX_ENCODING_DPLIIZ,
-+ AV_MATRIX_ENCODING_DOLBYEX,
-+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
-+ AV_MATRIX_ENCODING_NB
-+};
-+
-+/**
-+ * Return a channel layout id that matches name, or 0 if no match is found.
-+ *
-+ * name can be one or several of the following notations,
-+ * separated by '+' or '|':
-+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
-+ * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
-+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
-+ * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
-+ * - a number of channels, in decimal, followed by 'c', yielding
-+ * the default channel layout for that number of channels (@see
-+ * av_get_default_channel_layout);
-+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
-+ * AV_CH_* macros).
-+ *
-+ * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
-+ */
-+uint64_t av_get_channel_layout(const char* name);
-+
-+/**
-+ * Return a channel layout and the number of channels based on the specified
-+ * name.
-+ *
-+ * This function is similar to (@see av_get_channel_layout), but can also parse
-+ * unknown channel layout specifications.
-+ *
-+ * @param[in] name channel layout specification string
-+ * @param[out] channel_layout parsed channel layout (0 if unknown)
-+ * @param[out] nb_channels number of channels
-+ *
-+ * @return 0 on success, AVERROR(EINVAL) if the parsing fails.
-+ */
-+int av_get_extended_channel_layout(const char* name, uint64_t* channel_layout,
-+ int* nb_channels);
-+
-+/**
-+ * Return a description of a channel layout.
-+ * If nb_channels is <= 0, it is guessed from the channel_layout.
-+ *
-+ * @param buf put here the string containing the channel layout
-+ * @param buf_size size in bytes of the buffer
-+ */
-+void av_get_channel_layout_string(char* buf, int buf_size, int nb_channels,
-+ uint64_t channel_layout);
-+
-+struct AVBPrint;
-+/**
-+ * Append a description of a channel layout to a bprint buffer.
-+ */
-+void av_bprint_channel_layout(struct AVBPrint* bp, int nb_channels,
-+ uint64_t channel_layout);
-+
-+/**
-+ * Return the number of channels in the channel layout.
-+ */
-+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-+
-+/**
-+ * Return default channel layout for a given number of channels.
-+ */
-+int64_t av_get_default_channel_layout(int nb_channels);
-+
-+/**
-+ * Get the index of a channel in channel_layout.
-+ *
-+ * @param channel a channel layout describing exactly one channel which must be
-+ * present in channel_layout.
-+ *
-+ * @return index of channel in channel_layout on success, a negative AVERROR
-+ * on error.
-+ */
-+int av_get_channel_layout_channel_index(uint64_t channel_layout,
-+ uint64_t channel);
-+
-+/**
-+ * Get the channel with the given index in channel_layout.
-+ */
-+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-+
-+/**
-+ * Get the name of a given channel.
-+ *
-+ * @return channel name on success, NULL on error.
-+ */
-+const char* av_get_channel_name(uint64_t channel);
-+
-+/**
-+ * Get the description of a given channel.
-+ *
-+ * @param channel a channel layout with a single channel
-+ * @return channel description on success, NULL on error
-+ */
-+const char* av_get_channel_description(uint64_t channel);
-+
-+/**
-+ * Get the value and name of a standard channel layout.
-+ *
-+ * @param[in] index index in an internal list, starting at 0
-+ * @param[out] layout channel layout mask
-+ * @param[out] name name of the layout
-+ * @return 0 if the layout exists,
-+ * <0 if index is beyond the limits
-+ */
-+int av_get_standard_channel_layout(unsigned index, uint64_t* layout,
-+ const char** name);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_CHANNEL_LAYOUT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/common.h
-@@ -0,0 +1,590 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * common internal and external API header
-+ */
-+
-+#ifndef AVUTIL_COMMON_H
-+#define AVUTIL_COMMON_H
-+
-+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && \
-+ !defined(UINT64_C)
-+# error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-+#endif
-+
-+#include <errno.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+#include <math.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "attributes.h"
-+#include "macros.h"
-+#include "version.h"
-+
-+// rounded division & shift
-+#define RSHIFT(a, b) \
-+ ((a) > 0 ? ((a) + ((1 << (b)) >> 1)) >> (b) \
-+ : ((a) + ((1 << (b)) >> 1) - 1) >> (b))
-+/* assume b>0 */
-+#define ROUNDED_DIV(a, b) \
-+ (((a) >= 0 ? (a) + ((b) >> 1) : (a) - ((b) >> 1)) / (b))
-+/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
-+#define AV_CEIL_RSHIFT(a, b) \
-+ (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) : ((a) + (1 << (b)) - 1) >> (b))
-+/* Backwards compat. */
-+#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
-+
-+#define FFUDIV(a, b) (((a) > 0 ? (a) : (a) - (b) + 1) / (b))
-+#define FFUMOD(a, b) ((a) - (b)*FFUDIV(a, b))
-+
-+/**
-+ * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as
-+ * they are not representable as absolute values of their type. This is the same
-+ * as with *abs()
-+ * @see FFNABS()
-+ */
-+#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-+#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-+
-+/**
-+ * Negative Absolute value.
-+ * this works for all integers of all types.
-+ * As with many macros, this evaluates its argument twice, it thus must not have
-+ * a sideeffect, that is FFNABS(x++) has undefined behavior.
-+ */
-+#define FFNABS(a) ((a) <= 0 ? (a) : (-(a)))
-+
-+/**
-+ * Unsigned Absolute value.
-+ * This takes the absolute value of a signed int and returns it as a unsigned.
-+ * This also works with INT_MIN which would otherwise not be representable
-+ * As with many macros, this evaluates its argument twice.
-+ */
-+#define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a))
-+#define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a))
-+
-+/* misc math functions */
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "config.h"
-+# include "intmath.h"
-+#endif
-+
-+#ifndef av_ceil_log2
-+# define av_ceil_log2 av_ceil_log2_c
-+#endif
-+#ifndef av_clip
-+# define av_clip av_clip_c
-+#endif
-+#ifndef av_clip64
-+# define av_clip64 av_clip64_c
-+#endif
-+#ifndef av_clip_uint8
-+# define av_clip_uint8 av_clip_uint8_c
-+#endif
-+#ifndef av_clip_int8
-+# define av_clip_int8 av_clip_int8_c
-+#endif
-+#ifndef av_clip_uint16
-+# define av_clip_uint16 av_clip_uint16_c
-+#endif
-+#ifndef av_clip_int16
-+# define av_clip_int16 av_clip_int16_c
-+#endif
-+#ifndef av_clipl_int32
-+# define av_clipl_int32 av_clipl_int32_c
-+#endif
-+#ifndef av_clip_intp2
-+# define av_clip_intp2 av_clip_intp2_c
-+#endif
-+#ifndef av_clip_uintp2
-+# define av_clip_uintp2 av_clip_uintp2_c
-+#endif
-+#ifndef av_mod_uintp2
-+# define av_mod_uintp2 av_mod_uintp2_c
-+#endif
-+#ifndef av_sat_add32
-+# define av_sat_add32 av_sat_add32_c
-+#endif
-+#ifndef av_sat_dadd32
-+# define av_sat_dadd32 av_sat_dadd32_c
-+#endif
-+#ifndef av_sat_sub32
-+# define av_sat_sub32 av_sat_sub32_c
-+#endif
-+#ifndef av_sat_dsub32
-+# define av_sat_dsub32 av_sat_dsub32_c
-+#endif
-+#ifndef av_sat_add64
-+# define av_sat_add64 av_sat_add64_c
-+#endif
-+#ifndef av_sat_sub64
-+# define av_sat_sub64 av_sat_sub64_c
-+#endif
-+#ifndef av_clipf
-+# define av_clipf av_clipf_c
-+#endif
-+#ifndef av_clipd
-+# define av_clipd av_clipd_c
-+#endif
-+#ifndef av_popcount
-+# define av_popcount av_popcount_c
-+#endif
-+#ifndef av_popcount64
-+# define av_popcount64 av_popcount64_c
-+#endif
-+#ifndef av_parity
-+# define av_parity av_parity_c
-+#endif
-+
-+#ifndef av_log2
-+av_const int av_log2(unsigned v);
-+#endif
-+
-+#ifndef av_log2_16bit
-+av_const int av_log2_16bit(unsigned v);
-+#endif
-+
-+/**
-+ * Clip a signed integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_c(int a, int amin, int amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64bit integer value into the amin-amax range.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin,
-+ int64_t amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ if (a < amin)
-+ return amin;
-+ else if (a > amax)
-+ return amax;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-255 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint8_t av_clip_uint8_c(int a) {
-+ if (a & (~0xFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -128,127 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int8_t av_clip_int8_c(int a) {
-+ if ((a + 0x80U) & ~0xFF)
-+ return (a >> 31) ^ 0x7F;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the 0-65535 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const uint16_t av_clip_uint16_c(int a) {
-+ if (a & (~0xFFFF))
-+ return (~a) >> 31;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer value into the -32768,32767 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int16_t av_clip_int16_c(int a) {
-+ if ((a + 0x8000U) & ~0xFFFF)
-+ return (a >> 31) ^ 0x7FFF;
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
-+ * @param a value to clip
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a) {
-+ if ((a + 0x80000000u) & ~UINT64_C(0xFFFFFFFF))
-+ return (int32_t)((a >> 63) ^ 0x7FFFFFFF);
-+ else
-+ return (int32_t)a;
-+}
-+
-+/**
-+ * Clip a signed integer into the -(2^p),(2^p-1) range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const int av_clip_intp2_c(int a, int p) {
-+ if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
-+ return (a >> 31) ^ ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clip a signed integer to an unsigned power of two range.
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p) {
-+ if (a & ~((1 << p) - 1))
-+ return (~a) >> 31 & ((1 << p) - 1);
-+ else
-+ return a;
-+}
-+
-+/**
-+ * Clear high bits from an unsigned integer starting with specific bit position
-+ * @param a value to clip
-+ * @param p bit position to clip at
-+ * @return clipped value
-+ */
-+static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a,
-+ unsigned p) {
-+ return a & ((1U << p) - 1);
-+}
-+
-+/**
-+ * Add two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int av_sat_add32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a + b);
-+}
-+
-+/**
-+ * Add a doubled value to another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and added to a
-+ * @return sum sat(a + sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dadd32_c(int a, int b) {
-+ return av_sat_add32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Subtract two signed 32-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int av_sat_sub32_c(int a, int b) {
-+ return av_clipl_int32((int64_t)a - b);
-+}
-+
-+/**
-+ * Subtract a doubled value from another value with saturation at both stages.
-+ *
-+ * @param a first value
-+ * @param b value doubled and subtracted from a
-+ * @return difference sat(a - sat(2*b)) with signed saturation
-+ */
-+static av_always_inline int av_sat_dsub32_c(int a, int b) {
-+ return av_sat_sub32(a, av_sat_add32(b, b));
-+}
-+
-+/**
-+ * Add two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return sum with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_add64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_add_overflow)
-+ int64_t tmp;
-+ return !__builtin_add_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ int64_t s = a + (uint64_t)b;
-+ if ((int64_t)(a ^ b | ~s ^ b) >= 0) return INT64_MAX ^ (b >> 63);
-+ return s;
-+#endif
-+}
-+
-+/**
-+ * Subtract two signed 64-bit values with saturation.
-+ *
-+ * @param a one value
-+ * @param b another value
-+ * @return difference with signed saturation
-+ */
-+static av_always_inline int64_t av_sat_sub64_c(int64_t a, int64_t b) {
-+#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5, 1)) || \
-+ AV_HAS_BUILTIN(__builtin_sub_overflow)
-+ int64_t tmp;
-+ return !__builtin_sub_overflow(a, b, &tmp)
-+ ? tmp
-+ : (tmp < 0 ? INT64_MAX : INT64_MIN);
-+#else
-+ if (b <= 0 && a >= INT64_MAX + b) return INT64_MAX;
-+ if (b >= 0 && a <= INT64_MIN + b) return INT64_MIN;
-+ return a - b;
-+#endif
-+}
-+
-+/**
-+ * Clip a float value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const float av_clipf_c(float a, float amin,
-+ float amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/**
-+ * Clip a double value into the amin-amax range.
-+ * If a is nan or -inf amin will be returned.
-+ * If a is +inf amax will be returned.
-+ * @param a value to clip
-+ * @param amin minimum value of the clip range
-+ * @param amax maximum value of the clip range
-+ * @return clipped value
-+ */
-+static av_always_inline av_const double av_clipd_c(double a, double amin,
-+ double amax) {
-+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-+ if (amin > amax) abort();
-+#endif
-+ return FFMIN(FFMAX(a, amin), amax);
-+}
-+
-+/** Compute ceil(log2(x)).
-+ * @param x value used to compute ceil(log2(x))
-+ * @return computed ceiling of log2(x)
-+ */
-+static av_always_inline av_const int av_ceil_log2_c(int x) {
-+ return av_log2((x - 1U) << 1);
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount_c(uint32_t x) {
-+ x -= (x >> 1) & 0x55555555;
-+ x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-+ x = (x + (x >> 4)) & 0x0F0F0F0F;
-+ x += x >> 8;
-+ return (x + (x >> 16)) & 0x3F;
-+}
-+
-+/**
-+ * Count number of bits set to one in x
-+ * @param x value to count bits of
-+ * @return the number of bits set to one in x
-+ */
-+static av_always_inline av_const int av_popcount64_c(uint64_t x) {
-+ return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-+}
-+
-+static av_always_inline av_const int av_parity_c(uint32_t v) {
-+ return av_popcount(v) & 1;
-+}
-+
-+/**
-+ * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_BYTE Expression reading one byte from the input.
-+ * Evaluated up to 7 times (4 for the currently
-+ * assigned Unicode range). With a memory buffer
-+ * input, this could be *ptr++, or if you want to make sure
-+ * that *ptr stops at the end of a NULL terminated string then
-+ * *ptr ? *ptr++ : 0
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ *
-+ * @warning ERROR should not contain a loop control statement which
-+ * could interact with the internal while loop, and should force an
-+ * exit from the macro code (e.g. through a goto or a return) in order
-+ * to prevent undefined results.
-+ */
-+#define GET_UTF8(val, GET_BYTE, ERROR) \
-+ val = (GET_BYTE); \
-+ { \
-+ uint32_t top = (val & 128) >> 1; \
-+ if ((val & 0xc0) == 0x80 || val >= 0xFE) { \
-+ ERROR \
-+ } \
-+ while (val & top) { \
-+ unsigned int tmp = (GET_BYTE)-128; \
-+ if (tmp >> 6) { \
-+ ERROR \
-+ } \
-+ val = (val << 6) + tmp; \
-+ top <<= 5; \
-+ } \
-+ val &= (top << 1) - 1; \
-+ }
-+
-+/**
-+ * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
-+ *
-+ * @param val Output value, must be an lvalue of type uint32_t.
-+ * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
-+ * to native byte order. Evaluated one or two times.
-+ * @param ERROR Expression to be evaluated on invalid input,
-+ * typically a goto statement.
-+ */
-+#define GET_UTF16(val, GET_16BIT, ERROR) \
-+ val = (GET_16BIT); \
-+ { \
-+ unsigned int hi = val - 0xD800; \
-+ if (hi < 0x800) { \
-+ val = (GET_16BIT)-0xDC00; \
-+ if (val > 0x3FFU || hi > 0x3FFU) { \
-+ ERROR \
-+ } \
-+ val += (hi << 10) + 0x10000; \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF8(val, tmp, PUT_BYTE)
-+ * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes
-+ * long).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint8_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_BYTE.
-+ * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
-+ * It could be a function or a statement, and uses tmp as the input byte.
-+ * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
-+ * executed up to 4 times for values in the valid UTF-8 range and up to
-+ * 7 times in the general case, depending on the length of the converted
-+ * Unicode character.
-+ */
-+#define PUT_UTF8(val, tmp, PUT_BYTE) \
-+ { \
-+ int bytes, shift; \
-+ uint32_t in = val; \
-+ if (in < 0x80) { \
-+ tmp = in; \
-+ PUT_BYTE \
-+ } else { \
-+ bytes = (av_log2(in) + 4) / 5; \
-+ shift = (bytes - 1) * 6; \
-+ tmp = (256 - (256 >> bytes)) | (in >> shift); \
-+ PUT_BYTE \
-+ while (shift >= 6) { \
-+ shift -= 6; \
-+ tmp = 0x80 | ((in >> shift) & 0x3f); \
-+ PUT_BYTE \
-+ } \
-+ } \
-+ }
-+
-+/**
-+ * @def PUT_UTF16(val, tmp, PUT_16BIT)
-+ * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
-+ * @param val is an input-only argument and should be of type uint32_t. It holds
-+ * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
-+ * val is given as a function it is executed only once.
-+ * @param tmp is a temporary variable and should be of type uint16_t. It
-+ * represents an intermediate value during conversion that is to be
-+ * output by PUT_16BIT.
-+ * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
-+ * in desired endianness. It could be a function or a statement, and uses tmp
-+ * as the input byte. For example, PUT_BYTE could be "*output++ = tmp;"
-+ * PUT_BYTE will be executed 1 or 2 times depending on input character.
-+ */
-+#define PUT_UTF16(val, tmp, PUT_16BIT) \
-+ { \
-+ uint32_t in = val; \
-+ if (in < 0x10000) { \
-+ tmp = in; \
-+ PUT_16BIT \
-+ } else { \
-+ tmp = 0xD800 | ((in - 0x10000) >> 10); \
-+ PUT_16BIT \
-+ tmp = 0xDC00 | ((in - 0x10000) & 0x3FF); \
-+ PUT_16BIT \
-+ } \
-+ }
-+
-+#include "mem.h"
-+
-+#ifdef HAVE_AV_CONFIG_H
-+# include "internal.h"
-+#endif /* HAVE_AV_CONFIG_H */
-+
-+#endif /* AVUTIL_COMMON_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/cpu.h
-@@ -0,0 +1,138 @@
-+/*
-+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_CPU_H
-+#define AVUTIL_CPU_H
-+
-+#include <stddef.h>
-+
-+#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */
-+
-+/* lower 16 bits - CPU features */
-+#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
-+#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
-+#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
-+#define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
-+#define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
-+#define AV_CPU_FLAG_SSE2SLOW \
-+ 0x40000000 ///< SSE2 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
-+#define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
-+#define AV_CPU_FLAG_SSE3SLOW \
-+ 0x20000000 ///< SSE3 supported, but usually not faster
-+ ///< than regular MMX/SSE (e.g. Core1)
-+#define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
-+#define AV_CPU_FLAG_SSSE3SLOW \
-+ 0x4000000 ///< SSSE3 supported, but usually not faster
-+#define AV_CPU_FLAG_ATOM \
-+ 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
-+#define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
-+#define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions
-+#define AV_CPU_FLAG_AESNI 0x80000 ///< Advanced Encryption Standard functions
-+#define AV_CPU_FLAG_AVX \
-+ 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_AVXSLOW \
-+ 0x8000000 ///< AVX supported, but slow when using YMM registers (e.g.
-+ ///< Bulldozer)
-+#define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
-+#define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
-+#define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction
-+#define AV_CPU_FLAG_AVX2 \
-+ 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't
-+ ///< used
-+#define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions
-+#define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1
-+#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
-+#define AV_CPU_FLAG_AVX512 \
-+ 0x100000 ///< AVX-512 functions: requires OS support even if YMM/ZMM
-+ ///< registers aren't used
-+#define AV_CPU_FLAG_SLOW_GATHER 0x2000000 ///< CPU has slow gathers.
-+
-+#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
-+#define AV_CPU_FLAG_VSX 0x0002 ///< ISA 2.06
-+#define AV_CPU_FLAG_POWER8 0x0004 ///< ISA 2.07
-+
-+#define AV_CPU_FLAG_ARMV5TE (1 << 0)
-+#define AV_CPU_FLAG_ARMV6 (1 << 1)
-+#define AV_CPU_FLAG_ARMV6T2 (1 << 2)
-+#define AV_CPU_FLAG_VFP (1 << 3)
-+#define AV_CPU_FLAG_VFPV3 (1 << 4)
-+#define AV_CPU_FLAG_NEON (1 << 5)
-+#define AV_CPU_FLAG_ARMV8 (1 << 6)
-+#define AV_CPU_FLAG_VFP_VM \
-+ (1 << 7) ///< VFPv2 vector mode, deprecated in ARMv7-A and unavailable in
-+ ///< various CPUs implementations
-+#define AV_CPU_FLAG_SETEND (1 << 16)
-+
-+#define AV_CPU_FLAG_MMI (1 << 0)
-+#define AV_CPU_FLAG_MSA (1 << 1)
-+
-+// Loongarch SIMD extension.
-+#define AV_CPU_FLAG_LSX (1 << 0)
-+#define AV_CPU_FLAG_LASX (1 << 1)
-+
-+/**
-+ * Return the flags which specify extensions supported by the CPU.
-+ * The returned value is affected by av_force_cpu_flags() if that was used
-+ * before. So av_get_cpu_flags() can easily be used in an application to
-+ * detect the enabled cpu flags.
-+ */
-+int av_get_cpu_flags(void);
-+
-+/**
-+ * Disables cpu detection and forces the specified flags.
-+ * -1 is a special case that disables forcing of specific flags.
-+ */
-+void av_force_cpu_flags(int flags);
-+
-+/**
-+ * Parse CPU caps from a string and update the given AV_CPU_* flags based on
-+ * that.
-+ *
-+ * @return negative on error.
-+ */
-+int av_parse_cpu_caps(unsigned* flags, const char* s);
-+
-+/**
-+ * @return the number of logical CPU cores present.
-+ */
-+int av_cpu_count(void);
-+
-+/**
-+ * Overrides cpu count detection and forces the specified count.
-+ * Count < 1 disables forcing of specific count.
-+ */
-+void av_cpu_force_count(int count);
-+
-+/**
-+ * Get the maximum data alignment that may be required by FFmpeg.
-+ *
-+ * Note that this is affected by the build configuration and the CPU flags mask,
-+ * so e.g. if the CPU supports AVX, but libavutil has been built with
-+ * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
-+ * av_set_cpu_flags_mask(), then this function will behave as if AVX is not
-+ * present.
-+ */
-+size_t av_cpu_max_align(void);
-+
-+#endif /* AVUTIL_CPU_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/dict.h
-@@ -0,0 +1,215 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * Public dictionary API.
-+ * @deprecated
-+ * AVDictionary is provided for compatibility with libav. It is both in
-+ * implementation as well as API inefficient. It does not scale and is
-+ * extremely slow with large dictionaries.
-+ * It is recommended that new code uses our tree container from tree.c/h
-+ * where applicable, which uses AVL trees to achieve O(log n) performance.
-+ */
-+
-+#ifndef AVUTIL_DICT_H
-+#define AVUTIL_DICT_H
-+
-+#include <stdint.h>
-+
-+/**
-+ * @addtogroup lavu_dict AVDictionary
-+ * @ingroup lavu_data
-+ *
-+ * @brief Simple key:value store
-+ *
-+ * @{
-+ * Dictionaries are used for storing key:value pairs. To create
-+ * an AVDictionary, simply pass an address of a NULL pointer to
-+ * av_dict_set(). NULL can be used as an empty dictionary wherever
-+ * a pointer to an AVDictionary is required.
-+ * Use av_dict_get() to retrieve an entry or iterate over all
-+ * entries and finally av_dict_free() to free the dictionary
-+ * and all its contents.
-+ *
-+ @code
-+ AVDictionary *d = NULL; // "create" an empty dictionary
-+ AVDictionaryEntry *t = NULL;
-+
-+ av_dict_set(&d, "foo", "bar", 0); // add an entry
-+
-+ char *k = av_strdup("key"); // if your strings are already allocated,
-+ char *v = av_strdup("value"); // you can avoid copying them like this
-+ av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
-+
-+ while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) {
-+ <....> // iterate over all entries in d
-+ }
-+ av_dict_free(&d);
-+ @endcode
-+ */
-+
-+#define AV_DICT_MATCH_CASE \
-+ 1 /**< Only get an entry with exact-case key match. Only relevant in \
-+ av_dict_get(). */
-+#define AV_DICT_IGNORE_SUFFIX \
-+ 2 /**< Return first entry in a dictionary whose first part corresponds to \
-+ the search key, ignoring the suffix of the found key string. Only \
-+ relevant in av_dict_get(). */
-+#define AV_DICT_DONT_STRDUP_KEY \
-+ 4 /**< Take ownership of a key that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_STRDUP_VAL \
-+ 8 /**< Take ownership of a value that's been \
-+ allocated with av_malloc() or another memory allocation function. */
-+#define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries.
-+#define AV_DICT_APPEND \
-+ 32 /**< If the entry already exists, append to it. Note that no \
-+ delimiter is added, the strings are simply concatenated. */
-+#define AV_DICT_MULTIKEY \
-+ 64 /**< Allow to store several equal keys in the dictionary */
-+
-+typedef struct AVDictionaryEntry {
-+ char* key;
-+ char* value;
-+} AVDictionaryEntry;
-+
-+typedef struct AVDictionary AVDictionary;
-+
-+/**
-+ * Get a dictionary entry with matching key.
-+ *
-+ * The returned entry key or value must not be changed, or it will
-+ * cause undefined behavior.
-+ *
-+ * To iterate through all the dictionary entries, you can set the matching key
-+ * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag.
-+ *
-+ * @param prev Set to the previous matching element to find the next.
-+ * If set to NULL the first matching element is returned.
-+ * @param key matching key
-+ * @param flags a collection of AV_DICT_* flags controlling how the entry is
-+ * retrieved
-+ * @return found entry or NULL in case no matching entry was found in the
-+ * dictionary
-+ */
-+AVDictionaryEntry* av_dict_get(const AVDictionary* m, const char* key,
-+ const AVDictionaryEntry* prev, int flags);
-+
-+/**
-+ * Get number of entries in dictionary.
-+ *
-+ * @param m dictionary
-+ * @return number of entries in dictionary
-+ */
-+int av_dict_count(const AVDictionary* m);
-+
-+/**
-+ * Set the given entry in *pm, overwriting an existing entry.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set,
-+ * these arguments will be freed on error.
-+ *
-+ * Warning: Adding a new entry to a dictionary invalidates all existing entries
-+ * previously returned with av_dict_get.
-+ *
-+ * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL
-+ * a dictionary struct is allocated and put in *pm.
-+ * @param key entry key to add to *pm (will either be av_strduped or added as a
-+ * new key depending on flags)
-+ * @param value entry value to add to *pm (will be av_strduped or added as a new
-+ * key depending on flags). Passing a NULL value will cause an existing entry to
-+ * be deleted.
-+ * @return >= 0 on success otherwise an error code <0
-+ */
-+int av_dict_set(AVDictionary** pm, const char* key, const char* value,
-+ int flags);
-+
-+/**
-+ * Convenience wrapper for av_dict_set that converts the value to a string
-+ * and stores it.
-+ *
-+ * Note: If AV_DICT_DONT_STRDUP_KEY is set, key will be freed on error.
-+ */
-+int av_dict_set_int(AVDictionary** pm, const char* key, int64_t value,
-+ int flags);
-+
-+/**
-+ * Parse the key/value pairs list and add the parsed entries to a dictionary.
-+ *
-+ * In case of failure, all the successfully set entries are stored in
-+ * *pm. You may need to manually free the created dictionary.
-+ *
-+ * @param key_val_sep a 0-terminated list of characters used to separate
-+ * key from value
-+ * @param pairs_sep a 0-terminated list of characters used to separate
-+ * two pairs from each other
-+ * @param flags flags to use when adding to dictionary.
-+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
-+ * are ignored since the key/value tokens will always
-+ * be duplicated.
-+ * @return 0 on success, negative AVERROR code on failure
-+ */
-+int av_dict_parse_string(AVDictionary** pm, const char* str,
-+ const char* key_val_sep, const char* pairs_sep,
-+ int flags);
-+
-+/**
-+ * Copy entries from one AVDictionary struct into another.
-+ * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
-+ * this function will allocate a struct for you and put it in *dst
-+ * @param src pointer to source AVDictionary struct
-+ * @param flags flags to use when setting entries in *dst
-+ * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag
-+ * @return 0 on success, negative AVERROR code on failure. If dst was allocated
-+ * by this function, callers should free the associated memory.
-+ */
-+int av_dict_copy(AVDictionary** dst, const AVDictionary* src, int flags);
-+
-+/**
-+ * Free all the memory allocated for an AVDictionary struct
-+ * and all keys and values.
-+ */
-+void av_dict_free(AVDictionary** m);
-+
-+/**
-+ * Get dictionary entries as a string.
-+ *
-+ * Create a string containing dictionary's entries.
-+ * Such string may be passed back to av_dict_parse_string().
-+ * @note String is escaped with backslashes ('\').
-+ *
-+ * @param[in] m dictionary
-+ * @param[out] buffer Pointer to buffer that will be allocated with
-+ * string containg entries. Buffer must be freed by the caller when is no longer
-+ * needed.
-+ * @param[in] key_val_sep character used to separate key from value
-+ * @param[in] pairs_sep character used to separate two pairs from each
-+ * other
-+ * @return >= 0 on success, negative on error
-+ * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the
-+ * same.
-+ */
-+int av_dict_get_string(const AVDictionary* m, char** buffer,
-+ const char key_val_sep, const char pairs_sep);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_DICT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/error.h
-@@ -0,0 +1,158 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * error code definitions
-+ */
-+
-+#ifndef AVUTIL_ERROR_H
-+#define AVUTIL_ERROR_H
-+
-+#include <errno.h>
-+#include <stddef.h>
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup lavu_error
-+ *
-+ * @{
-+ */
-+
-+/* error handling */
-+#if EDOM > 0
-+# define AVERROR(e) \
-+ (-(e)) ///< Returns a negative error code from a POSIX error code, to
-+ ///< return from library functions.
-+# define AVUNERROR(e) \
-+ (-(e)) ///< Returns a POSIX error code from a library function error return
-+ ///< value.
-+#else
-+/* Some platforms have E* and errno already negated. */
-+# define AVERROR(e) (e)
-+# define AVUNERROR(e) (e)
-+#endif
-+
-+#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
-+
-+#define AVERROR_BSF_NOT_FOUND \
-+ FFERRTAG(0xF8, 'B', 'S', 'F') ///< Bitstream filter not found
-+#define AVERROR_BUG \
-+ FFERRTAG('B', 'U', 'G', '!') ///< Internal bug, also see AVERROR_BUG2
-+#define AVERROR_BUFFER_TOO_SMALL \
-+ FFERRTAG('B', 'U', 'F', 'S') ///< Buffer too small
-+#define AVERROR_DECODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'C') ///< Decoder not found
-+#define AVERROR_DEMUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'D', 'E', 'M') ///< Demuxer not found
-+#define AVERROR_ENCODER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'E', 'N', 'C') ///< Encoder not found
-+#define AVERROR_EOF FFERRTAG('E', 'O', 'F', ' ') ///< End of file
-+#define AVERROR_EXIT \
-+ FFERRTAG('E', 'X', 'I', 'T') ///< Immediate exit was requested; the called
-+ ///< function should not be restarted
-+#define AVERROR_EXTERNAL \
-+ FFERRTAG('E', 'X', 'T', ' ') ///< Generic error in an external library
-+#define AVERROR_FILTER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'F', 'I', 'L') ///< Filter not found
-+#define AVERROR_INVALIDDATA \
-+ FFERRTAG('I', 'N', 'D', 'A') ///< Invalid data found when processing input
-+#define AVERROR_MUXER_NOT_FOUND \
-+ FFERRTAG(0xF8, 'M', 'U', 'X') ///< Muxer not found
-+#define AVERROR_OPTION_NOT_FOUND \
-+ FFERRTAG(0xF8, 'O', 'P', 'T') ///< Option not found
-+#define AVERROR_PATCHWELCOME \
-+ FFERRTAG('P', 'A', 'W', \
-+ 'E') ///< Not yet implemented in FFmpeg, patches welcome
-+#define AVERROR_PROTOCOL_NOT_FOUND \
-+ FFERRTAG(0xF8, 'P', 'R', 'O') ///< Protocol not found
-+
-+#define AVERROR_STREAM_NOT_FOUND \
-+ FFERRTAG(0xF8, 'S', 'T', 'R') ///< Stream not found
-+/**
-+ * This is semantically identical to AVERROR_BUG
-+ * it has been introduced in Libav after our AVERROR_BUG and with a modified
-+ * value.
-+ */
-+#define AVERROR_BUG2 FFERRTAG('B', 'U', 'G', ' ')
-+#define AVERROR_UNKNOWN \
-+ FFERRTAG('U', 'N', 'K', \
-+ 'N') ///< Unknown error, typically from an external library
-+#define AVERROR_EXPERIMENTAL \
-+ (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set
-+ ///< strict_std_compliance if you really want to use it.
-+#define AVERROR_INPUT_CHANGED \
-+ (-0x636e6701) ///< Input changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_OUTPUT_CHANGED)
-+#define AVERROR_OUTPUT_CHANGED \
-+ (-0x636e6702) ///< Output changed between calls. Reconfiguration is required.
-+ ///< (can be OR-ed with AVERROR_INPUT_CHANGED)
-+/* HTTP & RTSP errors */
-+#define AVERROR_HTTP_BAD_REQUEST FFERRTAG(0xF8, '4', '0', '0')
-+#define AVERROR_HTTP_UNAUTHORIZED FFERRTAG(0xF8, '4', '0', '1')
-+#define AVERROR_HTTP_FORBIDDEN FFERRTAG(0xF8, '4', '0', '3')
-+#define AVERROR_HTTP_NOT_FOUND FFERRTAG(0xF8, '4', '0', '4')
-+#define AVERROR_HTTP_OTHER_4XX FFERRTAG(0xF8, '4', 'X', 'X')
-+#define AVERROR_HTTP_SERVER_ERROR FFERRTAG(0xF8, '5', 'X', 'X')
-+
-+#define AV_ERROR_MAX_STRING_SIZE 64
-+
-+/**
-+ * Put a description of the AVERROR code errnum in errbuf.
-+ * In case of failure the global variable errno is set to indicate the
-+ * error. Even in case of failure av_strerror() will print a generic
-+ * error message indicating the errnum provided to errbuf.
-+ *
-+ * @param errnum error code to describe
-+ * @param errbuf buffer to which description is written
-+ * @param errbuf_size the size in bytes of errbuf
-+ * @return 0 on success, a negative value if a description for errnum
-+ * cannot be found
-+ */
-+int av_strerror(int errnum, char* errbuf, size_t errbuf_size);
-+
-+/**
-+ * Fill the provided buffer with a string containing an error string
-+ * corresponding to the AVERROR code errnum.
-+ *
-+ * @param errbuf a buffer
-+ * @param errbuf_size size in bytes of errbuf
-+ * @param errnum error code to describe
-+ * @return the buffer in input, filled with the error description
-+ * @see av_strerror()
-+ */
-+static inline char* av_make_error_string(char* errbuf, size_t errbuf_size,
-+ int errnum) {
-+ av_strerror(errnum, errbuf, errbuf_size);
-+ return errbuf;
-+}
-+
-+/**
-+ * Convenience macro, the return value should be used only directly in
-+ * function arguments but never stand-alone.
-+ */
-+#define av_err2str(errnum) \
-+ av_make_error_string((char[AV_ERROR_MAX_STRING_SIZE]){0}, \
-+ AV_ERROR_MAX_STRING_SIZE, errnum)
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_ERROR_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/frame.h
-@@ -0,0 +1,927 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_frame
-+ * reference-counted frame API
-+ */
-+
-+#ifndef AVUTIL_FRAME_H
-+#define AVUTIL_FRAME_H
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "buffer.h"
-+#include "dict.h"
-+#include "rational.h"
-+#include "samplefmt.h"
-+#include "pixfmt.h"
-+#include "version.h"
-+
-+/**
-+ * @defgroup lavu_frame AVFrame
-+ * @ingroup lavu_data
-+ *
-+ * @{
-+ * AVFrame is an abstraction for reference-counted raw multimedia data.
-+ */
-+
-+enum AVFrameSideDataType {
-+ /**
-+ * The data is the AVPanScan struct defined in libavcodec.
-+ */
-+ AV_FRAME_DATA_PANSCAN,
-+ /**
-+ * ATSC A53 Part 4 Closed Captions.
-+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
-+ * The number of bytes of CC data is AVFrameSideData.size.
-+ */
-+ AV_FRAME_DATA_A53_CC,
-+ /**
-+ * Stereoscopic 3d metadata.
-+ * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
-+ */
-+ AV_FRAME_DATA_STEREO3D,
-+ /**
-+ * The data is the AVMatrixEncoding enum defined in
-+ * libavutil/channel_layout.h.
-+ */
-+ AV_FRAME_DATA_MATRIXENCODING,
-+ /**
-+ * Metadata relevant to a downmix procedure.
-+ * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h.
-+ */
-+ AV_FRAME_DATA_DOWNMIX_INFO,
-+ /**
-+ * ReplayGain information in the form of the AVReplayGain struct.
-+ */
-+ AV_FRAME_DATA_REPLAYGAIN,
-+ /**
-+ * This side data contains a 3x3 transformation matrix describing an affine
-+ * transformation that needs to be applied to the frame for correct
-+ * presentation.
-+ *
-+ * See libavutil/display.h for a detailed description of the data.
-+ */
-+ AV_FRAME_DATA_DISPLAYMATRIX,
-+ /**
-+ * Active Format Description data consisting of a single byte as specified
-+ * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-+ */
-+ AV_FRAME_DATA_AFD,
-+ /**
-+ * Motion vectors exported by some codecs (on demand through the export_mvs
-+ * flag set in the libavcodec AVCodecContext flags2 option).
-+ * The data is the AVMotionVector struct defined in
-+ * libavutil/motion_vector.h.
-+ */
-+ AV_FRAME_DATA_MOTION_VECTORS,
-+ /**
-+ * Recommmends skipping the specified number of samples. This is exported
-+ * only if the "skip_manual" AVOption is set in libavcodec.
-+ * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.
-+ * @code
-+ * u32le number of samples to skip from start of this packet
-+ * u32le number of samples to skip from end of this packet
-+ * u8 reason for start skip
-+ * u8 reason for end skip (0=padding silence, 1=convergence)
-+ * @endcode
-+ */
-+ AV_FRAME_DATA_SKIP_SAMPLES,
-+ /**
-+ * This side data must be associated with an audio frame and corresponds to
-+ * enum AVAudioServiceType defined in avcodec.h.
-+ */
-+ AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
-+ /**
-+ * Mastering display metadata associated with a video frame. The payload is
-+ * an AVMasteringDisplayMetadata type and contains information about the
-+ * mastering display color volume.
-+ */
-+ AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
-+ /**
-+ * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
-+ * This is set on the first frame of a GOP that has a temporal reference of 0.
-+ */
-+ AV_FRAME_DATA_GOP_TIMECODE,
-+
-+ /**
-+ * The data represents the AVSphericalMapping structure defined in
-+ * libavutil/spherical.h.
-+ */
-+ AV_FRAME_DATA_SPHERICAL,
-+
-+ /**
-+ * Content light level (based on CTA-861.3). This payload contains data in
-+ * the form of the AVContentLightMetadata struct.
-+ */
-+ AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
-+
-+ /**
-+ * The data contains an ICC profile as an opaque octet buffer following the
-+ * format described by ISO 15076-1 with an optional name defined in the
-+ * metadata key entry "name".
-+ */
-+ AV_FRAME_DATA_ICC_PROFILE,
-+
-+ /**
-+ * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4
-+ * uint32_t where the first uint32_t describes how many (1-3) of the other
-+ * timecodes are used. The timecode format is described in the documentation
-+ * of av_timecode_get_smpte_from_framenum() function in libavutil/timecode.h.
-+ */
-+ AV_FRAME_DATA_S12M_TIMECODE,
-+
-+ /**
-+ * HDR dynamic metadata associated with a video frame. The payload is
-+ * an AVDynamicHDRPlus type and contains information for color
-+ * volume transform - application 4 of SMPTE 2094-40:2016 standard.
-+ */
-+ AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
-+
-+ /**
-+ * Regions Of Interest, the data is an array of AVRegionOfInterest type, the
-+ * number of array element is implied by AVFrameSideData.size /
-+ * AVRegionOfInterest.self_size.
-+ */
-+ AV_FRAME_DATA_REGIONS_OF_INTEREST,
-+
-+ /**
-+ * Encoding parameters for a video frame, as described by AVVideoEncParams.
-+ */
-+ AV_FRAME_DATA_VIDEO_ENC_PARAMS,
-+
-+ /**
-+ * User data unregistered metadata associated with a video frame.
-+ * This is the H.26[45] UDU SEI message, and shouldn't be used for any other
-+ * purpose The data is stored as uint8_t in AVFrameSideData.data which is 16
-+ * bytes of uuid_iso_iec_11578 followed by AVFrameSideData.size - 16 bytes of
-+ * user_data_payload_byte.
-+ */
-+ AV_FRAME_DATA_SEI_UNREGISTERED,
-+
-+ /**
-+ * Film grain parameters for a frame, described by AVFilmGrainParams.
-+ * Must be present for every frame which should have film grain applied.
-+ */
-+ AV_FRAME_DATA_FILM_GRAIN_PARAMS,
-+
-+ /**
-+ * Bounding boxes for object detection and classification,
-+ * as described by AVDetectionBBoxHeader.
-+ */
-+ AV_FRAME_DATA_DETECTION_BBOXES,
-+
-+ /**
-+ * Dolby Vision RPU raw data, suitable for passing to x265
-+ * or other libraries. Array of uint8_t, with NAL emulation
-+ * bytes intact.
-+ */
-+ AV_FRAME_DATA_DOVI_RPU_BUFFER,
-+
-+ /**
-+ * Parsed Dolby Vision metadata, suitable for passing to a software
-+ * implementation. The payload is the AVDOVIMetadata struct defined in
-+ * libavutil/dovi_meta.h.
-+ */
-+ AV_FRAME_DATA_DOVI_METADATA,
-+};
-+
-+enum AVActiveFormatDescription {
-+ AV_AFD_SAME = 8,
-+ AV_AFD_4_3 = 9,
-+ AV_AFD_16_9 = 10,
-+ AV_AFD_14_9 = 11,
-+ AV_AFD_4_3_SP_14_9 = 13,
-+ AV_AFD_16_9_SP_14_9 = 14,
-+ AV_AFD_SP_4_3 = 15,
-+};
-+
-+/**
-+ * Structure to hold side data for an AVFrame.
-+ *
-+ * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be
-+ * added to the end with a minor bump.
-+ */
-+typedef struct AVFrameSideData {
-+ enum AVFrameSideDataType type;
-+ uint8_t* data;
-+ size_t size;
-+ AVDictionary* metadata;
-+ AVBufferRef* buf;
-+} AVFrameSideData;
-+
-+/**
-+ * Structure describing a single Region Of Interest.
-+ *
-+ * When multiple regions are defined in a single side-data block, they
-+ * should be ordered from most to least important - some encoders are only
-+ * capable of supporting a limited number of distinct regions, so will have
-+ * to truncate the list.
-+ *
-+ * When overlapping regions are defined, the first region containing a given
-+ * area of the frame applies.
-+ */
-+typedef struct AVRegionOfInterest {
-+ /**
-+ * Must be set to the size of this data structure (that is,
-+ * sizeof(AVRegionOfInterest)).
-+ */
-+ uint32_t self_size;
-+ /**
-+ * Distance in pixels from the top edge of the frame to the top and
-+ * bottom edges and from the left edge of the frame to the left and
-+ * right edges of the rectangle defining this region of interest.
-+ *
-+ * The constraints on a region are encoder dependent, so the region
-+ * actually affected may be slightly larger for alignment or other
-+ * reasons.
-+ */
-+ int top;
-+ int bottom;
-+ int left;
-+ int right;
-+ /**
-+ * Quantisation offset.
-+ *
-+ * Must be in the range -1 to +1. A value of zero indicates no quality
-+ * change. A negative value asks for better quality (less quantisation),
-+ * while a positive value asks for worse quality (greater quantisation).
-+ *
-+ * The range is calibrated so that the extreme values indicate the
-+ * largest possible offset - if the rest of the frame is encoded with the
-+ * worst possible quality, an offset of -1 indicates that this region
-+ * should be encoded with the best possible quality anyway. Intermediate
-+ * values are then interpolated in some codec-dependent way.
-+ *
-+ * For example, in 10-bit H.264 the quantisation parameter varies between
-+ * -12 and 51. A typical qoffset value of -1/10 therefore indicates that
-+ * this region should be encoded with a QP around one-tenth of the full
-+ * range better than the rest of the frame. So, if most of the frame
-+ * were to be encoded with a QP of around 30, this region would get a QP
-+ * of around 24 (an offset of approximately -1/10 * (51 - -12) = -6.3).
-+ * An extreme value of -1 would indicate that this region should be
-+ * encoded with the best possible quality regardless of the treatment of
-+ * the rest of the frame - that is, should be encoded at a QP of -12.
-+ */
-+ AVRational qoffset;
-+} AVRegionOfInterest;
-+
-+/**
-+ * This structure describes decoded (raw) audio or video data.
-+ *
-+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
-+ * allocates the AVFrame itself, the buffers for the data must be managed
-+ * through other means (see below).
-+ * AVFrame must be freed with av_frame_free().
-+ *
-+ * AVFrame is typically allocated once and then reused multiple times to hold
-+ * different data (e.g. a single AVFrame to hold frames received from a
-+ * decoder). In such a case, av_frame_unref() will free any references held by
-+ * the frame and reset it to its original clean state before it
-+ * is reused again.
-+ *
-+ * The data described by an AVFrame is usually reference counted through the
-+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
-+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
-+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
-+ * every single data plane must be contained in one of the buffers in
-+ * AVFrame.buf or AVFrame.extended_buf.
-+ * There may be a single buffer for all the data, or one separate buffer for
-+ * each plane, or anything in between.
-+ *
-+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
-+ * to the end with a minor bump.
-+ *
-+ * Fields can be accessed through AVOptions, the name string used, matches the
-+ * C structure field name for fields accessible through AVOptions. The AVClass
-+ * for AVFrame can be obtained from avcodec_get_frame_class()
-+ */
-+typedef struct AVFrame {
-+#define AV_NUM_DATA_POINTERS 8
-+ /**
-+ * pointer to the picture/channel planes.
-+ * This might be different from the first allocated byte. For video,
-+ * it could even point to the end of the image data.
-+ *
-+ * All pointers in data and extended_data must point into one of the
-+ * AVBufferRef in buf or extended_buf.
-+ *
-+ * Some decoders access areas outside 0,0 - width,height, please
-+ * see avcodec_align_dimensions2(). Some filters and swscale can read
-+ * up to 16 bytes beyond the planes, if these filters are to be used,
-+ * then 16 extra bytes must be allocated.
-+ *
-+ * NOTE: Pointers not needed by the format MUST be set to NULL.
-+ *
-+ * @attention In case of video, the data[] pointers can point to the
-+ * end of image data in order to reverse line order, when used in
-+ * combination with negative values in the linesize[] array.
-+ */
-+ uint8_t* data[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For video, a positive or negative value, which is typically indicating
-+ * the size in bytes of each picture line, but it can also be:
-+ * - the negative byte size of lines for vertical flipping
-+ * (with data[n] pointing to the end of the data
-+ * - a positive or negative multiple of the byte size as for accessing
-+ * even and odd fields of a frame (possibly flipped)
-+ *
-+ * For audio, only linesize[0] may be set. For planar audio, each channel
-+ * plane must be the same size.
-+ *
-+ * For video the linesizes should be multiples of the CPUs alignment
-+ * preference, this is 16 or 32 for modern desktop CPUs.
-+ * Some code requires such alignment other code can be slower without
-+ * correct alignment, for yet other it makes no difference.
-+ *
-+ * @note The linesize may be larger than the size of usable data -- there
-+ * may be extra padding present for performance reasons.
-+ *
-+ * @attention In case of video, line size values can be negative to achieve
-+ * a vertically inverted iteration over image lines.
-+ */
-+ int linesize[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * pointers to the data planes/channels.
-+ *
-+ * For video, this should simply point to data[].
-+ *
-+ * For planar audio, each channel has a separate data pointer, and
-+ * linesize[0] contains the size of each channel buffer.
-+ * For packed audio, there is just one data pointer, and linesize[0]
-+ * contains the total size of the buffer for all channels.
-+ *
-+ * Note: Both data and extended_data should always be set in a valid frame,
-+ * but for planar audio with more channels that can fit in data,
-+ * extended_data must be used in order to access all channels.
-+ */
-+ uint8_t** extended_data;
-+
-+ /**
-+ * @name Video dimensions
-+ * Video frames only. The coded dimensions (in pixels) of the video frame,
-+ * i.e. the size of the rectangle that contains some well-defined values.
-+ *
-+ * @note The part of the frame intended for display/presentation is further
-+ * restricted by the @ref cropping "Cropping rectangle".
-+ * @{
-+ */
-+ int width, height;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * number of audio samples (per channel) described by this frame
-+ */
-+ int nb_samples;
-+
-+ /**
-+ * format of the frame, -1 if unknown or unset
-+ * Values correspond to enum AVPixelFormat for video frames,
-+ * enum AVSampleFormat for audio)
-+ */
-+ int format;
-+
-+ /**
-+ * 1 -> keyframe, 0-> not
-+ */
-+ int key_frame;
-+
-+ /**
-+ * Picture type of the frame.
-+ */
-+ enum AVPictureType pict_type;
-+
-+ /**
-+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
-+ */
-+ AVRational sample_aspect_ratio;
-+
-+ /**
-+ * Presentation timestamp in time_base units (time when frame should be shown
-+ * to user).
-+ */
-+ int64_t pts;
-+
-+ /**
-+ * DTS copied from the AVPacket that triggered returning this frame. (if frame
-+ * threading isn't used) This is also the Presentation time of this AVFrame
-+ * calculated from only AVPacket.dts values without pts values.
-+ */
-+ int64_t pkt_dts;
-+
-+ /**
-+ * Time base for the timestamps in this frame.
-+ * In the future, this field may be set on frames output by decoders or
-+ * filters, but its value will be by default ignored on input to encoders
-+ * or filters.
-+ */
-+ AVRational time_base;
-+
-+ /**
-+ * picture number in bitstream order
-+ */
-+ int coded_picture_number;
-+ /**
-+ * picture number in display order
-+ */
-+ int display_picture_number;
-+
-+ /**
-+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-+ */
-+ int quality;
-+
-+ /**
-+ * for some private data of the user
-+ */
-+ void* opaque;
-+
-+ /**
-+ * When decoding, this signals how much the picture must be delayed.
-+ * extra_delay = repeat_pict / (2*fps)
-+ */
-+ int repeat_pict;
-+
-+ /**
-+ * The content of the picture is interlaced.
-+ */
-+ int interlaced_frame;
-+
-+ /**
-+ * If the content is interlaced, is top field displayed first.
-+ */
-+ int top_field_first;
-+
-+ /**
-+ * Tell user application that palette has changed from previous frame.
-+ */
-+ int palette_has_changed;
-+
-+ /**
-+ * reordered opaque 64 bits (generally an integer or a double precision float
-+ * PTS but can be anything).
-+ * The user sets AVCodecContext.reordered_opaque to represent the input at
-+ * that time,
-+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-+ * to exactly one of the values provided by the user through
-+ * AVCodecContext.reordered_opaque
-+ */
-+ int64_t reordered_opaque;
-+
-+ /**
-+ * Sample rate of the audio data.
-+ */
-+ int sample_rate;
-+
-+ /**
-+ * Channel layout of the audio data.
-+ */
-+ uint64_t channel_layout;
-+
-+ /**
-+ * AVBuffer references backing the data for this frame. All the pointers in
-+ * data and extended_data must point inside one of the buffers in buf or
-+ * extended_buf. This array must be filled contiguously -- if buf[i] is
-+ * non-NULL then buf[j] must also be non-NULL for all j < i.
-+ *
-+ * There may be at most one AVBuffer per data plane, so for video this array
-+ * always contains all the references. For planar audio with more than
-+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
-+ * this array. Then the extra AVBufferRef pointers are stored in the
-+ * extended_buf array.
-+ */
-+ AVBufferRef* buf[AV_NUM_DATA_POINTERS];
-+
-+ /**
-+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
-+ * AVBufferRef pointers, this array will hold all the references which
-+ * cannot fit into AVFrame.buf.
-+ *
-+ * Note that this is different from AVFrame.extended_data, which always
-+ * contains all the pointers. This array only contains the extra pointers,
-+ * which cannot fit into AVFrame.buf.
-+ *
-+ * This array is always allocated using av_malloc() by whoever constructs
-+ * the frame. It is freed in av_frame_unref().
-+ */
-+ AVBufferRef** extended_buf;
-+ /**
-+ * Number of elements in extended_buf.
-+ */
-+ int nb_extended_buf;
-+
-+ AVFrameSideData** side_data;
-+ int nb_side_data;
-+
-+/**
-+ * @defgroup lavu_frame_flags AV_FRAME_FLAGS
-+ * @ingroup lavu_frame
-+ * Flags describing additional frame properties.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * The frame data may be corrupted, e.g. due to decoding errors.
-+ */
-+#define AV_FRAME_FLAG_CORRUPT (1 << 0)
-+/**
-+ * A flag to mark the frames which need to be decoded, but shouldn't be output.
-+ */
-+#define AV_FRAME_FLAG_DISCARD (1 << 2)
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * Frame flags, a combination of @ref lavu_frame_flags
-+ */
-+ int flags;
-+
-+ /**
-+ * MPEG vs JPEG YUV range.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorRange color_range;
-+
-+ enum AVColorPrimaries color_primaries;
-+
-+ enum AVColorTransferCharacteristic color_trc;
-+
-+ /**
-+ * YUV colorspace type.
-+ * - encoding: Set by user
-+ * - decoding: Set by libavcodec
-+ */
-+ enum AVColorSpace colorspace;
-+
-+ enum AVChromaLocation chroma_location;
-+
-+ /**
-+ * frame timestamp estimated using various heuristics, in stream time base
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int64_t best_effort_timestamp;
-+
-+ /**
-+ * reordered pos from the last AVPacket that has been input into the decoder
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_pos;
-+
-+ /**
-+ * duration of the corresponding packet, expressed in
-+ * AVStream->time_base units, 0 if unknown.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int64_t pkt_duration;
-+
-+ /**
-+ * metadata.
-+ * - encoding: Set by user.
-+ * - decoding: Set by libavcodec.
-+ */
-+ AVDictionary* metadata;
-+
-+ /**
-+ * decode error flags of the frame, set to a combination of
-+ * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
-+ * were errors during the decoding.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int decode_error_flags;
-+#define FF_DECODE_ERROR_INVALID_BITSTREAM 1
-+#define FF_DECODE_ERROR_MISSING_REFERENCE 2
-+#define FF_DECODE_ERROR_CONCEALMENT_ACTIVE 4
-+#define FF_DECODE_ERROR_DECODE_SLICES 8
-+
-+ /**
-+ * number of audio channels, only used for audio.
-+ * - encoding: unused
-+ * - decoding: Read by user.
-+ */
-+ int channels;
-+
-+ /**
-+ * size of the corresponding packet containing the compressed
-+ * frame.
-+ * It is set to a negative value if unknown.
-+ * - encoding: unused
-+ * - decoding: set by libavcodec, read by user.
-+ */
-+ int pkt_size;
-+
-+ /**
-+ * For hwaccel-format frames, this should be a reference to the
-+ * AVHWFramesContext describing the frame.
-+ */
-+ AVBufferRef* hw_frames_ctx;
-+
-+ /**
-+ * AVBufferRef for free use by the API user. FFmpeg will never check the
-+ * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-+ * the frame is unreferenced. av_frame_copy_props() calls create a new
-+ * reference with av_buffer_ref() for the target frame's opaque_ref field.
-+ *
-+ * This is unrelated to the opaque field, although it serves a similar
-+ * purpose.
-+ */
-+ AVBufferRef* opaque_ref;
-+
-+ /**
-+ * @anchor cropping
-+ * @name Cropping
-+ * Video frames only. The number of pixels to discard from the the
-+ * top/bottom/left/right border of the frame to obtain the sub-rectangle of
-+ * the frame intended for presentation.
-+ * @{
-+ */
-+ size_t crop_top;
-+ size_t crop_bottom;
-+ size_t crop_left;
-+ size_t crop_right;
-+ /**
-+ * @}
-+ */
-+
-+ /**
-+ * AVBufferRef for internal use by a single libav* library.
-+ * Must not be used to transfer data between libraries.
-+ * Has to be NULL when ownership of the frame leaves the respective library.
-+ *
-+ * Code outside the FFmpeg libs should never check or change the contents of
-+ * the buffer ref.
-+ *
-+ * FFmpeg calls av_buffer_unref() on it when the frame is unreferenced.
-+ * av_frame_copy_props() calls create a new reference with av_buffer_ref()
-+ * for the target frame's private_ref field.
-+ */
-+ AVBufferRef* private_ref;
-+} AVFrame;
-+
-+#if FF_API_COLORSPACE_NAME
-+/**
-+ * Get the name of a colorspace.
-+ * @return a static string identifying the colorspace; can be NULL.
-+ * @deprecated use av_color_space_name()
-+ */
-+attribute_deprecated const char* av_get_colorspace_name(enum AVColorSpace val);
-+#endif
-+/**
-+ * Allocate an AVFrame and set its fields to default values. The resulting
-+ * struct must be freed using av_frame_free().
-+ *
-+ * @return An AVFrame filled with default values or NULL on failure.
-+ *
-+ * @note this only allocates the AVFrame itself, not the data buffers. Those
-+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
-+ * manually.
-+ */
-+AVFrame* av_frame_alloc(void);
-+
-+/**
-+ * Free the frame and any dynamically allocated objects in it,
-+ * e.g. extended_data. If the frame is reference counted, it will be
-+ * unreferenced first.
-+ *
-+ * @param frame frame to be freed. The pointer will be set to NULL.
-+ */
-+void av_frame_free(AVFrame** frame);
-+
-+/**
-+ * Set up a new reference to the data described by the source frame.
-+ *
-+ * Copy frame properties from src to dst and create a new reference for each
-+ * AVBufferRef from src.
-+ *
-+ * If src is not reference counted, new buffers are allocated and the data is
-+ * copied.
-+ *
-+ * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
-+ * or newly allocated with av_frame_alloc() before calling this
-+ * function, or undefined behavior will occur.
-+ *
-+ * @return 0 on success, a negative AVERROR on error
-+ */
-+int av_frame_ref(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Create a new frame that references the same data as src.
-+ *
-+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
-+ *
-+ * @return newly created AVFrame on success, NULL on error.
-+ */
-+AVFrame* av_frame_clone(const AVFrame* src);
-+
-+/**
-+ * Unreference all the buffers referenced by frame and reset the frame fields.
-+ */
-+void av_frame_unref(AVFrame* frame);
-+
-+/**
-+ * Move everything contained in src to dst and reset src.
-+ *
-+ * @warning: dst is not unreferenced, but directly overwritten without reading
-+ * or deallocating its contents. Call av_frame_unref(dst) manually
-+ * before calling this function to ensure that no memory is leaked.
-+ */
-+void av_frame_move_ref(AVFrame* dst, AVFrame* src);
-+
-+/**
-+ * Allocate new buffer(s) for audio or video data.
-+ *
-+ * The following fields must be set on frame before calling this function:
-+ * - format (pixel format for video, sample format for audio)
-+ * - width and height for video
-+ * - nb_samples and channel_layout for audio
-+ *
-+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
-+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
-+ * For planar formats, one buffer will be allocated for each plane.
-+ *
-+ * @warning: if frame already has been allocated, calling this function will
-+ * leak memory. In addition, undefined behavior can occur in certain
-+ * cases.
-+ *
-+ * @param frame frame in which to store the new buffers.
-+ * @param align Required buffer size alignment. If equal to 0, alignment will be
-+ * chosen automatically for the current CPU. It is highly
-+ * recommended to pass 0 here unless you know what you are doing.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_get_buffer(AVFrame* frame, int align);
-+
-+/**
-+ * Check if the frame data is writable.
-+ *
-+ * @return A positive value if the frame data is writable (which is true if and
-+ * only if each of the underlying buffers has only one reference, namely the one
-+ * stored in this frame). Return 0 otherwise.
-+ *
-+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
-+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
-+ *
-+ * @see av_frame_make_writable(), av_buffer_is_writable()
-+ */
-+int av_frame_is_writable(AVFrame* frame);
-+
-+/**
-+ * Ensure that the frame data is writable, avoiding data copy if possible.
-+ *
-+ * Do nothing if the frame is writable, allocate new buffers and copy the data
-+ * if it is not.
-+ *
-+ * @return 0 on success, a negative AVERROR on error.
-+ *
-+ * @see av_frame_is_writable(), av_buffer_is_writable(),
-+ * av_buffer_make_writable()
-+ */
-+int av_frame_make_writable(AVFrame* frame);
-+
-+/**
-+ * Copy the frame data from src to dst.
-+ *
-+ * This function does not allocate anything, dst must be already initialized and
-+ * allocated with the same parameters as src.
-+ *
-+ * This function only copies the frame data (i.e. the contents of the data /
-+ * extended data arrays), not any other properties.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error.
-+ */
-+int av_frame_copy(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Copy only "metadata" fields from src to dst.
-+ *
-+ * Metadata for the purpose of this function are those fields that do not affect
-+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
-+ * aspect ratio (for video), but not width/height or channel layout.
-+ * Side data is also copied.
-+ */
-+int av_frame_copy_props(AVFrame* dst, const AVFrame* src);
-+
-+/**
-+ * Get the buffer reference a given data plane is stored in.
-+ *
-+ * @param plane index of the data plane of interest in frame->extended_data.
-+ *
-+ * @return the buffer reference that contains the plane or NULL if the input
-+ * frame is not valid.
-+ */
-+AVBufferRef* av_frame_get_plane_buffer(AVFrame* frame, int plane);
-+
-+/**
-+ * Add a new side data to a frame.
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type type of the added side data
-+ * @param size size of the side data
-+ *
-+ * @return newly added side data on success, NULL on error
-+ */
-+AVFrameSideData* av_frame_new_side_data(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ size_t size);
-+
-+/**
-+ * Add a new side data to a frame from an existing AVBufferRef
-+ *
-+ * @param frame a frame to which the side data should be added
-+ * @param type the type of the added side data
-+ * @param buf an AVBufferRef to add as side data. The ownership of
-+ * the reference is transferred to the frame.
-+ *
-+ * @return newly added side data on success, NULL on error. On failure
-+ * the frame is unchanged and the AVBufferRef remains owned by
-+ * the caller.
-+ */
-+AVFrameSideData* av_frame_new_side_data_from_buf(AVFrame* frame,
-+ enum AVFrameSideDataType type,
-+ AVBufferRef* buf);
-+
-+/**
-+ * @return a pointer to the side data of a given type on success, NULL if there
-+ * is no side data with such type in this frame.
-+ */
-+AVFrameSideData* av_frame_get_side_data(const AVFrame* frame,
-+ enum AVFrameSideDataType type);
-+
-+/**
-+ * Remove and free all side data instances of the given type.
-+ */
-+void av_frame_remove_side_data(AVFrame* frame, enum AVFrameSideDataType type);
-+
-+/**
-+ * Flags for frame cropping.
-+ */
-+enum {
-+ /**
-+ * Apply the maximum possible cropping, even if it requires setting the
-+ * AVFrame.data[] entries to unaligned pointers. Passing unaligned data
-+ * to FFmpeg API is generally not allowed, and causes undefined behavior
-+ * (such as crashes). You can pass unaligned data only to FFmpeg APIs that
-+ * are explicitly documented to accept it. Use this flag only if you
-+ * absolutely know what you are doing.
-+ */
-+ AV_FRAME_CROP_UNALIGNED = 1 << 0,
-+};
-+
-+/**
-+ * Crop the given video AVFrame according to its crop_left/crop_top/crop_right/
-+ * crop_bottom fields. If cropping is successful, the function will adjust the
-+ * data pointers and the width/height fields, and set the crop fields to 0.
-+ *
-+ * In all cases, the cropping boundaries will be rounded to the inherent
-+ * alignment of the pixel format. In some cases, such as for opaque hwaccel
-+ * formats, the left/top cropping is ignored. The crop fields are set to 0 even
-+ * if the cropping was rounded or ignored.
-+ *
-+ * @param frame the frame which should be cropped
-+ * @param flags Some combination of AV_FRAME_CROP_* flags, or 0.
-+ *
-+ * @return >= 0 on success, a negative AVERROR on error. If the cropping fields
-+ * were invalid, AVERROR(ERANGE) is returned, and nothing is changed.
-+ */
-+int av_frame_apply_cropping(AVFrame* frame, int flags);
-+
-+/**
-+ * @return a string identifying the side data type
-+ */
-+const char* av_frame_side_data_name(enum AVFrameSideDataType type);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_FRAME_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext.h
-@@ -0,0 +1,601 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_H
-+#define AVUTIL_HWCONTEXT_H
-+
-+#include "buffer.h"
-+#include "frame.h"
-+#include "log.h"
-+#include "pixfmt.h"
-+
-+enum AVHWDeviceType {
-+ AV_HWDEVICE_TYPE_NONE,
-+ AV_HWDEVICE_TYPE_VDPAU,
-+ AV_HWDEVICE_TYPE_CUDA,
-+ AV_HWDEVICE_TYPE_VAAPI,
-+ AV_HWDEVICE_TYPE_DXVA2,
-+ AV_HWDEVICE_TYPE_QSV,
-+ AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-+ AV_HWDEVICE_TYPE_D3D11VA,
-+ AV_HWDEVICE_TYPE_DRM,
-+ AV_HWDEVICE_TYPE_OPENCL,
-+ AV_HWDEVICE_TYPE_MEDIACODEC,
-+ AV_HWDEVICE_TYPE_VULKAN,
-+};
-+
-+typedef struct AVHWDeviceInternal AVHWDeviceInternal;
-+
-+/**
-+ * This struct aggregates all the (hardware/vendor-specific) "high-level" state,
-+ * i.e. state that is not tied to a concrete processing configuration.
-+ * E.g., in an API that supports hardware-accelerated encoding and decoding,
-+ * this struct will (if possible) wrap the state that is common to both encoding
-+ * and decoding and from which specific instances of encoders or decoders can be
-+ * derived.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism. The
-+ * av_hwdevice_ctx_alloc() constructor yields a reference, whose data field
-+ * points to the actual AVHWDeviceContext. Further objects derived from
-+ * AVHWDeviceContext (such as AVHWFramesContext, describing a frame pool with
-+ * specific properties) will hold an internal reference to it. After all the
-+ * references are released, the AVHWDeviceContext itself will be freed,
-+ * optionally invoking a user-specified callback for uninitializing the hardware
-+ * state.
-+ */
-+typedef struct AVHWDeviceContext {
-+ /**
-+ * A class for logging. Set by av_hwdevice_ctx_alloc().
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWDeviceInternal* internal;
-+
-+ /**
-+ * This field identifies the underlying API used for hardware access.
-+ *
-+ * This field is set when this struct is allocated and never changed
-+ * afterwards.
-+ */
-+ enum AVHWDeviceType type;
-+
-+ /**
-+ * The format-specific data, allocated and freed by libavutil along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwcontext_*.h) and filled as described in the
-+ * documentation before calling av_hwdevice_ctx_init().
-+ *
-+ * After calling av_hwdevice_ctx_init() this struct should not be modified
-+ * by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwdevice_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ *
-+ * @note when other objects (e.g an AVHWFramesContext) are derived from this
-+ * struct, this callback will be invoked after all such child objects
-+ * are fully uninitialized and their respective destructors invoked.
-+ */
-+ void (*free)(struct AVHWDeviceContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+} AVHWDeviceContext;
-+
-+typedef struct AVHWFramesInternal AVHWFramesInternal;
-+
-+/**
-+ * This struct describes a set or pool of "hardware" frames (i.e. those with
-+ * data not located in normal system memory). All the frames in the pool are
-+ * assumed to be allocated in the same way and interchangeable.
-+ *
-+ * This struct is reference-counted with the AVBuffer mechanism and tied to a
-+ * given AVHWDeviceContext instance. The av_hwframe_ctx_alloc() constructor
-+ * yields a reference, whose data field points to the actual AVHWFramesContext
-+ * struct.
-+ */
-+typedef struct AVHWFramesContext {
-+ /**
-+ * A class for logging.
-+ */
-+ const AVClass* av_class;
-+
-+ /**
-+ * Private data used internally by libavutil. Must not be accessed in any
-+ * way by the caller.
-+ */
-+ AVHWFramesInternal* internal;
-+
-+ /**
-+ * A reference to the parent AVHWDeviceContext. This reference is owned and
-+ * managed by the enclosing AVHWFramesContext, but the caller may derive
-+ * additional references from it.
-+ */
-+ AVBufferRef* device_ref;
-+
-+ /**
-+ * The parent AVHWDeviceContext. This is simply a pointer to
-+ * device_ref->data provided for convenience.
-+ *
-+ * Set by libavutil in av_hwframe_ctx_init().
-+ */
-+ AVHWDeviceContext* device_ctx;
-+
-+ /**
-+ * The format-specific data, allocated and freed automatically along with
-+ * this context.
-+ *
-+ * Should be cast by the user to the format-specific context defined in the
-+ * corresponding header (hwframe_*.h) and filled as described in the
-+ * documentation before calling av_hwframe_ctx_init().
-+ *
-+ * After any frames using this context are created, the contents of this
-+ * struct should not be modified by the caller.
-+ */
-+ void* hwctx;
-+
-+ /**
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * If non-NULL, this callback will be called when the last reference to
-+ * this context is unreferenced, immediately before it is freed.
-+ */
-+ void (*free)(struct AVHWFramesContext* ctx);
-+
-+ /**
-+ * Arbitrary user data, to be used e.g. by the free() callback.
-+ */
-+ void* user_opaque;
-+
-+ /**
-+ * A pool from which the frames are allocated by av_hwframe_get_buffer().
-+ * This field may be set by the caller before calling av_hwframe_ctx_init().
-+ * The buffers returned by calling av_buffer_pool_get() on this pool must
-+ * have the properties described in the documentation in the corresponding hw
-+ * type's header (hwcontext_*.h). The pool will be freed strictly before
-+ * this struct's free() callback is invoked.
-+ *
-+ * This field may be NULL, then libavutil will attempt to allocate a pool
-+ * internally. Note that certain device types enforce pools allocated at
-+ * fixed size (frame count), which cannot be extended dynamically. In such a
-+ * case, initial_pool_size must be set appropriately.
-+ */
-+ AVBufferPool* pool;
-+
-+ /**
-+ * Initial size of the frame pool. If a device type does not support
-+ * dynamically resizing the pool, then this is also the maximum pool size.
-+ *
-+ * May be set by the caller before calling av_hwframe_ctx_init(). Must be
-+ * set if pool is NULL and the device type does not support dynamic pools.
-+ */
-+ int initial_pool_size;
-+
-+ /**
-+ * The pixel format identifying the underlying HW surface type.
-+ *
-+ * Must be a hwaccel format, i.e. the corresponding descriptor must have the
-+ * AV_PIX_FMT_FLAG_HWACCEL flag set.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ enum AVPixelFormat format;
-+
-+ /**
-+ * The pixel format identifying the actual data layout of the hardware
-+ * frames.
-+ *
-+ * Must be set by the caller before calling av_hwframe_ctx_init().
-+ *
-+ * @note when the underlying API does not provide the exact data layout, but
-+ * only the colorspace/bit depth, this field should be set to the fully
-+ * planar version of that format (e.g. for 8-bit 420 YUV it should be
-+ * AV_PIX_FMT_YUV420P, not AV_PIX_FMT_NV12 or anything else).
-+ */
-+ enum AVPixelFormat sw_format;
-+
-+ /**
-+ * The allocated dimensions of the frames in this pool.
-+ *
-+ * Must be set by the user before calling av_hwframe_ctx_init().
-+ */
-+ int width, height;
-+} AVHWFramesContext;
-+
-+/**
-+ * Look up an AVHWDeviceType by name.
-+ *
-+ * @param name String name of the device type (case-insensitive).
-+ * @return The type from enum AVHWDeviceType, or AV_HWDEVICE_TYPE_NONE if
-+ * not found.
-+ */
-+enum AVHWDeviceType av_hwdevice_find_type_by_name(const char* name);
-+
-+/** Get the string name of an AVHWDeviceType.
-+ *
-+ * @param type Type from enum AVHWDeviceType.
-+ * @return Pointer to a static string containing the name, or NULL if the type
-+ * is not valid.
-+ */
-+const char* av_hwdevice_get_type_name(enum AVHWDeviceType type);
-+
-+/**
-+ * Iterate over supported device types.
-+ *
-+ * @param type AV_HWDEVICE_TYPE_NONE initially, then the previous type
-+ * returned by this function in subsequent iterations.
-+ * @return The next usable device type from enum AVHWDeviceType, or
-+ * AV_HWDEVICE_TYPE_NONE if there are no more.
-+ */
-+enum AVHWDeviceType av_hwdevice_iterate_types(enum AVHWDeviceType prev);
-+
-+/**
-+ * Allocate an AVHWDeviceContext for a given hardware type.
-+ *
-+ * @param type the type of the hardware device to allocate.
-+ * @return a reference to the newly created AVHWDeviceContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwdevice_ctx_alloc(enum AVHWDeviceType type);
-+
-+/**
-+ * Finalize the device context before use. This function must be called after
-+ * the context is filled with all the required information and before it is
-+ * used in any way.
-+ *
-+ * @param ref a reference to the AVHWDeviceContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwdevice_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Open a device of the specified type and create an AVHWDeviceContext for it.
-+ *
-+ * This is a convenience function intended to cover the simple cases. Callers
-+ * who need to fine-tune device creation/management should open the device
-+ * manually and then wrap it in an AVHWDeviceContext using
-+ * av_hwdevice_ctx_alloc()/av_hwdevice_ctx_init().
-+ *
-+ * The returned context is already initialized and ready for use, the caller
-+ * should not call av_hwdevice_ctx_init() on it. The user_opaque/free fields of
-+ * the created AVHWDeviceContext are set by this function and should not be
-+ * touched by the caller.
-+ *
-+ * @param device_ctx On success, a reference to the newly-created device context
-+ * will be written here. The reference is owned by the caller
-+ * and must be released with av_buffer_unref() when no longer
-+ * needed. On failure, NULL will be written to this pointer.
-+ * @param type The type of the device to create.
-+ * @param device A type-specific string identifying the device to open.
-+ * @param opts A dictionary of additional (type-specific) options to use in
-+ * opening the device. The dictionary remains owned by the caller.
-+ * @param flags currently unused
-+ *
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create(AVBufferRef** device_ctx, enum AVHWDeviceType type,
-+ const char* device, AVDictionary* opts, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * If the source device is a device of the target type or was originally
-+ * derived from such a device (possibly through one or more intermediate
-+ * devices of other types), then this will return a reference to the
-+ * existing device of the same type as is requested.
-+ *
-+ * Otherwise, it will attempt to derive a new device from the given source
-+ * device. If direct derivation to the new type is not implemented, it will
-+ * attempt the same derivation from each ancestor of the source device in
-+ * turn looking for an implemented derivation method.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx, int flags);
-+
-+/**
-+ * Create a new device of the specified type from an existing device.
-+ *
-+ * This function performs the same action as av_hwdevice_ctx_create_derived,
-+ * however, it is able to set options for the new device to be derived.
-+ *
-+ * @param dst_ctx On success, a reference to the newly-created
-+ * AVHWDeviceContext.
-+ * @param type The type of the new device to create.
-+ * @param src_ctx A reference to an existing AVHWDeviceContext which will be
-+ * used to create the new device.
-+ * @param options Options for the new device to create, same format as in
-+ * av_hwdevice_ctx_create.
-+ * @param flags Currently unused; should be set to zero.
-+ * @return Zero on success, a negative AVERROR code on failure.
-+ */
-+int av_hwdevice_ctx_create_derived_opts(AVBufferRef** dst_ctx,
-+ enum AVHWDeviceType type,
-+ AVBufferRef* src_ctx,
-+ AVDictionary* options, int flags);
-+
-+/**
-+ * Allocate an AVHWFramesContext tied to a given device context.
-+ *
-+ * @param device_ctx a reference to a AVHWDeviceContext. This function will make
-+ * a new reference for internal use, the one passed to the
-+ * function remains owned by the caller.
-+ * @return a reference to the newly created AVHWFramesContext on success or NULL
-+ * on failure.
-+ */
-+AVBufferRef* av_hwframe_ctx_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Finalize the context before use. This function must be called after the
-+ * context is filled with all the required information and before it is attached
-+ * to any frames.
-+ *
-+ * @param ref a reference to the AVHWFramesContext
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_ctx_init(AVBufferRef* ref);
-+
-+/**
-+ * Allocate a new frame attached to the given AVHWFramesContext.
-+ *
-+ * @param hwframe_ctx a reference to an AVHWFramesContext
-+ * @param frame an empty (freshly allocated or unreffed) frame to be filled with
-+ * newly allocated buffers.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure
-+ */
-+int av_hwframe_get_buffer(AVBufferRef* hwframe_ctx, AVFrame* frame, int flags);
-+
-+/**
-+ * Copy data to or from a hw surface. At least one of dst/src must have an
-+ * AVHWFramesContext attached.
-+ *
-+ * If src has an AVHWFramesContext attached, then the format of dst (if set)
-+ * must use one of the formats returned by av_hwframe_transfer_get_formats(src,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_FROM).
-+ * If dst has an AVHWFramesContext attached, then the format of src must use one
-+ * of the formats returned by av_hwframe_transfer_get_formats(dst,
-+ * AV_HWFRAME_TRANSFER_DIRECTION_TO)
-+ *
-+ * dst may be "clean" (i.e. with data/buf pointers unset), in which case the
-+ * data buffers will be allocated by this function using av_frame_get_buffer().
-+ * If dst->format is set, then this format will be used, otherwise (when
-+ * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
-+ *
-+ * The two frames must have matching allocated dimensions (i.e. equal to
-+ * AVHWFramesContext.width/height), since not all device types support
-+ * transferring a sub-rectangle of the whole surface. The display dimensions
-+ * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
-+ * also have to be equal for both frames. When the display dimensions are
-+ * smaller than the allocated dimensions, the content of the padding in the
-+ * destination frame is unspecified.
-+ *
-+ * @param dst the destination frame. dst is not touched on failure.
-+ * @param src the source frame.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR error code on failure.
-+ */
-+int av_hwframe_transfer_data(AVFrame* dst, const AVFrame* src, int flags);
-+
-+enum AVHWFrameTransferDirection {
-+ /**
-+ * Transfer the data from the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_FROM,
-+
-+ /**
-+ * Transfer the data to the queried hw frame.
-+ */
-+ AV_HWFRAME_TRANSFER_DIRECTION_TO,
-+};
-+
-+/**
-+ * Get a list of possible source or target formats usable in
-+ * av_hwframe_transfer_data().
-+ *
-+ * @param hwframe_ctx the frame context to obtain the information for
-+ * @param dir the direction of the transfer
-+ * @param formats the pointer to the output format list will be written here.
-+ * The list is terminated with AV_PIX_FMT_NONE and must be freed
-+ * by the caller when no longer needed using av_free().
-+ * If this function returns successfully, the format list will
-+ * have at least one item (not counting the terminator).
-+ * On failure, the contents of this pointer are unspecified.
-+ * @param flags currently unused, should be set to zero
-+ * @return 0 on success, a negative AVERROR code on failure.
-+ */
-+int av_hwframe_transfer_get_formats(AVBufferRef* hwframe_ctx,
-+ enum AVHWFrameTransferDirection dir,
-+ enum AVPixelFormat** formats, int flags);
-+
-+/**
-+ * This struct describes the constraints on hardware frames attached to
-+ * a given device with a hardware-specific configuration. This is returned
-+ * by av_hwdevice_get_hwframe_constraints() and must be freed by
-+ * av_hwframe_constraints_free() after use.
-+ */
-+typedef struct AVHWFramesConstraints {
-+ /**
-+ * A list of possible values for format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. This member will always be filled.
-+ */
-+ enum AVPixelFormat* valid_hw_formats;
-+
-+ /**
-+ * A list of possible values for sw_format in the hw_frames_ctx,
-+ * terminated by AV_PIX_FMT_NONE. Can be NULL if this information is
-+ * not known.
-+ */
-+ enum AVPixelFormat* valid_sw_formats;
-+
-+ /**
-+ * The minimum size of frames in this hw_frames_ctx.
-+ * (Zero if not known.)
-+ */
-+ int min_width;
-+ int min_height;
-+
-+ /**
-+ * The maximum size of frames in this hw_frames_ctx.
-+ * (INT_MAX if not known / no limit.)
-+ */
-+ int max_width;
-+ int max_height;
-+} AVHWFramesConstraints;
-+
-+/**
-+ * Allocate a HW-specific configuration structure for a given HW device.
-+ * After use, the user must free all members as required by the specific
-+ * hardware structure being used, then free the structure itself with
-+ * av_free().
-+ *
-+ * @param device_ctx a reference to the associated AVHWDeviceContext.
-+ * @return The newly created HW-specific configuration structure on
-+ * success or NULL on failure.
-+ */
-+void* av_hwdevice_hwconfig_alloc(AVBufferRef* device_ctx);
-+
-+/**
-+ * Get the constraints on HW frames given a device and the HW-specific
-+ * configuration to be used with that device. If no HW-specific
-+ * configuration is provided, returns the maximum possible capabilities
-+ * of the device.
-+ *
-+ * @param ref a reference to the associated AVHWDeviceContext.
-+ * @param hwconfig a filled HW-specific configuration structure, or NULL
-+ * to return the maximum possible capabilities of the device.
-+ * @return AVHWFramesConstraints structure describing the constraints
-+ * on the device, or NULL if not available.
-+ */
-+AVHWFramesConstraints* av_hwdevice_get_hwframe_constraints(
-+ AVBufferRef* ref, const void* hwconfig);
-+
-+/**
-+ * Free an AVHWFrameConstraints structure.
-+ *
-+ * @param constraints The (filled or unfilled) AVHWFrameConstraints structure.
-+ */
-+void av_hwframe_constraints_free(AVHWFramesConstraints** constraints);
-+
-+/**
-+ * Flags to apply to frame mappings.
-+ */
-+enum {
-+ /**
-+ * The mapping must be readable.
-+ */
-+ AV_HWFRAME_MAP_READ = 1 << 0,
-+ /**
-+ * The mapping must be writeable.
-+ */
-+ AV_HWFRAME_MAP_WRITE = 1 << 1,
-+ /**
-+ * The mapped frame will be overwritten completely in subsequent
-+ * operations, so the current frame data need not be loaded. Any values
-+ * which are not overwritten are unspecified.
-+ */
-+ AV_HWFRAME_MAP_OVERWRITE = 1 << 2,
-+ /**
-+ * The mapping must be direct. That is, there must not be any copying in
-+ * the map or unmap steps. Note that performance of direct mappings may
-+ * be much lower than normal memory.
-+ */
-+ AV_HWFRAME_MAP_DIRECT = 1 << 3,
-+};
-+
-+/**
-+ * Map a hardware frame.
-+ *
-+ * This has a number of different possible effects, depending on the format
-+ * and origin of the src and dst frames. On input, src should be a usable
-+ * frame with valid buffers and dst should be blank (typically as just created
-+ * by av_frame_alloc()). src should have an associated hwframe context, and
-+ * dst may optionally have a format and associated hwframe context.
-+ *
-+ * If src was created by mapping a frame from the hwframe context of dst,
-+ * then this function undoes the mapping - dst is replaced by a reference to
-+ * the frame that src was originally mapped from.
-+ *
-+ * If both src and dst have an associated hwframe context, then this function
-+ * attempts to map the src frame from its hardware context to that of dst and
-+ * then fill dst with appropriate data to be usable there. This will only be
-+ * possible if the hwframe contexts and associated devices are compatible -
-+ * given compatible devices, av_hwframe_ctx_create_derived() can be used to
-+ * create a hwframe context for dst in which mapping should be possible.
-+ *
-+ * If src has a hwframe context but dst does not, then the src frame is
-+ * mapped to normal memory and should thereafter be usable as a normal frame.
-+ * If the format is set on dst, then the mapping will attempt to create dst
-+ * with that format and fail if it is not possible. If format is unset (is
-+ * AV_PIX_FMT_NONE) then dst will be mapped with whatever the most appropriate
-+ * format to use is (probably the sw_format of the src hwframe context).
-+ *
-+ * A return value of AVERROR(ENOSYS) indicates that the mapping is not
-+ * possible with the given arguments and hwframe setup, while other return
-+ * values indicate that it failed somehow.
-+ *
-+ * @param dst Destination frame, to contain the mapping.
-+ * @param src Source frame, to be mapped.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_map(AVFrame* dst, const AVFrame* src, int flags);
-+
-+/**
-+ * Create and initialise an AVHWFramesContext as a mapping of another existing
-+ * AVHWFramesContext on a different device.
-+ *
-+ * av_hwframe_ctx_init() should not be called after this.
-+ *
-+ * @param derived_frame_ctx On success, a reference to the newly created
-+ * AVHWFramesContext.
-+ * @param derived_device_ctx A reference to the device to create the new
-+ * AVHWFramesContext on.
-+ * @param source_frame_ctx A reference to an existing AVHWFramesContext
-+ * which will be mapped to the derived context.
-+ * @param flags Some combination of AV_HWFRAME_MAP_* flags, defining the
-+ * mapping parameters to apply to frames which are allocated
-+ * in the derived device.
-+ * @return Zero on success, negative AVERROR code on failure.
-+ */
-+int av_hwframe_ctx_create_derived(AVBufferRef** derived_frame_ctx,
-+ enum AVPixelFormat format,
-+ AVBufferRef* derived_device_ctx,
-+ AVBufferRef* source_frame_ctx, int flags);
-+
-+#endif /* AVUTIL_HWCONTEXT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/hwcontext_vaapi.h
-@@ -0,0 +1,117 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_HWCONTEXT_VAAPI_H
-+#define AVUTIL_HWCONTEXT_VAAPI_H
-+
-+#include <va/va.h>
-+
-+/**
-+ * @file
-+ * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
-+ *
-+ * Dynamic frame pools are supported, but note that any pool used as a render
-+ * target is required to be of fixed size in order to be be usable as an
-+ * argument to vaCreateContext().
-+ *
-+ * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
-+ * with the data pointer set to a VASurfaceID.
-+ */
-+
-+enum {
-+ /**
-+ * The quirks field has been set by the user and should not be detected
-+ * automatically by av_hwdevice_ctx_init().
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
-+ /**
-+ * The driver does not destroy parameter buffers when they are used by
-+ * vaRenderPicture(). Additional code will be required to destroy them
-+ * separately afterwards.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
-+
-+ /**
-+ * The driver does not support the VASurfaceAttribMemoryType attribute,
-+ * so the surface allocation code will not try to use it.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
-+
-+ /**
-+ * The driver does not support surface attributes at all.
-+ * The surface allocation code will never pass them to surface allocation,
-+ * and the results of the vaQuerySurfaceAttributes() call will be faked.
-+ */
-+ AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
-+};
-+
-+/**
-+ * VAAPI connection details.
-+ *
-+ * Allocated as AVHWDeviceContext.hwctx
-+ */
-+typedef struct AVVAAPIDeviceContext {
-+ /**
-+ * The VADisplay handle, to be filled by the user.
-+ */
-+ VADisplay display;
-+ /**
-+ * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
-+ * with reference to a table of known drivers, unless the
-+ * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present. The user
-+ * may need to refer to this field when performing any later
-+ * operations using VAAPI with the same VADisplay.
-+ */
-+ unsigned int driver_quirks;
-+} AVVAAPIDeviceContext;
-+
-+/**
-+ * VAAPI-specific data associated with a frame pool.
-+ *
-+ * Allocated as AVHWFramesContext.hwctx.
-+ */
-+typedef struct AVVAAPIFramesContext {
-+ /**
-+ * Set by the user to apply surface attributes to all surfaces in
-+ * the frame pool. If null, default settings are used.
-+ */
-+ VASurfaceAttrib* attributes;
-+ int nb_attributes;
-+ /**
-+ * The surfaces IDs of all surfaces in the pool after creation.
-+ * Only valid if AVHWFramesContext.initial_pool_size was positive.
-+ * These are intended to be used as the render_targets arguments to
-+ * vaCreateContext().
-+ */
-+ VASurfaceID* surface_ids;
-+ int nb_surfaces;
-+} AVVAAPIFramesContext;
-+
-+/**
-+ * VAAPI hardware pipeline configuration details.
-+ *
-+ * Allocated with av_hwdevice_hwconfig_alloc().
-+ */
-+typedef struct AVVAAPIHWConfig {
-+ /**
-+ * ID of a VAAPI pipeline configuration.
-+ */
-+ VAConfigID config_id;
-+} AVVAAPIHWConfig;
-+
-+#endif /* AVUTIL_HWCONTEXT_VAAPI_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/intfloat.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2011 Mans Rullgard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_INTFLOAT_H
-+#define AVUTIL_INTFLOAT_H
-+
-+#include <stdint.h>
-+#include "attributes.h"
-+
-+union av_intfloat32 {
-+ uint32_t i;
-+ float f;
-+};
-+
-+union av_intfloat64 {
-+ uint64_t i;
-+ double f;
-+};
-+
-+/**
-+ * Reinterpret a 32-bit integer as a float.
-+ */
-+static av_always_inline float av_int2float(uint32_t i) {
-+ union av_intfloat32 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a float as a 32-bit integer.
-+ */
-+static av_always_inline uint32_t av_float2int(float f) {
-+ union av_intfloat32 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+/**
-+ * Reinterpret a 64-bit integer as a double.
-+ */
-+static av_always_inline double av_int2double(uint64_t i) {
-+ union av_intfloat64 v;
-+ v.i = i;
-+ return v.f;
-+}
-+
-+/**
-+ * Reinterpret a double as a 64-bit integer.
-+ */
-+static av_always_inline uint64_t av_double2int(double f) {
-+ union av_intfloat64 v;
-+ v.f = f;
-+ return v.i;
-+}
-+
-+#endif /* AVUTIL_INTFLOAT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/log.h
-@@ -0,0 +1,388 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_LOG_H
-+#define AVUTIL_LOG_H
-+
-+#include <stdarg.h>
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+typedef enum {
-+ AV_CLASS_CATEGORY_NA = 0,
-+ AV_CLASS_CATEGORY_INPUT,
-+ AV_CLASS_CATEGORY_OUTPUT,
-+ AV_CLASS_CATEGORY_MUXER,
-+ AV_CLASS_CATEGORY_DEMUXER,
-+ AV_CLASS_CATEGORY_ENCODER,
-+ AV_CLASS_CATEGORY_DECODER,
-+ AV_CLASS_CATEGORY_FILTER,
-+ AV_CLASS_CATEGORY_BITSTREAM_FILTER,
-+ AV_CLASS_CATEGORY_SWSCALER,
-+ AV_CLASS_CATEGORY_SWRESAMPLER,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT = 40,
-+ AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
-+ AV_CLASS_CATEGORY_DEVICE_OUTPUT,
-+ AV_CLASS_CATEGORY_DEVICE_INPUT,
-+ AV_CLASS_CATEGORY_NB ///< not part of ABI/API
-+} AVClassCategory;
-+
-+#define AV_IS_INPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_INPUT))
-+
-+#define AV_IS_OUTPUT_DEVICE(category) \
-+ (((category) == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT) || \
-+ ((category) == AV_CLASS_CATEGORY_DEVICE_OUTPUT))
-+
-+struct AVOptionRanges;
-+
-+/**
-+ * Describe the class of an AVClass context structure. That is an
-+ * arbitrary struct of which the first field is a pointer to an
-+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
-+ */
-+typedef struct AVClass {
-+ /**
-+ * The name of the class; usually it is the same name as the
-+ * context structure type to which the AVClass is associated.
-+ */
-+ const char* class_name;
-+
-+ /**
-+ * A pointer to a function which returns the name of a context
-+ * instance ctx associated with the class.
-+ */
-+ const char* (*item_name)(void* ctx);
-+
-+ /**
-+ * a pointer to the first option specified in the class if any or NULL
-+ *
-+ * @see av_set_default_options()
-+ */
-+ const struct AVOption* option;
-+
-+ /**
-+ * LIBAVUTIL_VERSION with which this structure was created.
-+ * This is used to allow fields to be added without requiring major
-+ * version bumps everywhere.
-+ */
-+
-+ int version;
-+
-+ /**
-+ * Offset in the structure where log_level_offset is stored.
-+ * 0 means there is no such variable
-+ */
-+ int log_level_offset_offset;
-+
-+ /**
-+ * Offset in the structure where a pointer to the parent context for
-+ * logging is stored. For example a decoder could pass its AVCodecContext
-+ * to eval as such a parent context, which an av_log() implementation
-+ * could then leverage to display the parent context.
-+ * The offset can be NULL.
-+ */
-+ int parent_log_context_offset;
-+
-+ /**
-+ * Category used for visualization (like color)
-+ * This is only set if the category is equal for all objects using this class.
-+ * available since version (51 << 16 | 56 << 8 | 100)
-+ */
-+ AVClassCategory category;
-+
-+ /**
-+ * Callback to return the category.
-+ * available since version (51 << 16 | 59 << 8 | 100)
-+ */
-+ AVClassCategory (*get_category)(void* ctx);
-+
-+ /**
-+ * Callback to return the supported/allowed ranges.
-+ * available since version (52.12)
-+ */
-+ int (*query_ranges)(struct AVOptionRanges**, void* obj, const char* key,
-+ int flags);
-+
-+ /**
-+ * Return next AVOptions-enabled child or NULL
-+ */
-+ void* (*child_next)(void* obj, void* prev);
-+
-+ /**
-+ * Iterate over the AVClasses corresponding to potential AVOptions-enabled
-+ * children.
-+ *
-+ * @param iter pointer to opaque iteration state. The caller must initialize
-+ * *iter to NULL before the first call.
-+ * @return AVClass for the next AVOptions-enabled child or NULL if there are
-+ * no more such children.
-+ *
-+ * @note The difference between child_next and this is that child_next
-+ * iterates over _already existing_ objects, while child_class_iterate
-+ * iterates over _all possible_ children.
-+ */
-+ const struct AVClass* (*child_class_iterate)(void** iter);
-+} AVClass;
-+
-+/**
-+ * @addtogroup lavu_log
-+ *
-+ * @{
-+ *
-+ * @defgroup lavu_log_constants Logging Constants
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Print no output.
-+ */
-+#define AV_LOG_QUIET -8
-+
-+/**
-+ * Something went really wrong and we will crash now.
-+ */
-+#define AV_LOG_PANIC 0
-+
-+/**
-+ * Something went wrong and recovery is not possible.
-+ * For example, no header was found for a format which depends
-+ * on headers or an illegal combination of parameters is used.
-+ */
-+#define AV_LOG_FATAL 8
-+
-+/**
-+ * Something went wrong and cannot losslessly be recovered.
-+ * However, not all future data is affected.
-+ */
-+#define AV_LOG_ERROR 16
-+
-+/**
-+ * Something somehow does not look correct. This may or may not
-+ * lead to problems. An example would be the use of '-vstrict -2'.
-+ */
-+#define AV_LOG_WARNING 24
-+
-+/**
-+ * Standard information.
-+ */
-+#define AV_LOG_INFO 32
-+
-+/**
-+ * Detailed information.
-+ */
-+#define AV_LOG_VERBOSE 40
-+
-+/**
-+ * Stuff which is only useful for libav* developers.
-+ */
-+#define AV_LOG_DEBUG 48
-+
-+/**
-+ * Extremely verbose debugging, useful for libav* development.
-+ */
-+#define AV_LOG_TRACE 56
-+
-+#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * Sets additional colors for extended debugging sessions.
-+ * @code
-+ av_log(ctx, AV_LOG_DEBUG|AV_LOG_C(134), "Message in purple\n");
-+ @endcode
-+ * Requires 256color terminal support. Uses outside debugging is not
-+ * recommended.
-+ */
-+#define AV_LOG_C(x) ((x) << 8)
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ */
-+void av_log(void* avcl, int level, const char* fmt, ...) av_printf_format(3, 4);
-+
-+/**
-+ * Send the specified message to the log once with the initial_level and then
-+ * with the subsequent_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct or NULL if general log.
-+ * @param initial_level importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant" for the first occurance.
-+ * @param subsequent_level importance level of the message expressed using a
-+ * @ref lavu_log_constants "Logging Constant" after the first occurance.
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param state a variable to keep trak of if a message has already been printed
-+ * this must be initialized to 0 before the first use. The same state
-+ * must not be accessed by 2 Threads simultaneously.
-+ */
-+void av_log_once(void* avcl, int initial_level, int subsequent_level,
-+ int* state, const char* fmt, ...) av_printf_format(5, 6);
-+
-+/**
-+ * Send the specified message to the log if the level is less than or equal
-+ * to the current av_log_level. By default, all logging messages are sent to
-+ * stderr. This behavior can be altered by setting a different logging callback
-+ * function.
-+ * @see av_log_set_callback
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_vlog(void* avcl, int level, const char* fmt, va_list vl);
-+
-+/**
-+ * Get the current log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @return Current log level
-+ */
-+int av_log_get_level(void);
-+
-+/**
-+ * Set the log level
-+ *
-+ * @see lavu_log_constants
-+ *
-+ * @param level Logging level
-+ */
-+void av_log_set_level(int level);
-+
-+/**
-+ * Set the logging callback
-+ *
-+ * @note The callback must be thread safe, even if the application does not use
-+ * threads itself as some codecs are multithreaded.
-+ *
-+ * @see av_log_default_callback
-+ *
-+ * @param callback A logging function with a compatible signature.
-+ */
-+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
-+
-+/**
-+ * Default logging callback
-+ *
-+ * It prints the message to stderr, optionally colorizing it.
-+ *
-+ * @param avcl A pointer to an arbitrary struct of which the first field is a
-+ * pointer to an AVClass struct.
-+ * @param level The importance level of the message expressed using a @ref
-+ * lavu_log_constants "Logging Constant".
-+ * @param fmt The format string (printf-compatible) that specifies how
-+ * subsequent arguments are converted to output.
-+ * @param vl The arguments referenced by the format string.
-+ */
-+void av_log_default_callback(void* avcl, int level, const char* fmt,
-+ va_list vl);
-+
-+/**
-+ * Return the context name
-+ *
-+ * @param ctx The AVClass context
-+ *
-+ * @return The AVClass class_name
-+ */
-+const char* av_default_item_name(void* ctx);
-+AVClassCategory av_default_get_category(void* ptr);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line
-+ * @param line_size size of the buffer
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ */
-+void av_log_format_line(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Format a line of log the same way as the default callback.
-+ * @param line buffer to receive the formatted line;
-+ * may be NULL if line_size is 0
-+ * @param line_size size of the buffer; at most line_size-1 characters will
-+ * be written to the buffer, plus one null terminator
-+ * @param print_prefix used to store whether the prefix must be printed;
-+ * must point to a persistent integer initially set to 1
-+ * @return Returns a negative value if an error occurred, otherwise returns
-+ * the number of characters that would have been written for a
-+ * sufficiently large buffer, not including the terminating null
-+ * character. If the return value is not less than line_size, it means
-+ * that the log message was truncated to fit the buffer.
-+ */
-+int av_log_format_line2(void* ptr, int level, const char* fmt, va_list vl,
-+ char* line, int line_size, int* print_prefix);
-+
-+/**
-+ * Skip repeated messages, this requires the user app to use av_log() instead of
-+ * (f)printf as the 2 would otherwise interfere and lead to
-+ * "Last message repeated x times" messages below (f)printf messages with some
-+ * bad luck.
-+ * Also to receive the last, "last repeated" line if any, the user app must
-+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
-+ */
-+#define AV_LOG_SKIP_REPEATED 1
-+
-+/**
-+ * Include the log severity in messages originating from codecs.
-+ *
-+ * Results in messages such as:
-+ * [rawvideo @ 0xDEADBEEF] [error] encode did not produce valid pts
-+ */
-+#define AV_LOG_PRINT_LEVEL 2
-+
-+void av_log_set_flags(int arg);
-+int av_log_get_flags(void);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_LOG_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/macros.h
-@@ -0,0 +1,87 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Utility Preprocessor macros
-+ */
-+
-+#ifndef AVUTIL_MACROS_H
-+#define AVUTIL_MACROS_H
-+
-+#include "libavutil/avconfig.h"
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_NE(be, le) (be)
-+#else
-+# define AV_NE(be, le) (le)
-+#endif
-+
-+/**
-+ * Comparator.
-+ * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0
-+ * if x == y. This is useful for instance in a qsort comparator callback.
-+ * Furthermore, compilers are able to optimize this to branchless code, and
-+ * there is no risk of overflow with signed types.
-+ * As with many macros, this evaluates its argument multiple times, it thus
-+ * must not have a side-effect.
-+ */
-+#define FFDIFFSIGN(x, y) (((x) > (y)) - ((x) < (y)))
-+
-+#define FFMAX(a, b) ((a) > (b) ? (a) : (b))
-+#define FFMAX3(a, b, c) FFMAX(FFMAX(a, b), c)
-+#define FFMIN(a, b) ((a) > (b) ? (b) : (a))
-+#define FFMIN3(a, b, c) FFMIN(FFMIN(a, b), c)
-+
-+#define FFSWAP(type, a, b) \
-+ do { \
-+ type SWAP_tmp = b; \
-+ b = a; \
-+ a = SWAP_tmp; \
-+ } while (0)
-+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-+
-+#define MKTAG(a, b, c, d) \
-+ ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-+#define MKBETAG(a, b, c, d) \
-+ ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-+
-+/**
-+ * @addtogroup preproc_misc Preprocessor String Macros
-+ *
-+ * String manipulation macros
-+ *
-+ * @{
-+ */
-+
-+#define AV_STRINGIFY(s) AV_TOSTRING(s)
-+#define AV_TOSTRING(s) #s
-+
-+#define AV_GLUE(a, b) a##b
-+#define AV_JOIN(a, b) AV_GLUE(a, b)
-+
-+/**
-+ * @}
-+ */
-+
-+#define AV_PRAGMA(s) _Pragma(#s)
-+
-+#define FFALIGN(x, a) (((x) + (a)-1) & ~((a)-1))
-+
-+#endif /* AVUTIL_MACROS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mathematics.h
-@@ -0,0 +1,247 @@
-+/*
-+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @addtogroup lavu_math
-+ * Mathematical utilities for working with timestamp and time base.
-+ */
-+
-+#ifndef AVUTIL_MATHEMATICS_H
-+#define AVUTIL_MATHEMATICS_H
-+
-+#include <stdint.h>
-+#include <math.h>
-+#include "attributes.h"
-+#include "rational.h"
-+#include "intfloat.h"
-+
-+#ifndef M_E
-+# define M_E 2.7182818284590452354 /* e */
-+#endif
-+#ifndef M_LN2
-+# define M_LN2 0.69314718055994530942 /* log_e 2 */
-+#endif
-+#ifndef M_LN10
-+# define M_LN10 2.30258509299404568402 /* log_e 10 */
-+#endif
-+#ifndef M_LOG2_10
-+# define M_LOG2_10 3.32192809488736234787 /* log_2 10 */
-+#endif
-+#ifndef M_PHI
-+# define M_PHI 1.61803398874989484820 /* phi / golden ratio */
-+#endif
-+#ifndef M_PI
-+# define M_PI 3.14159265358979323846 /* pi */
-+#endif
-+#ifndef M_PI_2
-+# define M_PI_2 1.57079632679489661923 /* pi/2 */
-+#endif
-+#ifndef M_SQRT1_2
-+# define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
-+#endif
-+#ifndef M_SQRT2
-+# define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
-+#endif
-+#ifndef NAN
-+# define NAN av_int2float(0x7fc00000)
-+#endif
-+#ifndef INFINITY
-+# define INFINITY av_int2float(0x7f800000)
-+#endif
-+
-+/**
-+ * @addtogroup lavu_math
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rounding methods.
-+ */
-+enum AVRounding {
-+ AV_ROUND_ZERO = 0, ///< Round toward zero.
-+ AV_ROUND_INF = 1, ///< Round away from zero.
-+ AV_ROUND_DOWN = 2, ///< Round toward -infinity.
-+ AV_ROUND_UP = 3, ///< Round toward +infinity.
-+ AV_ROUND_NEAR_INF =
-+ 5, ///< Round to nearest and halfway cases away from zero.
-+ /**
-+ * Flag telling rescaling functions to pass `INT64_MIN`/`MAX` through
-+ * unchanged, avoiding special cases for #AV_NOPTS_VALUE.
-+ *
-+ * Unlike other values of the enumeration AVRounding, this value is a
-+ * bitmask that must be used in conjunction with another value of the
-+ * enumeration through a bitwise OR, in order to set behavior for normal
-+ * cases.
-+ *
-+ * @code{.c}
-+ * av_rescale_rnd(3, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling 3:
-+ * // Calculating 3 * 1 / 2
-+ * // 3 / 2 is rounded up to 2
-+ * // => 2
-+ *
-+ * av_rescale_rnd(AV_NOPTS_VALUE, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-+ * // Rescaling AV_NOPTS_VALUE:
-+ * // AV_NOPTS_VALUE == INT64_MIN
-+ * // AV_NOPTS_VALUE is passed through
-+ * // => AV_NOPTS_VALUE
-+ * @endcode
-+ */
-+ AV_ROUND_PASS_MINMAX = 8192,
-+};
-+
-+/**
-+ * Compute the greatest common divisor of two integer operands.
-+ *
-+ * @param a,b Operands
-+ * @return GCD of a and b up to sign; if a >= 0 and b >= 0, return value is >=
-+ * 0; if a == 0 and b == 0, returns 0.
-+ */
-+int64_t av_const av_gcd(int64_t a, int64_t b);
-+
-+/**
-+ * Rescale a 64-bit integer with rounding to nearest.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow.
-+ *
-+ * This function is equivalent to av_rescale_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale_rnd(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * b / c`, but writing that
-+ * directly can overflow, and does not support different rounding methods.
-+ * If the result is not representable then INT64_MIN is returned.
-+ *
-+ * @see av_rescale(), av_rescale_q(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * This function is equivalent to av_rescale_q_rnd() with #AV_ROUND_NEAR_INF.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q_rnd()
-+ */
-+int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-+
-+/**
-+ * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
-+ *
-+ * The operation is mathematically equivalent to `a * bq / cq`.
-+ *
-+ * @see av_rescale(), av_rescale_rnd(), av_rescale_q()
-+ */
-+int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-+ enum AVRounding rnd) av_const;
-+
-+/**
-+ * Compare two timestamps each in its own time base.
-+ *
-+ * @return One of the following values:
-+ * - -1 if `ts_a` is before `ts_b`
-+ * - 1 if `ts_a` is after `ts_b`
-+ * - 0 if they represent the same position
-+ *
-+ * @warning
-+ * The result of the function is undefined if one of the timestamps is outside
-+ * the `int64_t` range when represented in the other's timebase.
-+ */
-+int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-+
-+/**
-+ * Compare the remainders of two integer operands divided by a common divisor.
-+ *
-+ * In other words, compare the least significant `log2(mod)` bits of integers
-+ * `a` and `b`.
-+ *
-+ * @code{.c}
-+ * av_compare_mod(0x11, 0x02, 0x10) < 0 // since 0x11 % 0x10 (0x1) < 0x02 %
-+ * 0x10 (0x2) av_compare_mod(0x11, 0x02, 0x20) > 0 // since 0x11 % 0x20 (0x11)
-+ * > 0x02 % 0x20 (0x02)
-+ * @endcode
-+ *
-+ * @param a,b Operands
-+ * @param mod Divisor; must be a power of 2
-+ * @return
-+ * - a negative value if `a % mod < b % mod`
-+ * - a positive value if `a % mod > b % mod`
-+ * - zero if `a % mod == b % mod`
-+ */
-+int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-+
-+/**
-+ * Rescale a timestamp while preserving known durations.
-+ *
-+ * This function is designed to be called per audio packet to scale the input
-+ * timestamp to a different time base. Compared to a simple av_rescale_q()
-+ * call, this function is robust against possible inconsistent frame durations.
-+ *
-+ * The `last` parameter is a state variable that must be preserved for all
-+ * subsequent calls for the same stream. For the first call, `*last` should be
-+ * initialized to #AV_NOPTS_VALUE.
-+ *
-+ * @param[in] in_tb Input time base
-+ * @param[in] in_ts Input timestamp
-+ * @param[in] fs_tb Duration time base; typically this is finer-grained
-+ * (greater) than `in_tb` and `out_tb`
-+ * @param[in] duration Duration till the next call to this function (i.e.
-+ * duration of the current packet/frame)
-+ * @param[in,out] last Pointer to a timestamp expressed in terms of
-+ * `fs_tb`, acting as a state variable
-+ * @param[in] out_tb Output timebase
-+ * @return Timestamp expressed in terms of `out_tb`
-+ *
-+ * @note In the context of this function, "duration" is in term of samples, not
-+ * seconds.
-+ */
-+int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb,
-+ int duration, int64_t* last, AVRational out_tb);
-+
-+/**
-+ * Add a value to a timestamp.
-+ *
-+ * This function guarantees that when the same value is repeatly added that
-+ * no accumulation of rounding errors occurs.
-+ *
-+ * @param[in] ts Input timestamp
-+ * @param[in] ts_tb Input timestamp time base
-+ * @param[in] inc Value to be added
-+ * @param[in] inc_tb Time base of `inc`
-+ */
-+int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb,
-+ int64_t inc);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MATHEMATICS_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/mem.h
-@@ -0,0 +1,708 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_mem
-+ * Memory handling functions
-+ */
-+
-+#ifndef AVUTIL_MEM_H
-+#define AVUTIL_MEM_H
-+
-+#include <limits.h>
-+#include <stdint.h>
-+
-+#include "attributes.h"
-+#include "avutil.h"
-+#include "version.h"
-+
-+/**
-+ * @addtogroup lavu_mem
-+ * Utilities for manipulating memory.
-+ *
-+ * FFmpeg has several applications of memory that are not required of a typical
-+ * program. For example, the computing-heavy components like video decoding and
-+ * encoding can be sped up significantly through the use of aligned memory.
-+ *
-+ * However, for each of FFmpeg's applications of memory, there might not be a
-+ * recognized or standardized API for that specific use. Memory alignment, for
-+ * instance, varies wildly depending on operating systems, architectures, and
-+ * compilers. Hence, this component of @ref libavutil is created to make
-+ * dealing with memory consistently possible on all platforms.
-+ *
-+ * @{
-+ */
-+
-+#if FF_API_DECLARE_ALIGNED
-+/**
-+ *
-+ * @defgroup lavu_mem_macros Alignment Macros
-+ * Helper macros for declaring aligned variables.
-+ * @{
-+ */
-+
-+/**
-+ * @def DECLARE_ALIGNED(n,t,v)
-+ * Declare a variable that is aligned in memory.
-+ *
-+ * @code{.c}
-+ * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
-+ * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
-+ *
-+ * // The default-alignment equivalent would be
-+ * uint16_t aligned_int = 42;
-+ * uint8_t aligned_array[128];
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_ALIGNED(n,t,v)
-+ * Declare an aligned variable appropriate for use in inline assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_ALIGNED(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+/**
-+ * @def DECLARE_ASM_CONST(n,t,v)
-+ * Declare a static constant aligned variable appropriate for use in inline
-+ * assembly code.
-+ *
-+ * @code{.c}
-+ * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
-+ * @endcode
-+ *
-+ * @param n Minimum alignment in bytes
-+ * @param t Type of the variable (or array element)
-+ * @param v Name of the variable
-+ */
-+
-+# if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || \
-+ defined(__SUNPRO_C)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) const t __attribute__((aligned(n))) v
-+# elif defined(__DJGPP__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) \
-+ t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(FFMIN(n, 16)))) v
-+# elif defined(__GNUC__) || defined(__clang__)
-+# define DECLARE_ALIGNED(n, t, v) t __attribute__((aligned(n))) v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t av_used __attribute__((aligned(n))) v
-+# define DECLARE_ASM_CONST(n, t, v) \
-+ static const t av_used __attribute__((aligned(n))) v
-+# elif defined(_MSC_VER)
-+# define DECLARE_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) __declspec(align(n)) t v
-+# define DECLARE_ASM_CONST(n, t, v) __declspec(align(n)) static const t v
-+# else
-+# define DECLARE_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_ALIGNED(n, t, v) t v
-+# define DECLARE_ASM_CONST(n, t, v) static const t v
-+# endif
-+
-+/**
-+ * @}
-+ */
-+#endif
-+
-+/**
-+ * @defgroup lavu_mem_attrs Function Attributes
-+ * Function attributes applicable to memory handling functions.
-+ *
-+ * These function attributes can help compilers emit more useful warnings, or
-+ * generate better code.
-+ * @{
-+ */
-+
-+/**
-+ * @def av_malloc_attrib
-+ * Function attribute denoting a malloc-like function.
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `malloc` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(3, 1)
-+# define av_malloc_attrib __attribute__((__malloc__))
-+#else
-+# define av_malloc_attrib
-+#endif
-+
-+/**
-+ * @def av_alloc_size(...)
-+ * Function attribute used on a function that allocates memory, whose size is
-+ * given by the specified parameter(s).
-+ *
-+ * @code{.c}
-+ * void *av_malloc(size_t size) av_alloc_size(1);
-+ * void *av_calloc(size_t nmemb, size_t size) av_alloc_size(1, 2);
-+ * @endcode
-+ *
-+ * @param ... One or two parameter indexes, separated by a comma
-+ *
-+ * @see <a
-+ * href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-...">Function
-+ * attribute `alloc_size` in GCC's documentation</a>
-+ */
-+
-+#if AV_GCC_VERSION_AT_LEAST(4, 3)
-+# define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-+#else
-+# define av_alloc_size(...)
-+#endif
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_funcs Heap Management
-+ * Functions responsible for allocating, freeing, and copying memory.
-+ *
-+ * All memory allocation functions have a built-in upper limit of `INT_MAX`
-+ * bytes. This may be changed with av_max_alloc(), although exercise extreme
-+ * caution when doing so.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU).
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_mallocz()
-+ */
-+void* av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block with alignment suitable for all memory accesses
-+ * (including vectors if available on the CPU) and zero all the bytes of the
-+ * block.
-+ *
-+ * @param size Size in bytes for the memory block to be allocated
-+ * @return Pointer to the allocated block, or `NULL` if it cannot be allocated
-+ * @see av_malloc()
-+ */
-+void* av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-+
-+/**
-+ * Allocate a memory block for an array with av_malloc().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of element
-+ * @param size Size of a single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ * @see av_malloc()
-+ */
-+av_alloc_size(1, 2) void* av_malloc_array(size_t nmemb, size_t size);
-+
-+/**
-+ * Allocate a memory block for an array with av_mallocz().
-+ *
-+ * The allocated memory will have size `size * nmemb` bytes.
-+ *
-+ * @param nmemb Number of elements
-+ * @param size Size of the single element
-+ * @return Pointer to the allocated block, or `NULL` if the block cannot
-+ * be allocated
-+ *
-+ * @see av_mallocz()
-+ * @see av_malloc_array()
-+ */
-+void* av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2);
-+
-+#if FF_API_AV_MALLOCZ_ARRAY
-+/**
-+ * @deprecated use av_calloc()
-+ */
-+attribute_deprecated void* av_mallocz_array(size_t nmemb,
-+ size_t size) av_malloc_attrib
-+ av_alloc_size(1, 2);
-+#endif
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * If `ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param size Size in bytes of the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Pointer to a newly-reallocated block or `NULL` if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the returned pointer is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_fast_realloc()
-+ * @see av_reallocp()
-+ */
-+void* av_realloc(void* ptr, size_t size) av_alloc_size(2);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory through a pointer to a
-+ * pointer.
-+ *
-+ * If `*ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
-+ * zero, free the memory block pointed to by `*ptr`. Otherwise, expand or
-+ * shrink that block of memory according to `size`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already allocated
-+ * with av_realloc(), or a pointer to `NULL`. The pointer
-+ * is updated on success, or freed on failure.
-+ * @param[in] size Size in bytes for the memory block to be allocated or
-+ * reallocated
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+av_warn_unused_result int av_reallocp(void* ptr, size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free a block of memory.
-+ *
-+ * This function does the same thing as av_realloc(), except:
-+ * - It takes two size arguments and allocates `nelem * elsize` bytes,
-+ * after checking the result of the multiplication for integer overflow.
-+ * - It frees the input block in case of failure, thus avoiding the memory
-+ * leak with the classic
-+ * @code{.c}
-+ * buf = realloc(buf);
-+ * if (!buf)
-+ * return -1;
-+ * @endcode
-+ * pattern.
-+ */
-+void* av_realloc_f(void* ptr, size_t nelem, size_t elsize);
-+
-+/**
-+ * Allocate, reallocate, or free an array.
-+ *
-+ * If `ptr` is `NULL` and `nmemb` > 0, allocate a new block. If
-+ * `nmemb` is zero, free the memory block pointed to by `ptr`.
-+ *
-+ * @param ptr Pointer to a memory block already allocated with
-+ * av_realloc() or `NULL`
-+ * @param nmemb Number of elements in the array
-+ * @param size Size of the single element of the array
-+ *
-+ * @return Pointer to a newly-reallocated block or NULL if the block
-+ * cannot be reallocated or the function is used to free the memory
-+ * block
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ * @see av_reallocp_array()
-+ */
-+av_alloc_size(2, 3) void* av_realloc_array(void* ptr, size_t nmemb,
-+ size_t size);
-+
-+/**
-+ * Allocate, reallocate, or free an array through a pointer to a pointer.
-+ *
-+ * If `*ptr` is `NULL` and `nmemb` > 0, allocate a new block. If `nmemb` is
-+ * zero, free the memory block pointed to by `*ptr`.
-+ *
-+ * @param[in,out] ptr Pointer to a pointer to a memory block already
-+ * allocated with av_realloc(), or a pointer to `NULL`.
-+ * The pointer is updated on success, or freed on failure.
-+ * @param[in] nmemb Number of elements
-+ * @param[in] size Size of the single element
-+ *
-+ * @return Zero on success, an AVERROR error code on failure
-+ *
-+ * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-+ * correctly aligned.
-+ */
-+int av_reallocp_array(void* ptr, size_t nmemb, size_t size);
-+
-+/**
-+ * Reallocate the given buffer if it is not large enough, otherwise do nothing.
-+ *
-+ * If the given buffer is `NULL`, then a new uninitialized buffer is allocated.
-+ *
-+ * If the given buffer is not large enough, and reallocation fails, `NULL` is
-+ * returned and `*size` is set to 0, but the original buffer is not changed or
-+ * freed.
-+ *
-+ * A typical use pattern follows:
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * uint8_t *new_buf = av_fast_realloc(buf, ¤t_size, size_needed);
-+ * if (!new_buf) {
-+ * // Allocation failed; clean up original buffer
-+ * av_freep(&buf);
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Already allocated buffer, or `NULL`
-+ * @param[in,out] size Pointer to the size of buffer `ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `ptr`
-+ * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
-+ * buffer if the buffer was not large enough, or `NULL` in case of
-+ * error
-+ * @see av_realloc()
-+ * @see av_fast_malloc()
-+ */
-+void* av_fast_realloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate a buffer, reusing the given one if large enough.
-+ *
-+ * Contrary to av_fast_realloc(), the current buffer contents might not be
-+ * preserved and on error the old buffer is freed, thus no special handling to
-+ * avoid memleaks is necessary.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = ...;
-+ * av_fast_malloc(&buf, ¤t_size, size_needed);
-+ * if (!buf) {
-+ * // Allocation failed; buf already freed
-+ * return AVERROR(ENOMEM);
-+ * }
-+ * @endcode
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_realloc()
-+ * @see av_fast_mallocz()
-+ */
-+void av_fast_malloc(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Allocate and clear a buffer, reusing the given one if large enough.
-+ *
-+ * Like av_fast_malloc(), but all newly allocated space is initially cleared.
-+ * Reused buffer is not cleared.
-+ *
-+ * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
-+ * `size_needed` is greater than 0.
-+ *
-+ * @param[in,out] ptr Pointer to pointer to an already allocated buffer.
-+ * `*ptr` will be overwritten with pointer to new
-+ * buffer on success or `NULL` on failure
-+ * @param[in,out] size Pointer to the size of buffer `*ptr`. `*size` is
-+ * updated to the new allocated size, in particular 0
-+ * in case of failure.
-+ * @param[in] min_size Desired minimal size of buffer `*ptr`
-+ * @see av_fast_malloc()
-+ */
-+void av_fast_mallocz(void* ptr, unsigned int* size, size_t min_size);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family.
-+ *
-+ * @param ptr Pointer to the memory block which should be freed.
-+ *
-+ * @note `ptr = NULL` is explicitly allowed.
-+ * @note It is recommended that you use av_freep() instead, to prevent leaving
-+ * behind dangling pointers.
-+ * @see av_freep()
-+ */
-+void av_free(void* ptr);
-+
-+/**
-+ * Free a memory block which has been allocated with a function of av_malloc()
-+ * or av_realloc() family, and set the pointer pointing to it to `NULL`.
-+ *
-+ * @code{.c}
-+ * uint8_t *buf = av_malloc(16);
-+ * av_free(buf);
-+ * // buf now contains a dangling pointer to freed memory, and accidental
-+ * // dereference of buf will result in a use-after-free, which may be a
-+ * // security risk.
-+ *
-+ * uint8_t *buf = av_malloc(16);
-+ * av_freep(&buf);
-+ * // buf is now NULL, and accidental dereference will only result in a
-+ * // NULL-pointer dereference.
-+ * @endcode
-+ *
-+ * @param ptr Pointer to the pointer to the memory block which should be freed
-+ * @note `*ptr = NULL` is safe and leads to no action.
-+ * @see av_free()
-+ */
-+void av_freep(void* ptr);
-+
-+/**
-+ * Duplicate a string.
-+ *
-+ * @param s String to be duplicated
-+ * @return Pointer to a newly-allocated string containing a
-+ * copy of `s` or `NULL` if the string cannot be allocated
-+ * @see av_strndup()
-+ */
-+char* av_strdup(const char* s) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a substring of a string.
-+ *
-+ * @param s String to be duplicated
-+ * @param len Maximum length of the resulting string (not counting the
-+ * terminating byte)
-+ * @return Pointer to a newly-allocated string containing a
-+ * substring of `s` or `NULL` if the string cannot be allocated
-+ */
-+char* av_strndup(const char* s, size_t len) av_malloc_attrib;
-+
-+/**
-+ * Duplicate a buffer with av_malloc().
-+ *
-+ * @param p Buffer to be duplicated
-+ * @param size Size in bytes of the buffer copied
-+ * @return Pointer to a newly allocated buffer containing a
-+ * copy of `p` or `NULL` if the buffer cannot be allocated
-+ */
-+void* av_memdup(const void* p, size_t size);
-+
-+/**
-+ * Overlapping memcpy() implementation.
-+ *
-+ * @param dst Destination buffer
-+ * @param back Number of bytes back to start copying (i.e. the initial size of
-+ * the overlapping window); must be > 0
-+ * @param cnt Number of bytes to copy; must be >= 0
-+ *
-+ * @note `cnt > back` is valid, this will copy the bytes we just copied,
-+ * thus creating a repeating pattern with a period length of `back`.
-+ */
-+void av_memcpy_backptr(uint8_t* dst, int back, int cnt);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_dynarray Dynamic Array
-+ *
-+ * Utilities to make an array grow when needed.
-+ *
-+ * Sometimes, the programmer would want to have an array that can grow when
-+ * needed. The libavutil dynamic array utilities fill that need.
-+ *
-+ * libavutil supports two systems of appending elements onto a dynamically
-+ * allocated array, the first one storing the pointer to the value in the
-+ * array, and the second storing the value directly. In both systems, the
-+ * caller is responsible for maintaining a variable containing the length of
-+ * the array, as well as freeing of the array after use.
-+ *
-+ * The first system stores pointers to values in a block of dynamically
-+ * allocated memory. Since only pointers are stored, the function does not need
-+ * to know the size of the type. Both av_dynarray_add() and
-+ * av_dynarray_add_nofree() implement this system.
-+ *
-+ * @code
-+ * type **array = NULL; //< an array of pointers to values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * av_dynarray_add(&array, &nb, &to_be_added2);
-+ * if (nb == 0)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // &to_be_added == array[0]
-+ * // &to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * The second system stores the value directly in a block of memory. As a
-+ * result, the function has to know the size of the type. av_dynarray2_add()
-+ * implements this mechanism.
-+ *
-+ * @code
-+ * type *array = NULL; //< an array of values
-+ * int nb = 0; //< a variable to keep track of the length of the array
-+ *
-+ * type to_be_added = ...;
-+ * type to_be_added2 = ...;
-+ *
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array), NULL);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ * memcpy(addr, &to_be_added, sizeof(to_be_added));
-+ *
-+ * // Shortcut of the above.
-+ * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array),
-+ * (const void *)&to_be_added2);
-+ * if (!addr)
-+ * return AVERROR(ENOMEM);
-+ *
-+ * // Now:
-+ * // nb == 2
-+ * // to_be_added == array[0]
-+ * // to_be_added2 == array[1]
-+ *
-+ * av_freep(&array);
-+ * @endcode
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Add the pointer to an element to a dynamic array.
-+ *
-+ * The array to grow is supposed to be an array of pointers to
-+ * structures, and the element to add must be a pointer to an already
-+ * allocated structure.
-+ *
-+ * The array is reallocated when its size reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem Element to add
-+ * @see av_dynarray_add_nofree(), av_dynarray2_add()
-+ */
-+void av_dynarray_add(void* tab_ptr, int* nb_ptr, void* elem);
-+
-+/**
-+ * Add an element to a dynamic array.
-+ *
-+ * Function has the same functionality as av_dynarray_add(),
-+ * but it doesn't free memory on fails. It returns error code
-+ * instead and leave current buffer untouched.
-+ *
-+ * @return >=0 on success, negative otherwise
-+ * @see av_dynarray_add(), av_dynarray2_add()
-+ */
-+av_warn_unused_result int av_dynarray_add_nofree(void* tab_ptr, int* nb_ptr,
-+ void* elem);
-+
-+/**
-+ * Add an element of size `elem_size` to a dynamic array.
-+ *
-+ * The array is reallocated when its number of elements reaches powers of 2.
-+ * Therefore, the amortized cost of adding an element is constant.
-+ *
-+ * In case of success, the pointer to the array is updated in order to
-+ * point to the new grown array, and the number pointed to by `nb_ptr`
-+ * is incremented.
-+ * In case of failure, the array is freed, `*tab_ptr` is set to `NULL` and
-+ * `*nb_ptr` is set to 0.
-+ *
-+ * @param[in,out] tab_ptr Pointer to the array to grow
-+ * @param[in,out] nb_ptr Pointer to the number of elements in the array
-+ * @param[in] elem_size Size in bytes of an element in the array
-+ * @param[in] elem_data Pointer to the data of the element to add. If
-+ * `NULL`, the space of the newly added element is
-+ * allocated but left uninitialized.
-+ *
-+ * @return Pointer to the data of the element to copy in the newly allocated
-+ * space
-+ * @see av_dynarray_add(), av_dynarray_add_nofree()
-+ */
-+void* av_dynarray2_add(void** tab_ptr, int* nb_ptr, size_t elem_size,
-+ const uint8_t* elem_data);
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_mem_misc Miscellaneous Functions
-+ *
-+ * Other functions related to memory allocation.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Multiply two `size_t` values checking for overflow.
-+ *
-+ * @param[in] a,b Operands of multiplication
-+ * @param[out] r Pointer to the result of the operation
-+ * @return 0 on success, AVERROR(EINVAL) on overflow
-+ */
-+int av_size_mult(size_t a, size_t b, size_t* r);
-+
-+/**
-+ * Set the maximum size that may be allocated in one block.
-+ *
-+ * The value specified with this function is effective for all libavutil's @ref
-+ * lavu_mem_funcs "heap management functions."
-+ *
-+ * By default, the max value is defined as `INT_MAX`.
-+ *
-+ * @param max Value to be set as the new maximum size
-+ *
-+ * @warning Exercise extreme caution when using this function. Don't touch
-+ * this if you do not understand the full consequence of doing so.
-+ */
-+void av_max_alloc(size_t max);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_MEM_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/pixfmt.h
-@@ -0,0 +1,808 @@
-+/*
-+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_PIXFMT_H
-+#define AVUTIL_PIXFMT_H
-+
-+/**
-+ * @file
-+ * pixel format definitions
-+ */
-+
-+#include "libavutil/avconfig.h"
-+#include "version.h"
-+
-+#define AVPALETTE_SIZE 1024
-+#define AVPALETTE_COUNT 256
-+
-+/**
-+ * Pixel format.
-+ *
-+ * @note
-+ * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
-+ * color is put together as:
-+ * (A << 24) | (R << 16) | (G << 8) | B
-+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
-+ * big-endian CPUs.
-+ *
-+ * @note
-+ * If the resolution is not a multiple of the chroma subsampling factor
-+ * then the chroma plane resolution must be rounded up.
-+ *
-+ * @par
-+ * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
-+ * image data is stored in AVFrame.data[0]. The palette is transported in
-+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
-+ * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
-+ * also endian-specific). Note also that the individual RGB32 palette
-+ * components stored in AVFrame.data[1] should be in the range 0..255.
-+ * This is important as many custom PAL8 video codecs that were designed
-+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
-+ *
-+ * @par
-+ * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like
-+ * for pal8. This palette is filled in automatically by the function
-+ * allocating the picture.
-+ */
-+enum AVPixelFormat {
-+ AV_PIX_FMT_NONE = -1,
-+ AV_PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-+ AV_PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-+ AV_PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-+ AV_PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y
-+ ///< samples)
-+ AV_PIX_FMT_GRAY8, ///< Y , 8bpp
-+ AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white,
-+ ///< in each byte pixels are ordered from the
-+ ///< msb to the lsb
-+ AV_PIX_FMT_PAL8, ///< 8 bits with AV_PIX_FMT_RGB32 palette
-+ AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV420P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV422P and
-+ ///< setting color_range
-+ AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG),
-+ ///< deprecated in favor of AV_PIX_FMT_YUV444P and
-+ ///< setting color_range
-+ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-+ AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-+ AV_PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
-+ AV_PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb)
-+ AV_PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb)
-+ AV_PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb),
-+ ///< a byte contains two pixels, the first pixel in the byte
-+ ///< is the one composed by the 4 msb bits
-+ AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb)
-+ AV_PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV21, ///< as above, but U and V bytes are swapped
-+
-+ AV_PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-+ AV_PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-+ AV_PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-+ AV_PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-+
-+ AV_PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian
-+ AV_PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian
-+ AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y
-+ ///< samples)
-+ AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in
-+ ///< favor of AV_PIX_FMT_YUV440P and setting color_range
-+ AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2
-+ ///< Y & A samples)
-+ AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ AV_PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< big-endian
-+ AV_PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb),
-+ ///< little-endian
-+ AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< big-endian , X=unused/undefined
-+ AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb),
-+ ///< little-endian, X=unused/undefined
-+
-+ /**
-+ * Hardware acceleration through VA-API, data[3] contains a
-+ * VASurfaceID.
-+ */
-+ AV_PIX_FMT_VAAPI,
-+
-+ AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3]
-+ ///< contains a LPDIRECT3DSURFACE9 pointer
-+
-+ AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< little-endian, X=unused/undefined
-+ AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb),
-+ ///< big-endian, X=unused/undefined
-+ AV_PIX_FMT_YA8, ///< 8 bits gray, 8 bits alpha
-+
-+ AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+ AV_PIX_FMT_GRAY8A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
-+
-+ AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< big-endian
-+ AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the
-+ ///< 2-byte value for each R/G/B component is stored as
-+ ///< little-endian
-+
-+ /**
-+ * The following 12 formats have the disadvantage of needing 1 format for each
-+ * bit depth. Notice that each 9/10 bits sample is stored in 16 bits with
-+ * extra padding. If you want to support multiple bit depths, then using
-+ * AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
-+ */
-+ AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P10BE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P10LE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P10BE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P10LE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P10BE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P10LE, ///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
-+ AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
-+ AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
-+ AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian
-+ AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian
-+ AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian
-+ AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian
-+ AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples)
-+ AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA422P9LE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA444P9BE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), big-endian
-+ AV_PIX_FMT_YUVA444P9LE, ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples), little-endian
-+ AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y & A samples, little-endian)
-+ AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, big-endian)
-+ AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y & A samples, little-endian)
-+
-+ AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3]
-+ ///< contains a VdpVideoSurface
-+
-+ AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< little-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb),
-+ ///< the 2-byte value for each X/Y/Z is stored as
-+ ///< big-endian, the 4 lower bits are set to 0
-+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample
-+ ///< per 2x1 Y samples)
-+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), little-endian
-+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb
-+ ///< sample per 2x1 Y samples), big-endian
-+
-+ AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+ AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as big-endian
-+ AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A,
-+ ///< the 2-byte value for each R/G/B/A component is
-+ ///< stored as little-endian
-+
-+ AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
-+
-+ AV_PIX_FMT_YA16BE, ///< 16 bits gray, 16 bits alpha (big-endian)
-+ AV_PIX_FMT_YA16LE, ///< 16 bits gray, 16 bits alpha (little-endian)
-+
-+ AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp
-+ AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian
-+ AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian
-+ /**
-+ * HW acceleration through QSV, data[3] contains a pointer to the
-+ * mfxFrameSurface1 structure.
-+ */
-+ AV_PIX_FMT_QSV,
-+ /**
-+ * HW acceleration though MMAL, data[3] contains a pointer to the
-+ * MMAL_BUFFER_HEADER_T structure.
-+ */
-+ AV_PIX_FMT_MMAL,
-+
-+ AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11 via old API,
-+ ///< Picture.data[3] contains a
-+ ///< ID3D11VideoDecoderOutputView pointer
-+
-+ /**
-+ * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
-+ * exactly as for system memory frames.
-+ */
-+ AV_PIX_FMT_CUDA,
-+
-+ AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined
-+ AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined
-+ AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined
-+ AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined
-+
-+ AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per
-+ ///< 2x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), big-endian
-+ AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), little-endian
-+ AV_PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big-endian
-+ AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian
-+ AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian
-+ AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian
-+ AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1
-+ ///< Y samples) full scale (JPEG), deprecated in favor
-+ ///< of AV_PIX_FMT_YUV411P and setting color_range
-+
-+ AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_RGGB8, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GBRG8, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_GRBG8, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 8-bit samples
-+ AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line),
-+ ///< 16-bit samples, big-endian
-+ AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, little-endian
-+ AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line),
-+ ///< 16-bit samples, big-endian
-+
-+ AV_PIX_FMT_XVMC, ///< XVideo Motion Acceleration via common packet passing
-+
-+ AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), little-endian
-+ AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per
-+ ///< 1x2 Y samples), big-endian
-+ AV_PIX_FMT_AYUV64LE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), little-endian
-+ AV_PIX_FMT_AYUV64BE, ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y
-+ ///< & A samples), big-endian
-+
-+ AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
-+
-+ AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, little-endian
-+ AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high
-+ ///< bits, zeros in the low bits, big-endian
-+
-+ AV_PIX_FMT_GBRAP12BE, ///< planar GBR 4:4:4:4 48bpp, big-endian
-+ AV_PIX_FMT_GBRAP12LE, ///< planar GBR 4:4:4:4 48bpp, little-endian
-+
-+ AV_PIX_FMT_GBRAP10BE, ///< planar GBR 4:4:4:4 40bpp, big-endian
-+ AV_PIX_FMT_GBRAP10LE, ///< planar GBR 4:4:4:4 40bpp, little-endian
-+
-+ AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec
-+
-+ AV_PIX_FMT_GRAY12BE, ///< Y , 12bpp, big-endian
-+ AV_PIX_FMT_GRAY12LE, ///< Y , 12bpp, little-endian
-+ AV_PIX_FMT_GRAY10BE, ///< Y , 10bpp, big-endian
-+ AV_PIX_FMT_GRAY10LE, ///< Y , 10bpp, little-endian
-+
-+ AV_PIX_FMT_P016LE, ///< like NV12, with 16bpp per component, little-endian
-+ AV_PIX_FMT_P016BE, ///< like NV12, with 16bpp per component, big-endian
-+
-+ /**
-+ * Hardware surfaces for Direct3D11.
-+ *
-+ * This is preferred over the legacy AV_PIX_FMT_D3D11VA_VLD. The new D3D11
-+ * hwaccel API and filtering support AV_PIX_FMT_D3D11 only.
-+ *
-+ * data[0] contains a ID3D11Texture2D pointer, and data[1] contains the
-+ * texture array index of the frame as intptr_t if the ID3D11Texture2D is
-+ * an array texture (or always 0 if it's a normal texture).
-+ */
-+ AV_PIX_FMT_D3D11,
-+
-+ AV_PIX_FMT_GRAY9BE, ///< Y , 9bpp, big-endian
-+ AV_PIX_FMT_GRAY9LE, ///< Y , 9bpp, little-endian
-+
-+ AV_PIX_FMT_GBRPF32BE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< big-endian
-+ AV_PIX_FMT_GBRPF32LE, ///< IEEE-754 single precision planar GBR 4:4:4, 96bpp,
-+ ///< little-endian
-+ AV_PIX_FMT_GBRAPF32BE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, big-endian
-+ AV_PIX_FMT_GBRAPF32LE, ///< IEEE-754 single precision planar GBRA 4:4:4:4,
-+ ///< 128bpp, little-endian
-+
-+ /**
-+ * DRM-managed buffers exposed through PRIME buffer sharing.
-+ *
-+ * data[0] points to an AVDRMFrameDescriptor.
-+ */
-+ AV_PIX_FMT_DRM_PRIME,
-+ /**
-+ * Hardware surfaces for OpenCL.
-+ *
-+ * data[i] contain 2D image objects (typed in C as cl_mem, used
-+ * in OpenCL as image2d_t) for each plane of the surface.
-+ */
-+ AV_PIX_FMT_OPENCL,
-+
-+ AV_PIX_FMT_GRAY14BE, ///< Y , 14bpp, big-endian
-+ AV_PIX_FMT_GRAY14LE, ///< Y , 14bpp, little-endian
-+
-+ AV_PIX_FMT_GRAYF32BE, ///< IEEE-754 single precision Y, 32bpp, big-endian
-+ AV_PIX_FMT_GRAYF32LE, ///< IEEE-754 single precision Y, 32bpp, little-endian
-+
-+ AV_PIX_FMT_YUVA422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per
-+ ///< 2x1 Y samples), 12b alpha, little-endian
-+ AV_PIX_FMT_YUVA444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, big-endian
-+ AV_PIX_FMT_YUVA444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per
-+ ///< 1x1 Y samples), 12b alpha, little-endian
-+
-+ AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for
-+ ///< the UV components, which are interleaved (first byte U
-+ ///< and the following byte V)
-+ AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
-+
-+ /**
-+ * Vulkan hardware images.
-+ *
-+ * data[0] points to an AVVkFrame
-+ */
-+ AV_PIX_FMT_VULKAN,
-+
-+ AV_PIX_FMT_Y210BE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, big-endian
-+ AV_PIX_FMT_Y210LE, ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the
-+ ///< high bits, little-endian
-+
-+ AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G
-+ ///< 10B(lsb), big-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), little-endian, X=unused/undefined
-+ AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G
-+ ///< 10R(lsb), big-endian, X=unused/undefined
-+
-+ AV_PIX_FMT_P210BE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P210LE, ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P410BE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, big-endian
-+ AV_PIX_FMT_P410LE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high
-+ ///< bits, little-endian
-+
-+ AV_PIX_FMT_P216BE, ///< interleaved chroma YUV 4:2:2, 32bpp, big-endian
-+ AV_PIX_FMT_P216LE, ///< interleaved chroma YUV 4:2:2, 32bpp, liddle-endian
-+
-+ AV_PIX_FMT_P416BE, ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian
-+ AV_PIX_FMT_P416LE, ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian
-+
-+ AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to
-+ ///< link with shared libav* because the number of formats
-+ ///< might differ between versions
-+};
-+
-+#if AV_HAVE_BIGENDIAN
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-+#else
-+# define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-+#endif
-+
-+#define AV_PIX_FMT_RGB32 AV_PIX_FMT_NE(ARGB, BGRA)
-+#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-+#define AV_PIX_FMT_BGR32 AV_PIX_FMT_NE(ABGR, RGBA)
-+#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-+#define AV_PIX_FMT_0RGB32 AV_PIX_FMT_NE(0RGB, BGR0)
-+#define AV_PIX_FMT_0BGR32 AV_PIX_FMT_NE(0BGR, RGB0)
-+
-+#define AV_PIX_FMT_GRAY9 AV_PIX_FMT_NE(GRAY9BE, GRAY9LE)
-+#define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
-+#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
-+#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
-+#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-+#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE)
-+#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE)
-+#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-+#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-+#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-+#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-+#define AV_PIX_FMT_BGR48 AV_PIX_FMT_NE(BGR48BE, BGR48LE)
-+#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-+#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-+#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-+#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
-+
-+#define AV_PIX_FMT_YUV420P9 AV_PIX_FMT_NE(YUV420P9BE, YUV420P9LE)
-+#define AV_PIX_FMT_YUV422P9 AV_PIX_FMT_NE(YUV422P9BE, YUV422P9LE)
-+#define AV_PIX_FMT_YUV444P9 AV_PIX_FMT_NE(YUV444P9BE, YUV444P9LE)
-+#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-+#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-+#define AV_PIX_FMT_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE)
-+#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-+#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
-+#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
-+#define AV_PIX_FMT_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE)
-+#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
-+#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
-+#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
-+#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
-+#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-+#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-+#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-+
-+#define AV_PIX_FMT_GBRP9 AV_PIX_FMT_NE(GBRP9BE, GBRP9LE)
-+#define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE)
-+#define AV_PIX_FMT_GBRP12 AV_PIX_FMT_NE(GBRP12BE, GBRP12LE)
-+#define AV_PIX_FMT_GBRP14 AV_PIX_FMT_NE(GBRP14BE, GBRP14LE)
-+#define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE)
-+#define AV_PIX_FMT_GBRAP10 AV_PIX_FMT_NE(GBRAP10BE, GBRAP10LE)
-+#define AV_PIX_FMT_GBRAP12 AV_PIX_FMT_NE(GBRAP12BE, GBRAP12LE)
-+#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE)
-+
-+#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE, BAYER_BGGR16LE)
-+#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE, BAYER_RGGB16LE)
-+#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE, BAYER_GBRG16LE)
-+#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE, BAYER_GRBG16LE)
-+
-+#define AV_PIX_FMT_GBRPF32 AV_PIX_FMT_NE(GBRPF32BE, GBRPF32LE)
-+#define AV_PIX_FMT_GBRAPF32 AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
-+
-+#define AV_PIX_FMT_GRAYF32 AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
-+
-+#define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE, YUVA420P9LE)
-+#define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE, YUVA422P9LE)
-+#define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE, YUVA444P9LE)
-+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-+#define AV_PIX_FMT_YUVA422P12 AV_PIX_FMT_NE(YUVA422P12BE, YUVA422P12LE)
-+#define AV_PIX_FMT_YUVA444P12 AV_PIX_FMT_NE(YUVA444P12BE, YUVA444P12LE)
-+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-+
-+#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
-+#define AV_PIX_FMT_AYUV64 AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
-+#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE)
-+#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)
-+
-+#define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE)
-+#define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE)
-+#define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE)
-+
-+#define AV_PIX_FMT_P210 AV_PIX_FMT_NE(P210BE, P210LE)
-+#define AV_PIX_FMT_P410 AV_PIX_FMT_NE(P410BE, P410LE)
-+#define AV_PIX_FMT_P216 AV_PIX_FMT_NE(P216BE, P216LE)
-+#define AV_PIX_FMT_P416 AV_PIX_FMT_NE(P416BE, P416LE)
-+
-+/**
-+ * Chromaticity coordinates of the source primaries.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.1 and
-+ * ITU-T H.273.
-+ */
-+enum AVColorPrimaries {
-+ AVCOL_PRI_RESERVED0 = 0,
-+ AVCOL_PRI_BT709 =
-+ 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP 177 Annex B
-+ AVCOL_PRI_UNSPECIFIED = 2,
-+ AVCOL_PRI_RESERVED = 3,
-+ AVCOL_PRI_BT470M =
-+ 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+
-+ AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM
-+ AVCOL_PRI_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
-+ AVCOL_PRI_SMPTE240M =
-+ 7, ///< identical to above, also called "SMPTE C" even though it uses D65
-+ AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C
-+ AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020
-+ AVCOL_PRI_SMPTE428 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
-+ AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428,
-+ AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
-+ AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
-+ AVCOL_PRI_EBU3213 = 22, ///< EBU Tech. 3213-E (nothing there) / one of JEDEC
-+ ///< P22 group phosphors
-+ AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213,
-+ AVCOL_PRI_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Color Transfer Characteristic.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.2.
-+ */
-+enum AVColorTransferCharacteristic {
-+ AVCOL_TRC_RESERVED0 = 0,
-+ AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361
-+ AVCOL_TRC_UNSPECIFIED = 2,
-+ AVCOL_TRC_RESERVED = 3,
-+ AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-+ AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG
-+ AVCOL_TRC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358
-+ ///< 525 or 625 / ITU-R BT1700 NTSC
-+ AVCOL_TRC_SMPTE240M = 7,
-+ AVCOL_TRC_LINEAR = 8, ///< "Linear transfer characteristics"
-+ AVCOL_TRC_LOG = 9, ///< "Logarithmic transfer characteristic (100:1 range)"
-+ AVCOL_TRC_LOG_SQRT =
-+ 10, ///< "Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)"
-+ AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-+ AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut
-+ AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-+ AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10-bit system
-+ AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12-bit system
-+ AVCOL_TRC_SMPTE2084 =
-+ 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
-+ AVCOL_TRC_SMPTEST2084 = AVCOL_TRC_SMPTE2084,
-+ AVCOL_TRC_SMPTE428 = 17, ///< SMPTE ST 428-1
-+ AVCOL_TRC_SMPTEST428_1 = AVCOL_TRC_SMPTE428,
-+ AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma"
-+ AVCOL_TRC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * YUV colorspace type.
-+ * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.3.
-+ */
-+enum AVColorSpace {
-+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC
-+ ///< 61966-2-1 (sRGB), YZX and ST 428-1
-+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 /
-+ ///< derived in SMPTE RP 177 Annex B
-+ AVCOL_SPC_UNSPECIFIED = 2,
-+ AVCOL_SPC_RESERVED =
-+ 3, ///< reserved for future use by ITU-T and ISO/IEC just like 15-255 are
-+ AVCOL_SPC_FCC =
-+ 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-+ AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R
-+ ///< BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-+ AVCOL_SPC_SMPTE170M =
-+ 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC /
-+ ///< functionally identical to above
-+ AVCOL_SPC_SMPTE240M =
-+ 7, ///< derived from 170M primaries and D65 white point, 170M is derived
-+ ///< from BT470 System M's primaries
-+ AVCOL_SPC_YCGCO =
-+ 8, ///< used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-+ AVCOL_SPC_YCOCG = AVCOL_SPC_YCGCO,
-+ AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system
-+ AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system
-+ AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x
-+ AVCOL_SPC_CHROMA_DERIVED_NCL =
-+ 12, ///< Chromaticity-derived non-constant luminance system
-+ AVCOL_SPC_CHROMA_DERIVED_CL =
-+ 13, ///< Chromaticity-derived constant luminance system
-+ AVCOL_SPC_ICTCP = 14, ///< ITU-R BT.2100-0, ICtCp
-+ AVCOL_SPC_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Visual content value range.
-+ *
-+ * These values are based on definitions that can be found in multiple
-+ * specifications, such as ITU-T BT.709 (3.4 - Quantization of RGB, luminance
-+ * and colour-difference signals), ITU-T BT.2020 (Table 5 - Digital
-+ * Representation) as well as ITU-T BT.2100 (Table 9 - Digital 10- and 12-bit
-+ * integer representation). At the time of writing, the BT.2100 one is
-+ * recommended, as it also defines the full range representation.
-+ *
-+ * Common definitions:
-+ * - For RGB and luma planes such as Y in YCbCr and I in ICtCp,
-+ * 'E' is the original value in range of 0.0 to 1.0.
-+ * - For chroma planes such as Cb,Cr and Ct,Cp, 'E' is the original
-+ * value in range of -0.5 to 0.5.
-+ * - 'n' is the output bit depth.
-+ * - For additional definitions such as rounding and clipping to valid n
-+ * bit unsigned integer range, please refer to BT.2100 (Table 9).
-+ */
-+enum AVColorRange {
-+ AVCOL_RANGE_UNSPECIFIED = 0,
-+
-+ /**
-+ * Narrow or limited range content.
-+ *
-+ * - For luma planes:
-+ *
-+ * (219 * E + 16) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-235 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (224 * E + 128) * 2^(n-8)
-+ *
-+ * F.ex. the range of 16-240 for 8 bits
-+ */
-+ AVCOL_RANGE_MPEG = 1,
-+
-+ /**
-+ * Full range content.
-+ *
-+ * - For RGB and luma planes:
-+ *
-+ * (2^n - 1) * E
-+ *
-+ * F.ex. the range of 0-255 for 8 bits
-+ *
-+ * - For chroma planes:
-+ *
-+ * (2^n - 1) * E + 2^(n - 1)
-+ *
-+ * F.ex. the range of 1-255 for 8 bits
-+ */
-+ AVCOL_RANGE_JPEG = 2,
-+ AVCOL_RANGE_NB ///< Not part of ABI
-+};
-+
-+/**
-+ * Location of chroma samples.
-+ *
-+ * Illustration showing the location of the first (top left) chroma sample of
-+ *the image, the left shows only luma, the right shows the location of the
-+ *chroma sample, the 2 could be imagined to overlay each other but are drawn
-+ *separately due to limitations of ASCII
-+ *
-+ * 1st 2nd 1st 2nd horizontal luma sample positions
-+ * v v v v
-+ * ______ ______
-+ *1st luma line > |X X ... |3 4 X ... X are luma samples,
-+ * | |1 2 1-6 are possible chroma positions
-+ *2nd luma line > |X X ... |5 6 X ... 0 is undefined/unknown position
-+ */
-+enum AVChromaLocation {
-+ AVCHROMA_LOC_UNSPECIFIED = 0,
-+ AVCHROMA_LOC_LEFT = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0
-+ AVCHROMA_LOC_CENTER = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0
-+ AVCHROMA_LOC_TOPLEFT =
-+ 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2
-+ AVCHROMA_LOC_TOP = 4,
-+ AVCHROMA_LOC_BOTTOMLEFT = 5,
-+ AVCHROMA_LOC_BOTTOM = 6,
-+ AVCHROMA_LOC_NB ///< Not part of ABI
-+};
-+
-+#endif /* AVUTIL_PIXFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/rational.h
-@@ -0,0 +1,221 @@
-+/*
-+ * rational numbers
-+ * Copyright (c) 2003 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu_math_rational
-+ * Utilties for rational number calculation.
-+ * @author Michael Niedermayer <michaelni(a)gmx.at>
-+ */
-+
-+#ifndef AVUTIL_RATIONAL_H
-+#define AVUTIL_RATIONAL_H
-+
-+#include <stdint.h>
-+#include <limits.h>
-+#include "attributes.h"
-+
-+/**
-+ * @defgroup lavu_math_rational AVRational
-+ * @ingroup lavu_math
-+ * Rational number calculation.
-+ *
-+ * While rational numbers can be expressed as floating-point numbers, the
-+ * conversion process is a lossy one, so are floating-point operations. On the
-+ * other hand, the nature of FFmpeg demands highly accurate calculation of
-+ * timestamps. This set of rational number utilities serves as a generic
-+ * interface for manipulating rational numbers as pairs of numerators and
-+ * denominators.
-+ *
-+ * Many of the functions that operate on AVRational's have the suffix `_q`, in
-+ * reference to the mathematical symbol "ℚ" (Q) which denotes the set of all
-+ * rational numbers.
-+ *
-+ * @{
-+ */
-+
-+/**
-+ * Rational number (pair of numerator and denominator).
-+ */
-+typedef struct AVRational {
-+ int num; ///< Numerator
-+ int den; ///< Denominator
-+} AVRational;
-+
-+/**
-+ * Create an AVRational.
-+ *
-+ * Useful for compilers that do not support compound literals.
-+ *
-+ * @note The return value is not reduced.
-+ * @see av_reduce()
-+ */
-+static inline AVRational av_make_q(int num, int den) {
-+ AVRational r = {num, den};
-+ return r;
-+}
-+
-+/**
-+ * Compare two rationals.
-+ *
-+ * @param a First rational
-+ * @param b Second rational
-+ *
-+ * @return One of the following values:
-+ * - 0 if `a == b`
-+ * - 1 if `a > b`
-+ * - -1 if `a < b`
-+ * - `INT_MIN` if one of the values is of the form `0 / 0`
-+ */
-+static inline int av_cmp_q(AVRational a, AVRational b) {
-+ const int64_t tmp = a.num * (int64_t)b.den - b.num * (int64_t)a.den;
-+
-+ if (tmp)
-+ return (int)((tmp ^ a.den ^ b.den) >> 63) | 1;
-+ else if (b.den && a.den)
-+ return 0;
-+ else if (a.num && b.num)
-+ return (a.num >> 31) - (b.num >> 31);
-+ else
-+ return INT_MIN;
-+}
-+
-+/**
-+ * Convert an AVRational to a `double`.
-+ * @param a AVRational to convert
-+ * @return `a` in floating-point form
-+ * @see av_d2q()
-+ */
-+static inline double av_q2d(AVRational a) { return a.num / (double)a.den; }
-+
-+/**
-+ * Reduce a fraction.
-+ *
-+ * This is useful for framerate calculations.
-+ *
-+ * @param[out] dst_num Destination numerator
-+ * @param[out] dst_den Destination denominator
-+ * @param[in] num Source numerator
-+ * @param[in] den Source denominator
-+ * @param[in] max Maximum allowed values for `dst_num` & `dst_den`
-+ * @return 1 if the operation is exact, 0 otherwise
-+ */
-+int av_reduce(int* dst_num, int* dst_den, int64_t num, int64_t den,
-+ int64_t max);
-+
-+/**
-+ * Multiply two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b*c
-+ */
-+AVRational av_mul_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Divide one rational by another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b/c
-+ */
-+AVRational av_div_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Add two rationals.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b+c
-+ */
-+AVRational av_add_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Subtract one rational from another.
-+ * @param b First rational
-+ * @param c Second rational
-+ * @return b-c
-+ */
-+AVRational av_sub_q(AVRational b, AVRational c) av_const;
-+
-+/**
-+ * Invert a rational.
-+ * @param q value
-+ * @return 1 / q
-+ */
-+static av_always_inline AVRational av_inv_q(AVRational q) {
-+ AVRational r = {q.den, q.num};
-+ return r;
-+}
-+
-+/**
-+ * Convert a double precision floating point number to a rational.
-+ *
-+ * In case of infinity, the returned value is expressed as `{1, 0}` or
-+ * `{-1, 0}` depending on the sign.
-+ *
-+ * @param d `double` to convert
-+ * @param max Maximum allowed numerator and denominator
-+ * @return `d` in AVRational form
-+ * @see av_q2d()
-+ */
-+AVRational av_d2q(double d, int max) av_const;
-+
-+/**
-+ * Find which of the two rationals is closer to another rational.
-+ *
-+ * @param q Rational to be compared against
-+ * @param q1,q2 Rationals to be tested
-+ * @return One of the following values:
-+ * - 1 if `q1` is nearer to `q` than `q2`
-+ * - -1 if `q2` is nearer to `q` than `q1`
-+ * - 0 if they have the same distance
-+ */
-+int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-+
-+/**
-+ * Find the value in a list of rationals nearest a given reference rational.
-+ *
-+ * @param q Reference rational
-+ * @param q_list Array of rationals terminated by `{0, 0}`
-+ * @return Index of the nearest value found in the array
-+ */
-+int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-+
-+/**
-+ * Convert an AVRational to a IEEE 32-bit `float` expressed in fixed-point
-+ * format.
-+ *
-+ * @param q Rational to be converted
-+ * @return Equivalent floating-point value, expressed as an unsigned 32-bit
-+ * integer.
-+ * @note The returned value is platform-indepedant.
-+ */
-+uint32_t av_q2intfloat(AVRational q);
-+
-+/**
-+ * Return the best rational so that a and b are multiple of it.
-+ * If the resulting denominator is larger than max_den, return def.
-+ */
-+AVRational av_gcd_q(AVRational a, AVRational b, int max_den, AVRational def);
-+
-+/**
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_RATIONAL_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/samplefmt.h
-@@ -0,0 +1,276 @@
-+/*
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_SAMPLEFMT_H
-+#define AVUTIL_SAMPLEFMT_H
-+
-+#include <stdint.h>
-+
-+#include "avutil.h"
-+#include "attributes.h"
-+
-+/**
-+ * @addtogroup lavu_audio
-+ * @{
-+ *
-+ * @defgroup lavu_sampfmts Audio sample formats
-+ *
-+ * Audio sample format enumeration and related convenience functions.
-+ * @{
-+ */
-+
-+/**
-+ * Audio sample formats
-+ *
-+ * - The data described by the sample format is always in native-endian order.
-+ * Sample values can be expressed by native C types, hence the lack of a
-+ * signed 24-bit sample format even though it is a common raw audio data format.
-+ *
-+ * - The floating-point formats are based on full volume being in the range
-+ * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
-+ *
-+ * - The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
-+ * (such as AVFrame in libavcodec) is as follows:
-+ *
-+ * @par
-+ * For planar sample formats, each audio channel is in a separate data plane,
-+ * and linesize is the buffer size, in bytes, for a single plane. All data
-+ * planes must be the same size. For packed sample formats, only the first data
-+ * plane is used, and samples for each channel are interleaved. In this case,
-+ * linesize is the buffer size, in bytes, for the 1 plane.
-+ *
-+ */
-+enum AVSampleFormat {
-+ AV_SAMPLE_FMT_NONE = -1,
-+ AV_SAMPLE_FMT_U8, ///< unsigned 8 bits
-+ AV_SAMPLE_FMT_S16, ///< signed 16 bits
-+ AV_SAMPLE_FMT_S32, ///< signed 32 bits
-+ AV_SAMPLE_FMT_FLT, ///< float
-+ AV_SAMPLE_FMT_DBL, ///< double
-+
-+ AV_SAMPLE_FMT_U8P, ///< unsigned 8 bits, planar
-+ AV_SAMPLE_FMT_S16P, ///< signed 16 bits, planar
-+ AV_SAMPLE_FMT_S32P, ///< signed 32 bits, planar
-+ AV_SAMPLE_FMT_FLTP, ///< float, planar
-+ AV_SAMPLE_FMT_DBLP, ///< double, planar
-+ AV_SAMPLE_FMT_S64, ///< signed 64 bits
-+ AV_SAMPLE_FMT_S64P, ///< signed 64 bits, planar
-+
-+ AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if linking
-+ ///< dynamically
-+};
-+
-+/**
-+ * Return the name of sample_fmt, or NULL if sample_fmt is not
-+ * recognized.
-+ */
-+const char* av_get_sample_fmt_name(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return a sample format corresponding to name, or AV_SAMPLE_FMT_NONE
-+ * on error.
-+ */
-+enum AVSampleFormat av_get_sample_fmt(const char* name);
-+
-+/**
-+ * Return the planar<->packed alternative form of the given sample format, or
-+ * AV_SAMPLE_FMT_NONE on error. If the passed sample_fmt is already in the
-+ * requested planar/packed format, the format returned is the same as the
-+ * input.
-+ */
-+enum AVSampleFormat av_get_alt_sample_fmt(enum AVSampleFormat sample_fmt,
-+ int planar);
-+
-+/**
-+ * Get the packed alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in packed format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the packed alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the planar alternative form of the given sample format.
-+ *
-+ * If the passed sample_fmt is already in planar format, the format returned is
-+ * the same as the input.
-+ *
-+ * @return the planar alternative form of the given sample format or
-+ AV_SAMPLE_FMT_NONE on error.
-+ */
-+enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Generate a string corresponding to the sample format with
-+ * sample_fmt, or a header if sample_fmt is negative.
-+ *
-+ * @param buf the buffer where to write the string
-+ * @param buf_size the size of buf
-+ * @param sample_fmt the number of the sample format to print the
-+ * corresponding info string, or a negative value to print the
-+ * corresponding header.
-+ * @return the pointer to the filled buffer or NULL if sample_fmt is
-+ * unknown or in case of other errors
-+ */
-+char* av_get_sample_fmt_string(char* buf, int buf_size,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Return number of bytes per sample.
-+ *
-+ * @param sample_fmt the sample format
-+ * @return number of bytes per sample or zero if unknown for the given
-+ * sample format
-+ */
-+int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Check if the sample format is planar.
-+ *
-+ * @param sample_fmt the sample format to inspect
-+ * @return 1 if the sample format is planar, 0 if it is interleaved
-+ */
-+int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Get the required buffer size for the given audio parameters.
-+ *
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return required buffer size, or negative error code on failure
-+ */
-+int av_samples_get_buffer_size(int* linesize, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * @}
-+ *
-+ * @defgroup lavu_sampmanip Samples manipulation
-+ *
-+ * Functions that manipulate audio samples
-+ * @{
-+ */
-+
-+/**
-+ * Fill plane data pointers and linesize for samples with sample
-+ * format sample_fmt.
-+ *
-+ * The audio_data array is filled with the pointers to the samples data planes:
-+ * for planar, set the start point of each channel's data within the buffer,
-+ * for packed, set the start point of the entire buffer only.
-+ *
-+ * The value pointed to by linesize is set to the aligned size of each
-+ * channel's data buffer for planar layout, or to the aligned size of the
-+ * buffer for all channels for packed layout.
-+ *
-+ * The buffer in buf must be big enough to contain all the samples
-+ * (use av_samples_get_buffer_size() to compute its minimum size),
-+ * otherwise the audio_data pointers will point to invalid data.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize calculated linesize, may be NULL
-+ * @param buf the pointer to a buffer containing the samples
-+ * @param nb_channels the number of channels
-+ * @param nb_samples the number of samples in a single channel
-+ * @param sample_fmt the sample format
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return minimum size in bytes required for the buffer on
-+ * success, or a negative error code on failure
-+ */
-+int av_samples_fill_arrays(uint8_t** audio_data, int* linesize,
-+ const uint8_t* buf, int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a samples buffer for nb_samples samples, and fill data pointers and
-+ * linesize accordingly.
-+ * The allocated samples buffer can be freed by using av_freep(&audio_data[0])
-+ * Allocated data will be initialized to silence.
-+ *
-+ * @see enum AVSampleFormat
-+ * The documentation for AVSampleFormat describes the data layout.
-+ *
-+ * @param[out] audio_data array to be filled with the pointer for each channel
-+ * @param[out] linesize aligned size for audio buffer(s), may be NULL
-+ * @param nb_channels number of audio channels
-+ * @param nb_samples number of samples per channel
-+ * @param align buffer size alignment (0 = default, 1 = no alignment)
-+ * @return >=0 on success or a negative error code on failure
-+ * @todo return the size of the allocated buffer in case of success at the next
-+ * bump
-+ * @see av_samples_fill_arrays()
-+ * @see av_samples_alloc_array_and_samples()
-+ */
-+int av_samples_alloc(uint8_t** audio_data, int* linesize, int nb_channels,
-+ int nb_samples, enum AVSampleFormat sample_fmt, int align);
-+
-+/**
-+ * Allocate a data pointers array, samples buffer for nb_samples
-+ * samples, and fill data pointers and linesize accordingly.
-+ *
-+ * This is the same as av_samples_alloc(), but also allocates the data
-+ * pointers array.
-+ *
-+ * @see av_samples_alloc()
-+ */
-+int av_samples_alloc_array_and_samples(uint8_t*** audio_data, int* linesize,
-+ int nb_channels, int nb_samples,
-+ enum AVSampleFormat sample_fmt,
-+ int align);
-+
-+/**
-+ * Copy samples from src to dst.
-+ *
-+ * @param dst destination array of pointers to data planes
-+ * @param src source array of pointers to data planes
-+ * @param dst_offset offset in samples at which the data will be written to dst
-+ * @param src_offset offset in samples at which the data will be read from src
-+ * @param nb_samples number of samples to be copied
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_copy(uint8_t** dst, uint8_t* const* src, int dst_offset,
-+ int src_offset, int nb_samples, int nb_channels,
-+ enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * Fill an audio buffer with silence.
-+ *
-+ * @param audio_data array of pointers to data planes
-+ * @param offset offset in samples at which to start filling
-+ * @param nb_samples number of samples to fill
-+ * @param nb_channels number of audio channels
-+ * @param sample_fmt audio sample format
-+ */
-+int av_samples_set_silence(uint8_t** audio_data, int offset, int nb_samples,
-+ int nb_channels, enum AVSampleFormat sample_fmt);
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+#endif /* AVUTIL_SAMPLEFMT_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/include/libavutil/version.h
-@@ -0,0 +1,118 @@
-+/*
-+ * copyright (c) 2003 Fabrice Bellard
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+/**
-+ * @file
-+ * @ingroup lavu
-+ * Libavutil version macros
-+ */
-+
-+#ifndef AVUTIL_VERSION_H
-+#define AVUTIL_VERSION_H
-+
-+#include "macros.h"
-+
-+/**
-+ * @addtogroup version_utils
-+ *
-+ * Useful to check and match library version in order to maintain
-+ * backward compatibility.
-+ *
-+ * The FFmpeg libraries follow a versioning sheme very similar to
-+ * Semantic Versioning (http://semver.org/)
-+ * The difference is that the component called PATCH is called MICRO in FFmpeg
-+ * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
-+ * Also we do not increase MICRO for every bugfix or change in git master.
-+ *
-+ * Prior to FFmpeg 3.2 point releases did not change any lib version number to
-+ * avoid aliassing different git master checkouts.
-+ * Starting with FFmpeg 3.2, the released library versions will occupy
-+ * a separate MAJOR.MINOR that is not used on the master development branch.
-+ * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
-+ * for the release and master will continue at 55.12.100 after it. Each new
-+ * point release will then bump the MICRO improving the usefulness of the lib
-+ * versions.
-+ *
-+ * @{
-+ */
-+
-+#define AV_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c))
-+#define AV_VERSION_DOT(a, b, c) a##.##b##.##c
-+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-+
-+/**
-+ * Extract version components from the full ::AV_VERSION_INT int as returned
-+ * by functions like ::avformat_version() and ::avcodec_version()
-+ */
-+#define AV_VERSION_MAJOR(a) ((a) >> 16)
-+#define AV_VERSION_MINOR(a) (((a)&0x00FF00) >> 8)
-+#define AV_VERSION_MICRO(a) ((a)&0xFF)
-+
-+/**
-+ * @}
-+ */
-+
-+/**
-+ * @defgroup lavu_ver Version and Build diagnostics
-+ *
-+ * Macros and function useful to check at compiletime and at runtime
-+ * which version of libavutil is in use.
-+ *
-+ * @{
-+ */
-+
-+#define LIBAVUTIL_VERSION_MAJOR 57
-+#define LIBAVUTIL_VERSION_MINOR 17
-+#define LIBAVUTIL_VERSION_MICRO 100
-+
-+#define LIBAVUTIL_VERSION_INT \
-+ AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_VERSION \
-+ AV_VERSION(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, \
-+ LIBAVUTIL_VERSION_MICRO)
-+#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
-+
-+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-+
-+/**
-+ * @defgroup lavu_depr_guards Deprecation Guards
-+ * FF_API_* defines may be placed below to indicate public API that will be
-+ * dropped at a future version bump. The defines themselves are not part of
-+ * the public API and may change, break or disappear at any time.
-+ *
-+ * @note, when bumping the major version it is recommended to manually
-+ * disable each FF_API_* in its own commit instead of disabling them all
-+ * at once through the bump. This improves the git bisect-ability of the change.
-+ *
-+ * @{
-+ */
-+
-+#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
-+#define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)
-+
-+/**
-+ * @}
-+ * @}
-+ */
-+
-+#endif /* AVUTIL_VERSION_H */
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-new file mode 100644
---- /dev/null
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -0,0 +1,36 @@
-+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-+# vim: set filetype=python:
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+UNIFIED_SOURCES += [
-+ '../FFmpegAudioDecoder.cpp',
-+ '../FFmpegDataDecoder.cpp',
-+ '../FFmpegDecoderModule.cpp',
-+ '../FFmpegVideoDecoder.cpp',
-+]
-+LOCAL_INCLUDES += [
-+ '..',
-+ '/media/mozva',
-+ 'include',
-+]
-+
-+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-+ CXXFLAGS += [ '-Wno-deprecated-declarations' ]
-+if CONFIG['CC_TYPE'] == 'clang':
-+ CXXFLAGS += [
-+ '-Wno-unknown-attributes',
-+ ]
-+if CONFIG['CC_TYPE'] == 'gcc':
-+ CXXFLAGS += [
-+ '-Wno-attributes',
-+ ]
-+if CONFIG['MOZ_WAYLAND']:
-+ CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
-+ DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-+ USE_LIBS += ['mozva']
-+
-+include("/ipc/chromium/chromium-config.mozbuild")
-+
-+FINAL_LIBRARY = 'xul'
-diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build
---- a/dom/media/platforms/ffmpeg/moz.build
-+++ b/dom/media/platforms/ffmpeg/moz.build
-@@ -14,6 +14,7 @@
- "libav55",
- "ffmpeg57",
- "ffmpeg58",
-+ "ffmpeg59",
- ]
-
- UNIFIED_SOURCES += [
-
diff --git a/D139697.diff b/D139697.diff
deleted file mode 100644
index 2b9dc32..0000000
--- a/D139697.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -29,9 +29,6 @@
- if CONFIG['MOZ_WAYLAND']:
- CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
- DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-- UNIFIED_SOURCES += [
-- '../FFmpegVideoFramePool.cpp',
-- ]
- USE_LIBS += ['mozva']
-
- include("/ipc/chromium/chromium-config.mozbuild")
-diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-@@ -41,6 +41,9 @@
- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
- DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
- USE_LIBS += ["mozva"]
-+ UNIFIED_SOURCES += [
-+ "../FFmpegVideoFramePool.cpp",
-+ ]
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-
diff --git a/D139698.diff b/D139698.diff
deleted file mode 100644
index 7bf7af9..0000000
--- a/D139698.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-@@ -64,14 +64,16 @@
- AV_FUNC_56 = 1 << 3,
- AV_FUNC_57 = 1 << 4,
- AV_FUNC_58 = 1 << 5,
-+ AV_FUNC_59 = 1 << 6,
- AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_56 = AV_FUNC_56 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_57 = AV_FUNC_57 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_58 = AV_FUNC_58 | AV_FUNC_AVUTIL_MASK,
-+ AV_FUNC_AVUTIL_59 = AV_FUNC_59 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 |
-- AV_FUNC_57 | AV_FUNC_58,
-+ AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59,
- AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK
- };
-
-@@ -94,6 +96,9 @@
- case 58:
- version = AV_FUNC_58;
- break;
-+ case 59:
-+ version = AV_FUNC_59;
-+ break;
- default:
- FFMPEG_LOG("Unknown avcodec version");
- Unlink();
-@@ -128,15 +133,19 @@
- : LinkResult::MissingLibAVFunction; \
- }
-
-- AV_FUNC(av_lockmgr_register, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(av_lockmgr_register, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_alloc_context3, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_close, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_audio4, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_decode_video2, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_decode_audio4, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
-+ AV_FUNC(avcodec_decode_video2, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_find_decoder, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_flush_buffers, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_open2, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_register_all, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_register_all, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(av_init_packet, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_parser_close, AV_FUNC_AVCODEC_ALL)
-@@ -145,49 +154,56 @@
- AV_FUNC(avcodec_alloc_frame, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_get_frame_defaults, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_free_frame, AV_FUNC_54)
-- AV_FUNC(avcodec_send_packet, AV_FUNC_58)
-- AV_FUNC(avcodec_receive_frame, AV_FUNC_58)
-+ AV_FUNC(avcodec_send_packet, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC(avcodec_receive_frame, AV_FUNC_58 | AV_FUNC_59)
- AV_FUNC(avcodec_default_get_buffer2,
-- (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58))
-+ (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59))
- AV_FUNC_OPTION(av_rdft_init, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_calc, AV_FUNC_AVCODEC_ALL)
- AV_FUNC_OPTION(av_rdft_end, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_freep, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC(av_frame_alloc, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC(av_frame_alloc,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_free,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_frame_unref,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC(av_image_check_size, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_image_get_buffer_size, AV_FUNC_AVUTIL_ALL)
-- AV_FUNC_OPTION(av_buffer_get_opaque,
-- (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-- AV_FUNC(av_buffer_create, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 |
-- AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58))
-+ AV_FUNC_OPTION(av_buffer_get_opaque, (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
-+ AV_FUNC(av_buffer_create,
-+ (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59))
- AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL)
- AV_FUNC_OPTION(av_frame_get_color_range, AV_FUNC_AVUTIL_ALL)
-
- #ifdef MOZ_WAYLAND
-- AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58)
-- AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string, AV_FUNC_AVUTIL_58)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_hw_config, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_iterate, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_codec_is_decoder, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats,
-+ AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_set, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_dict_free, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_58 | AV_FUNC_59)
-+ AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string,
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59)
- #endif
- #undef AV_FUNC
- #undef AV_FUNC_OPTION
-@@ -219,7 +235,9 @@
- # undef VAD_FUNC_OPTION_SILENT
- #endif
-
-- avcodec_register_all();
-+ if (avcodec_register_all) {
-+ avcodec_register_all();
-+ }
- if (MOZ_LOG_TEST(sPDMLog, LogLevel::Debug)) {
- av_log_set_level(AV_LOG_DEBUG);
- } else if (MOZ_LOG_TEST(sPDMLog, LogLevel::Info)) {
-diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-@@ -27,6 +27,7 @@
- static const char* sLibs[] = {
- // clang-format off
- #if defined(XP_DARWIN)
-+ "libavcodec.59.dylib",
- "libavcodec.58.dylib",
- "libavcodec.57.dylib",
- "libavcodec.56.dylib",
-@@ -34,6 +35,7 @@
- "libavcodec.54.dylib",
- "libavcodec.53.dylib",
- #else
-+ "libavcodec.so.59",
- "libavcodec.so.58",
- "libavcodec-ffmpeg.so.58",
- "libavcodec-ffmpeg.so.57",
-@@ -76,7 +78,6 @@
- sLinkStatusLibraryName = lib;
- return true;
- case FFmpegLibWrapper::LinkResult::NoProvidedLib:
-- MOZ_ASSERT_UNREACHABLE("Incorrectly-setup sLibAV");
- break;
- case FFmpegLibWrapper::LinkResult::NoAVCodecVersion:
- if (sLinkStatus > LinkStatus_INVALID_CANDIDATE) {
-@@ -152,6 +153,9 @@
- case 58:
- module = FFmpegDecoderModule<58>::Create(&sLibAV);
- break;
-+ case 59:
-+ module = FFmpegDecoderModule<59>::Create(&sLibAV);
-+ break;
- default:
- module = nullptr;
- }
-
diff --git a/D139699.diff b/D139699.diff
deleted file mode 100644
index a4be4c5..0000000
--- a/D139699.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
-@@ -206,15 +206,49 @@
- media::TimeUnit pts = aSample->mTime;
-
- while (packet.size > 0) {
-- int decoded;
-- int bytesConsumed =
-+ int decoded = false;
-+ int bytesConsumed = -1;
-+#if LIBAVCODEC_VERSION_MAJOR < 59
-+ bytesConsumed =
- mLib->avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
--
- if (bytesConsumed < 0) {
- NS_WARNING("FFmpeg audio decoder error.");
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
- RESULT_DETAIL("FFmpeg audio error:%d", bytesConsumed));
- }
-+#else
-+# define AVERROR_OK 0
-+
-+ int ret = mLib->avcodec_receive_frame(mCodecContext, mFrame);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ decoded = true;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF): {
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ }
-+ }
-+ ret = mLib->avcodec_send_packet(mCodecContext, &packet);
-+ switch (ret) {
-+ case AVERROR_OK:
-+ bytesConsumed = packet.size;
-+ break;
-+ case AVERROR(EAGAIN):
-+ break;
-+ case int(AVERROR_EOF):
-+ FFMPEG_LOG(" End of stream.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
-+ RESULT_DETAIL("End of stream"));
-+ default:
-+ NS_WARNING("FFmpeg audio decoder error.");
-+ return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-+ RESULT_DETAIL("FFmpeg audio error"));
-+ }
-+#endif
-
- if (decoded) {
- if (mFrame->format != AV_SAMPLE_FMT_FLT &&
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -39,6 +39,9 @@
- # define AV_PIX_FMT_YUV444P10LE PIX_FMT_YUV444P10LE
- # define AV_PIX_FMT_NONE PIX_FMT_NONE
- #endif
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+# define AV_PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI
-+#endif
- #include "mozilla/PodOperations.h"
- #include "mozilla/StaticPrefs_media.h"
- #include "mozilla/TaskQueue.h"
-@@ -766,6 +769,14 @@
- }
- #endif
-
-+static int64_t GetFramePts(AVFrame* aFrame) {
-+#if LIBAVCODEC_VERSION_MAJOR > 58
-+ return aFrame->pts;
-+#else
-+ return aFrame->pkt_pts;
-+#endif
-+}
-+
- MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- MediaRawData* aSample, uint8_t* aData, int aSize, bool* aGotFrame,
- MediaDataDecoder::DecodedData& aResults) {
-@@ -831,7 +842,7 @@
- MediaResult rv;
- # ifdef MOZ_WAYLAND_USE_VAAPI
- if (IsHardwareAccelerated()) {
-- rv = CreateImageVAAPI(mFrame->pkt_pos, mFrame->pkt_pts,
-+ rv = CreateImageVAAPI(mFrame->pkt_pos, GetFramePts(mFrame),
- mFrame->pkt_duration, aResults);
- // If VA-API playback failed, just quit. Decoder is going to be restarted
- // without VA-API.
-@@ -844,8 +855,8 @@
- } else
- # endif
- {
-- rv = CreateImage(mFrame->pkt_pos, mFrame->pkt_pts, mFrame->pkt_duration,
-- aResults);
-+ rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame),
-+ mFrame->pkt_duration, aResults);
- }
- if (NS_FAILED(rv)) {
- return rv;
-@@ -879,9 +890,9 @@
- "DoDecodeFrame:decode_video: rv=%d decoded=%d "
- "(Input: pts(%" PRId64 ") dts(%" PRId64 ") Output: pts(%" PRId64
- ") "
-- "opaque(%" PRId64 ") pkt_pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
-+ "opaque(%" PRId64 ") pts(%" PRId64 ") pkt_dts(%" PRId64 "))",
- bytesConsumed, decoded, packet.pts, packet.dts, mFrame->pts,
-- mFrame->reordered_opaque, mFrame->pkt_pts, mFrame->pkt_dts);
-+ mFrame->reordered_opaque, mFrame->pts, mFrame->pkt_dts);
-
- if (bytesConsumed < 0) {
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-@@ -896,7 +907,8 @@
- }
-
- // If we've decoded a frame then we need to output it
-- int64_t pts = mPtsContext.GuessCorrectPts(mFrame->pkt_pts, mFrame->pkt_dts);
-+ int64_t pts =
-+ mPtsContext.GuessCorrectPts(GetFramePts(mFrame), mFrame->pkt_dts);
- // Retrieve duration from dts.
- // We use the first entry found matching this dts (this is done to
- // handle damaged file with multiple frames with the same dts)
-
diff --git a/D139703.diff b/D139703.diff
deleted file mode 100644
index 4c929fd..0000000
--- a/D139703.diff
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -10,6 +10,7 @@
-
- is_64bit = "JS_64BIT" in buildconfig.defines
- cpu_arch = buildconfig.substs["CPU_ARCH"]
-+is_gcc = buildconfig.substs["CC_TYPE"] == "gcc"
-
-
- def fmt_insn(s):
-@@ -19,21 +20,21 @@
- def gen_seqcst(fun_name):
- if cpu_arch in ("x86", "x86_64"):
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("mfence\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "aarch64":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb ish\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
- }
- if cpu_arch == "arm":
- return r"""
-- inline void %(fun_name)s() {
-+ INLINE_ATTR void %(fun_name)s() {
- asm volatile ("dmb sy\n\t" ::: "memory");
- }""" % {
- "fun_name": fun_name,
-@@ -63,7 +64,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -91,7 +92,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -117,7 +118,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) {
- %(cpp_type)s res;
- asm volatile (%(insns)s
- : [res] "=r" (res)
-@@ -154,7 +155,7 @@
- if barrier:
- insns += fmt_insn("mfence")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -180,7 +181,7 @@
- if barrier:
- insns += fmt_insn("dmb ish")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -204,7 +205,7 @@
- if barrier:
- insns += fmt_insn("dmb sy")
- return """
-- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- :
- : [addr] "r" (addr), [val] "r"(val)
-@@ -235,7 +236,7 @@
- assert size == 64
- insns += fmt_insn("xchgq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+r" (val)
- : [addr] "r" (addr)
-@@ -266,7 +267,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -297,7 +298,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uint32_t scratch;
- asm volatile (%(insns)s
-@@ -321,7 +322,7 @@
- # Use a +A constraint to load `oldval` into EDX:EAX as input/output.
- # `newval` is loaded into ECX:EBX.
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile ("lock; cmpxchg8b (%%[addr])\n\t"
-@@ -337,7 +338,7 @@
- }
- if cpu_arch == "arm" and size == 64:
- return r"""
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- uint32_t oldval0 = oldval & 0xffff'ffff;
-@@ -380,7 +381,7 @@
- assert size == 64
- insns += fmt_insn("lock; cmpxchgq %[newval], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- asm volatile (%(insns)s
-@@ -425,7 +426,7 @@
- insns += fmt_insn("cbnz %w[scratch], 0b")
- insns += fmt_insn("1: dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -466,7 +467,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("1: dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr,
- %(cpp_type)s oldval,
- %(cpp_type)s newval) {
- %(cpp_type)s res, scratch;
-@@ -501,7 +502,7 @@
- assert size == 64
- insns += fmt_insn("lock; xaddq %[val], (%[addr])")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- asm volatile (%(insns)s
- : [val] "+&r" (val)
- : [addr] "r" (addr)
-@@ -539,7 +540,7 @@
- insns = insns.replace("OP", op)
- insns += fmt_insn("jnz 0b")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res, scratch;
- asm volatile (%(insns)s
- : [res] "=&a" (res), [scratch] "=&r" (scratch)
-@@ -581,7 +582,7 @@
- insns += fmt_insn("cbnz %w[scratch2], 0b")
- insns += fmt_insn("dmb ish")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -621,7 +622,7 @@
- insns += fmt_insn("beq 0b")
- insns += fmt_insn("dmb sy")
- return """
-- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
-+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) {
- %(cpp_type)s res;
- uintptr_t scratch1, scratch2;
- asm volatile (%(insns)s
-@@ -681,7 +682,7 @@
- offset -= 1
-
- return """
-- inline void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
-+ INLINE_ATTR void %(fun_name)s(uint8_t* dst, const uint8_t* src) {
- %(cpp_type)s* dst_ = reinterpret_cast<%(cpp_type)s*>(dst);
- const %(cpp_type)s* src_ = reinterpret_cast<const %(cpp_type)s*>(src);
- %(cpp_type)s scratch;
-@@ -853,6 +854,13 @@
- "constexpr size_t JS_GENERATED_ATOMICS_WORDSIZE = " + str(wordsize) + ";\n"
- )
-
-+ # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
-+ # See bug 1756347.
-+ if is_gcc and cpu_arch == "x86":
-+ contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline")
-+ else:
-+ contents = contents.replace("INLINE_ATTR", "inline")
-+
- c_out.write(
- HEADER_TEMPLATE
- % {
-
diff --git a/D139704.diff b/D139704.diff
deleted file mode 100644
index ab1ea42..0000000
--- a/D139704.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
---- a/js/src/jit/GenerateAtomicOperations.py
-+++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -666,12 +666,12 @@
- insns += fmt_insn("str %x[scratch], [%x[dst], OFFSET]")
- elif cpu_arch == "arm":
- if size == 1:
-- insns += fmt_insn("ldrb %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("strb %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldrb %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("strb %[scratch], [%[dst], #OFFSET]")
- else:
- assert size == 4
-- insns += fmt_insn("ldr %[scratch], [%[src], OFFSET]")
-- insns += fmt_insn("str %[scratch], [%[dst], OFFSET]")
-+ insns += fmt_insn("ldr %[scratch], [%[src], #OFFSET]")
-+ insns += fmt_insn("str %[scratch], [%[dst], #OFFSET]")
- else:
- raise Exception("Unexpected arch")
- insns = insns.replace("OFFSET", str(offset * size))
-
diff --git a/D142257.diff b/D142257.diff
new file mode 100644
index 0000000..5779e41
--- /dev/null
+++ b/D142257.diff
@@ -0,0 +1,313 @@
+diff -up firefox-99.0/gfx/gl/GLContextEGL.h.D142257 firefox-99.0/gfx/gl/GLContextEGL.h
+--- firefox-99.0/gfx/gl/GLContextEGL.h.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextEGL.h 2022-04-06 10:32:53.287145554 +0200
+@@ -21,11 +21,9 @@ class CompositorWidget;
+ } // namespace widget
+ namespace gl {
+
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId);
+-
+ inline std::shared_ptr<EglDisplay> DefaultEglDisplay(
+ nsACString* const out_failureId) {
+- const auto lib = DefaultEglLibrary(out_failureId);
++ const auto lib = GLLibraryEGL::Get(out_failureId);
+ if (!lib) {
+ return nullptr;
+ }
+diff -up firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 firefox-99.0/gfx/gl/GLContextProviderEGL.cpp
+--- firefox-99.0/gfx/gl/GLContextProviderEGL.cpp.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLContextProviderEGL.cpp 2022-04-06 10:34:20.468017966 +0200
+@@ -237,7 +237,7 @@ class GLContextEGLFactory {
+ already_AddRefed<GLContext> GLContextEGLFactory::CreateImpl(
+ EGLNativeWindowType aWindow, bool aHardwareWebRender, bool aUseGles) {
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ gfxCriticalNote << "Failed[3] to load EGL library: " << failureId.get();
+ return nullptr;
+@@ -1209,32 +1209,8 @@ already_AddRefed<GLContext> GLContextPro
+ /*static*/
+ GLContext* GLContextProviderEGL::GetGlobalContext() { return nullptr; }
+
+-// -
+-
+-static StaticMutex sMutex;
+-static StaticRefPtr<GLLibraryEGL> gDefaultEglLibrary;
+-
+-RefPtr<GLLibraryEGL> DefaultEglLibrary(nsACString* const out_failureId) {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- gDefaultEglLibrary = GLLibraryEGL::Create(out_failureId);
+- if (!gDefaultEglLibrary) {
+- NS_WARNING("GLLibraryEGL::Create failed");
+- }
+- }
+- return gDefaultEglLibrary.get();
+-}
+-
+-// -
+-
+ /*static*/
+-void GLContextProviderEGL::Shutdown() {
+- StaticMutexAutoLock lock(sMutex);
+- if (!gDefaultEglLibrary) {
+- return;
+- }
+- gDefaultEglLibrary = nullptr;
+-}
++void GLContextProviderEGL::Shutdown() { GLLibraryEGL::Shutdown(); }
+
+ } /* namespace gl */
+ } /* namespace mozilla */
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.cpp
+--- firefox-99.0/gfx/gl/GLLibraryEGL.cpp.D142257 2022-03-31 01:24:45.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -48,6 +48,9 @@
+ namespace mozilla {
+ namespace gl {
+
++StaticMutex GLLibraryEGL::sMutex;
++StaticRefPtr<GLLibraryEGL> GLLibraryEGL::sInstance;
++
+ // should match the order of EGLExtensions, and be null-terminated.
+ static const char* sEGLLibraryExtensionNames[] = {
+ "EGL_ANDROID_get_native_client_buffer", "EGL_ANGLE_device_creation",
+@@ -140,15 +143,17 @@ static PRLibrary* LoadLibraryForEGLOnWin
+
+ #endif // XP_WIN
+
+-static std::shared_ptr<EglDisplay> GetAndInitDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const auto display = egl.fGetDisplay(displayType);
+ if (!display) return nullptr;
+- return EglDisplay::Create(egl, display, false);
++ return EglDisplay::Create(egl, display, false, aProofOfLock);
+ }
+
+-static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(GLLibraryEGL& egl,
+- void* displayType) {
++static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(
++ GLLibraryEGL& egl, void* displayType,
++ const StaticMutexAutoLock& aProofOfLock) {
+ const EGLAttrib attrib_list[] = {
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+ LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
+@@ -167,11 +172,12 @@ static std::shared_ptr<EglDisplay> GetAn
+ return nullptr;
+ }
+
+- return EglDisplay::Create(egl, display, true);
++ return EglDisplay::Create(egl, display, true, aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ ID3D11Device* const d3d11Device) {
++ StaticMutexAutoLock lock(sMutex);
+ EGLDeviceEXT eglDevice =
+ fCreateDeviceANGLE(LOCAL_EGL_D3D11_DEVICE_ANGLE, d3d11Device, nullptr);
+ if (!eglDevice) {
+@@ -199,7 +205,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ return nullptr;
+ }
+
+- const auto ret = EglDisplay::Create(*this, display, false);
++ const auto ret = EglDisplay::Create(*this, display, false, lock);
+
+ if (!ret) {
+ const EGLint err = fGetError();
+@@ -263,7 +269,8 @@ class AngleErrorReporting {
+ AngleErrorReporting gAngleErrorReporter;
+
+ static std::shared_ptr<EglDisplay> GetAndInitDisplayForAccelANGLE(
+- GLLibraryEGL& egl, nsACString* const out_failureId) {
++ GLLibraryEGL& egl, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ gfx::FeatureState& d3d11ANGLE =
+ gfx::gfxConfig::GetFeature(gfx::Feature::D3D11_HW_ANGLE);
+
+@@ -285,16 +292,18 @@ static std::shared_ptr<EglDisplay> GetAn
+ });
+
+ if (gfx::gfxConfig::IsForcedOnByUser(gfx::Feature::D3D11_HW_ANGLE)) {
+- return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE);
++ return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ std::shared_ptr<EglDisplay> ret;
+ if (d3d11ANGLE.IsEnabled()) {
+- ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
++ ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE,
++ aProofOfLock);
+ }
+
+ if (!ret) {
+- ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ }
+
+ if (!ret && out_failureId->IsEmpty()) {
+@@ -326,12 +335,20 @@ Maybe<SymbolLoader> GLLibraryEGL::GetSym
+ // -
+
+ /* static */
+-RefPtr<GLLibraryEGL> GLLibraryEGL::Create(nsACString* const out_failureId) {
+- RefPtr<GLLibraryEGL> ret = new GLLibraryEGL;
+- if (!ret->Init(out_failureId)) {
+- return nullptr;
++RefPtr<GLLibraryEGL> GLLibraryEGL::Get(nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ if (!sInstance) {
++ sInstance = new GLLibraryEGL;
++ if (NS_WARN_IF(!sInstance->Init(out_failureId))) {
++ sInstance = nullptr;
++ }
+ }
+- return ret;
++ return sInstance;
++}
++
++/* static */ void GLLibraryEGL::Shutdown() {
++ StaticMutexAutoLock lock(sMutex);
++ sInstance = nullptr;
+ }
+
+ bool GLLibraryEGL::Init(nsACString* const out_failureId) {
+@@ -640,9 +657,9 @@ static void MarkExtensions(const char* r
+ // -
+
+ // static
+-std::shared_ptr<EglDisplay> EglDisplay::Create(GLLibraryEGL& lib,
+- const EGLDisplay display,
+- const bool isWarp) {
++std::shared_ptr<EglDisplay> EglDisplay::Create(
++ GLLibraryEGL& lib, const EGLDisplay display, const bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock) {
+ // Retrieve the EglDisplay if it already exists
+ {
+ const auto itr = lib.mActiveDisplays.find(display);
+@@ -710,6 +727,7 @@ EglDisplay::EglDisplay(const PrivateUseO
+ }
+
+ EglDisplay::~EglDisplay() {
++ StaticMutexAutoLock lock(GLLibraryEGL::sMutex);
+ fTerminate();
+ mLib->mActiveDisplays.erase(mDisplay);
+ }
+@@ -718,16 +736,24 @@ EglDisplay::~EglDisplay() {
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::DefaultDisplay(
+ nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
+ auto ret = mDefaultDisplay.lock();
+ if (ret) return ret;
+
+- ret = CreateDisplay(false, out_failureId);
++ ret = CreateDisplayLocked(false, out_failureId, lock);
+ mDefaultDisplay = ret;
+ return ret;
+ }
+
+ std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplay(
+ const bool forceAccel, nsACString* const out_failureId) {
++ StaticMutexAutoLock lock(sMutex);
++ return CreateDisplayLocked(forceAccel, out_failureId, lock);
++}
++
++std::shared_ptr<EglDisplay> GLLibraryEGL::CreateDisplayLocked(
++ const bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock) {
+ std::shared_ptr<EglDisplay> ret;
+
+ if (IsExtensionSupported(EGLLibExtension::ANGLE_platform_angle_d3d)) {
+@@ -747,7 +773,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Hardware accelerated ANGLE path (supported or force accel)
+ if (shouldTryAccel) {
+- ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId);
++ ret = GetAndInitDisplayForAccelANGLE(*this, out_failureId, aProofOfLock);
+ }
+
+ // Report the acceleration status to telemetry
+@@ -766,7 +792,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+
+ // Fallback to a WARP display if ANGLE fails, or if WARP is forced
+ if (!ret && shouldTryWARP) {
+- ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY);
++ ret = GetAndInitWARPDisplay(*this, EGL_DEFAULT_DISPLAY, aProofOfLock);
+ if (!ret) {
+ if (out_failureId->IsEmpty()) {
+ *out_failureId = "FEATURE_FAILURE_WARP_FALLBACK"_ns;
+@@ -788,7 +814,7 @@ std::shared_ptr<EglDisplay> GLLibraryEGL
+ }
+ }
+ #endif
+- ret = GetAndInitDisplay(*this, nativeDisplay);
++ ret = GetAndInitDisplay(*this, nativeDisplay, aProofOfLock);
+ }
+
+ if (!ret) {
+diff -up firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 firefox-99.0/gfx/gl/GLLibraryEGL.h
+--- firefox-99.0/gfx/gl/GLLibraryEGL.h.D142257 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/gfx/gl/GLLibraryEGL.h 2022-04-06 10:32:53.288145587 +0200
+@@ -13,6 +13,8 @@
+ #include "mozilla/EnumTypeTraits.h"
+ #include "mozilla/Maybe.h"
+ #include "mozilla/RefPtr.h"
++#include "mozilla/StaticMutex.h"
++#include "mozilla/StaticPtr.h"
+ #include "nsISupports.h"
+ #include "prlink.h"
+
+@@ -125,14 +127,22 @@ class GLLibraryEGL final {
+ std::unordered_map<EGLDisplay, std::weak_ptr<EglDisplay>> mActiveDisplays;
+
+ public:
+- static RefPtr<GLLibraryEGL> Create(nsACString* const out_failureId);
++ static RefPtr<GLLibraryEGL> Get(nsACString* const out_failureId);
++ static void Shutdown();
+
+ private:
+ ~GLLibraryEGL() = default;
+
++ static StaticMutex sMutex;
++ static StaticRefPtr<GLLibraryEGL> sInstance GUARDED_BY(sMutex);
++
+ bool Init(nsACString* const out_failureId);
+ void InitLibExtensions();
+
++ std::shared_ptr<EglDisplay> CreateDisplayLocked(
++ bool forceAccel, nsACString* const out_failureId,
++ const StaticMutexAutoLock& aProofOfLock);
++
+ public:
+ Maybe<SymbolLoader> GetSymbolLoader() const;
+
+@@ -599,8 +609,9 @@ class EglDisplay final {
+ struct PrivateUseOnly final {};
+
+ public:
+- static std::shared_ptr<EglDisplay> Create(GLLibraryEGL&, EGLDisplay,
+- bool isWarp);
++ static std::shared_ptr<EglDisplay> Create(
++ GLLibraryEGL&, EGLDisplay, bool isWarp,
++ const StaticMutexAutoLock& aProofOfLock);
+
+ // Only `public` for make_shared.
+ EglDisplay(const PrivateUseOnly&, GLLibraryEGL&, EGLDisplay, bool isWarp);
+diff -up firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 firefox-99.0/gfx/webrender_bindings/RenderThread.cpp
+--- firefox-99.0/gfx/webrender_bindings/RenderThread.cpp.D142257 2022-03-31 01:24:51.000000000 +0200
++++ firefox-99.0/gfx/webrender_bindings/RenderThread.cpp 2022-04-06 10:32:53.288145587 +0200
+@@ -1163,7 +1163,7 @@ static already_AddRefed<gl::GLContext> C
+ }
+
+ nsCString failureId;
+- const auto lib = gl::DefaultEglLibrary(&failureId);
++ const auto lib = gl::GLLibraryEGL::Get(&failureId);
+ if (!lib) {
+ aError.Assign(
+ nsPrintfCString("RcANGLE(load EGL lib failed: %s)", failureId.get()));
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
deleted file mode 100644
index 3ecdbed..0000000
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:27:07.808429721 +0200
-@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
- CreateAndStartupPDM<AppleDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled() &&
-- StaticPrefs::media_rdd_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled() &&
-+ StaticPrefs::media_rdd_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- CreateAndStartupPDM<AgnosticDecoderModule>();
- }
-
-@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
-@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
diff --git a/firefox.spec b/firefox.spec
index abb7a07..238bca8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -126,7 +126,7 @@ ExcludeArch: aarch64
%if %{?system_nss}
%global nspr_version 4.26
%global nspr_build_version %{nspr_version}
-%global nss_version 3.74
+%global nss_version 3.76
%global nss_build_version %{nss_version}
%endif
@@ -162,7 +162,7 @@ ExcludeArch: aarch64
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 98.0.2
+Version: 99.0
Release: 1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -214,16 +214,8 @@ Patch49: build-arm-libaom.patch
Patch53: firefox-gcc-build.patch
Patch54: mozilla-1669639.patch
Patch55: firefox-testing.patch
-Patch57: firefox-disable-ffvpx-with-vapi.patch
Patch61: firefox-glibc-dynstack.patch
Patch62: build-python.patch
-#Patch64: mozilla-1753402.patch
-# GCC12 build fixes
-Patch65: D139022.diff
-Patch66: D139078.diff
-Patch67: D139088.diff
-Patch68: D139703.diff
-Patch69: D139704.diff
Patch70: crossbeam-downgrade-rhbz2063961.patch
Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch
@@ -250,11 +242,7 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch
-# ffmpeg50
-Patch500: D139696.diff
-Patch501: D139697.diff
-Patch502: D139698.diff
-Patch503: D139699.diff
+Patch416: D142257.diff
# PGO/LTO patches
Patch600: pgo.patch
@@ -471,14 +459,6 @@ This package contains results of tests executed during build.
%patch49 -p1 -b .build-arm-libaom
%patch53 -p1 -b .firefox-gcc-build
%patch54 -p1 -b .1669639
-#%patch55 -p1 -b .testing
-%patch57 -p1 -b .ffvpx-with-vapi
-#%patch64 -p1 -b .1753402
-%patch65 -p1 -b .D139022
-%patch66 -p1 -b .D139078
-%patch67 -p1 -b .D139088
-%patch68 -p1 -b .D139703
-%patch69 -p1 -b .D139704
%ifarch aarch64
%patch70 -p1 -b .crossbeam-downgrade-rhbz2063961
%endif
@@ -505,14 +485,7 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333
-
-# ffmpeg50
-%ifnarch ppc64le
-%patch500 -p1 -b .D139696
-%patch501 -p1 -b .D139697
-%patch502 -p1 -b .D139698
-%patch503 -p1 -b .D139699
-%endif
+%patch416 -p1 -b .D142257
# PGO patches
%if %{build_with_pgo}
@@ -1079,6 +1052,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Apr 6 2022 Martin Stransky <stransky(a)redhat.com> - 99.0-1
+- Updated to 99.0
+
* Thu Mar 31 2022 Martin Stransky <stransky(a)redhat.com> - 98.0.2-1
- Updated to 98.0.2
diff --git a/mozilla-1670333.patch b/mozilla-1670333.patch
index 19e64c0..1c5c476 100644
--- a/mozilla-1670333.patch
+++ b/mozilla-1670333.patch
@@ -1,6 +1,6 @@
-diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/media/mp4/MP4Demuxer.cpp
---- firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/mp4/MP4Demuxer.cpp 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp 2022-04-04 09:58:35.606351546 +0200
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
__func__, ##__VA_ARGS__)
@@ -23,9 +23,9 @@ diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/medi
if (sample->mKeyframe != keyframe) {
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
"@ pts:%" PRId64 " dur:%" PRId64
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/dom/media/platforms/PDMFactory.cpp
---- firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 2021-04-19 13:36:44.087761790 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:39:52.676433734 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.cpp 2022-04-04 10:09:57.383419125 +0200
@@ -58,6 +58,8 @@
#include <functional>
@@ -35,22 +35,16 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
namespace mozilla {
#define PDM_INIT_LOG(msg, ...) \
-@@ -572,10 +574,10 @@ void PDMFactory::CreateDefaultPDMs() {
- }
- #endif
+@@ -495,7 +497,7 @@ void PDMFactory::CreateRddPDMs() {
#ifdef MOZ_FFMPEG
-- if (StaticPrefs::media_ffmpeg_enabled() &&
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ StaticPrefs::media_rdd_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
-- FFmpegRuntimeLinker::LinkStatusCode());
-+ if (StaticPrefs::media_ffmpeg_enabled()) {
-+ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
-+ if (!mFFmpegUsed) {
-+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(FFmpegRuntimeLinker::LinkStatusCode()); }
++ !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+ FFmpegRuntimeLinker::LinkStatusCode());
}
- #endif
- #ifdef MOZ_FFVPX
-@@ -592,8 +594,9 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
CreateAndStartupPDM<AgnosticDecoderModule>();
@@ -61,9 +55,9 @@ diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/do
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
}
}
-diff -up firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 firefox-88.0/dom/media/platforms/PDMFactory.h
---- firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/dom/media/platforms/PDMFactory.h 2021-04-19 13:36:44.101762211 +0200
+diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
+--- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 2022-03-31 01:24:44.000000000 +0200
++++ firefox-99.0/dom/media/platforms/PDMFactory.h 2022-04-04 09:58:35.606351546 +0200
@@ -121,6 +121,7 @@ class PDMFactory final {
RefPtr<PlatformDecoderModule> mNullPDM;
diff --git a/pgo.patch b/pgo.patch
index e7e715b..eec103c 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,7 +1,7 @@
-diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/build/moz.configure/lto-pgo.configure
---- firefox-96.0/build/moz.configure/lto-pgo.configure.pgo 2022-01-06 19:32:35.000000000 +0100
-+++ firefox-96.0/build/moz.configure/lto-pgo.configure 2022-01-11 15:43:02.193378698 +0100
-@@ -248,8 +248,8 @@ def lto(
+diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
+--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/moz.configure/lto-pgo.configure 2022-04-04 10:15:45.387694143 +0200
+@@ -247,8 +247,8 @@ def lto(
cflags.append("-flto")
ldflags.append("-flto")
else:
@@ -12,7 +12,7 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
if target.os == "Android" and value == "cross":
# Work around https://github.com/rust-lang/rust/issues/90088
-@@ -265,7 +265,7 @@ def lto(
+@@ -264,7 +264,7 @@ def lto(
if value == "full":
cflags.append("-flto")
else:
@@ -21,9 +21,9 @@ diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/bui
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
# AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
cflags.append("-fuse-ld=lld")
-diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/profileserver.py
---- firefox-96.0/build/pgo/profileserver.py.pgo 2022-01-06 16:56:23.000000000 +0100
-+++ firefox-96.0/build/pgo/profileserver.py 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
+--- firefox-99.0/build/pgo/profileserver.py.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/pgo/profileserver.py 2022-04-04 10:15:45.387694143 +0200
@@ -11,7 +11,7 @@ import glob
import subprocess
@@ -70,9 +70,9 @@ diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/prof
llvm_profdata = env.get("LLVM_PROFDATA")
if llvm_profdata:
profraw_files = glob.glob("*.profraw")
-diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozconfig.unix
---- firefox-96.0/build/unix/mozconfig.unix.pgo 2022-01-06 16:56:24.000000000 +0100
-+++ firefox-96.0/build/unix/mozconfig.unix 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
+--- firefox-99.0/build/unix/mozconfig.unix.pgo 2022-03-31 01:24:38.000000000 +0200
++++ firefox-99.0/build/unix/mozconfig.unix 2022-04-04 10:15:45.387694143 +0200
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -89,18 +89,18 @@ diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozc
# We want to make sure we use binutils and other binaries in the tooltool
# package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-96.0/extensions/spellcheck/src/moz.build.pgo firefox-96.0/extensions/spellcheck/src/moz.build
---- firefox-96.0/extensions/spellcheck/src/moz.build.pgo 2022-01-11 15:43:02.193378698 +0100
-+++ firefox-96.0/extensions/spellcheck/src/moz.build 2022-01-11 15:49:52.929362701 +0100
+diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
+--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo 2022-03-31 01:24:50.000000000 +0200
++++ firefox-99.0/extensions/spellcheck/src/moz.build 2022-04-04 10:15:45.387694143 +0200
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
"mozInlineSpellChecker.h",
"mozSpellChecker.h",
]
+
+CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-96.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-01-06 16:58:15.000000000 +0100
-+++ firefox-96.0/toolkit/components/terminator/nsTerminator.cpp 2022-01-11 15:43:02.193378698 +0100
+diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-04-04 10:15:45.387694143 +0200
++++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp 2022-04-04 10:19:07.022239556 +0200
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
}
#endif
@@ -111,5 +111,5 @@ diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox
+ crashAfterMS = INT32_MAX;
+
UniquePtr<Options> options(new Options());
- const PRIntervalTime ticksDuration =
- PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
+ // crashAfterTicks is guaranteed to be > 0 as
+ // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
diff --git a/sources b/sources
index 67b7300..302967c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520
SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2
-SHA512 (firefox-98.0.2.source.tar.xz) = b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e
-SHA512 (firefox-langpacks-98.0.2-20220331.tar.xz) = eba580d5dcef421f2a4e3be62a2fdf0788328cc065ae8019062e5d524f5d49b15709892e5846b9fa63148278983c8e627ad85d8a4656502c9f6543474bb94bc6
+SHA512 (firefox-99.0.source.tar.xz) = 08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c
+SHA512 (firefox-langpacks-99.0-20220331.tar.xz) = 9ab5d8989644da67cacfe729c13309ed4f42b654b9b9113bcdb7155b59fcb12fc816de8a3fdea709c9d91f2d5b168eebec5ada6f7637e111ea374adc9eb9c984
2 years, 1 month
[Report] Packages Restricting Arches
by root
New package excluding arches (8)
============================
- rust-bytes-cast
ExclusiveArch: %{rust_arches}
- rust-bytes-cast-derive
ExclusiveArch: %{rust_arches}
- rust-format-bytes
ExclusiveArch: %{rust_arches}
- rust-format-bytes-macros
ExclusiveArch: %{rust_arches}
- rust-micro-timer
ExclusiveArch: %{rust_arches}
- rust-micro-timer-macros
ExclusiveArch: %{rust_arches}
- rust-twox-hash
ExclusiveArch: %{rust_arches}
- rust-vcsgraph
ExclusiveArch: %{rust_arches}
Package that edited their arches constraints (5)
=============================================
- hsakmt
was ExclusiveArch: x86_64 aarch64
is ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-compilersupport
was ExclusiveArch: x86_64 aarch64
is ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
was ExclusiveArch: x86_64 aarch64
is ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-runtime
was ExclusiveArch: x86_64 aarch64
is ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
was ExclusiveArch: x86_64 aarch64
is ExclusiveArch: x86_64 aarch64 ppc64le
List of packages currently excluding arches (2447)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- OpenColorIO
ExclusiveArch: x86_64 ppc64le
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- OpenMolcas
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aardvark-dns
ExclusiveArch: %{rust_arches}
- aboot
ExclusiveArch: alpha
- accel-config
ExclusiveArch: %{ix86} x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64 s390x
- anet
ExclusiveArch: %{GPRbuild_arches}
- anki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- blender
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- bless
ExclusiveArch: %mono_arches
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- calamares
ExclusiveArch: %{ix86} x86_64 aarch64
- calibre
ExclusiveArch: %{qt5_qtwebengine_arches}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- cpu-x
ExclusiveArch: i686 x86_64
- cpufetch
ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- cri-o
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 aarch64 ppc64le
- cryptobone
ExclusiveArch: x86_64 ppc64le aarch64
- csslint
ExclusiveArch: %{nodejs_arches} noarch
- daq
ExclusiveArch: x86_64 aarch64
- dbus-parsec
ExclusiveArch: %{rust_arches}
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: x86_64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dolphin-emu
ExclusiveArch: x86_64 aarch64
- dotnet-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet3.1
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet6.0
ExclusiveArch: aarch64 x86_64 s390x
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dub
ExclusiveArch: %{ldc_arches}
- dxvk-native
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- eclipse-swt
ExclusiveArch: s390x x86_64 aarch64 ppc64le
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- eth-tools
ExclusiveArch: x86_64
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fes
ExclusiveArch: %{ix86} x86_64
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluent-bit
ExclusiveArch: x86_64 aarch64
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- fwupd-efi
ExclusiveArch: x86_64 aarch64
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gbrainy
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gitqlient
ExclusiveArch: %{qt5_qtwebengine_arches}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-rpm-macros
ExclusiveArch: %{golang_arches} %{gccgo_arches}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- guestfs-tools
ExclusiveArch: %{kernel_arches}
- hedgewars
ExclusiveArch: %{fpc_arches}
- hsakmt
ExclusiveArch: x86_64 aarch64 ppc64le
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- i3status-rs
ExclusiveArch: %{rust_arches}
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cm-compiler
ExclusiveArch: i686 x86_64
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- intel-compute-runtime
ExclusiveArch: x86_64
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-igc
ExclusiveArch: x86_64 i686
- intel-ipp-crypto-mb
ExclusiveArch: x86_64
ExclusiveArch: x86_64
- intel-ipsec-mb
ExclusiveArch: x86_64
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- jigawatts
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- kchmviewer
ExclusiveArch: %{qt5_qtwebengine_arches}
- kernel
ExclusiveArch: noarch x86_64 s390x %{arm} aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
- keylime-agent-rust
ExclusiveArch: %{rust_arches}
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kalarmcal
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- klee
ExclusiveArch: x86_64
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libkgapi
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpmemobj-cpp
ExclusiveArch: x86_64 ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzdnn
ExclusiveArch: s390x
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lightdm
ExclusiveArch: x86_64 ppc64le
- llhttp
ExclusiveArch: %{nodejs_arches}
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maui-mauikit
ExclusiveArch: %{ix86} s390x aarch64 x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mdevctl
ExclusiveArch: %{rust_arches}
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} %{ix86} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-libidn2
ExclusiveArch: %{ix86} x86_64 %{arm}
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mirrorlist-server
ExclusiveArch: %{rust_arches}
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64 %{arm}
- mold
ExclusiveArch: x86_64 aarch64 riscv64
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- naev
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- nant
ExclusiveArch: %mono_arches
- nativejit
ExclusiveArch: x86_64
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- netavark
ExclusiveArch: %{rust_arches}
- newsflash
ExclusiveArch: %{rust_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nispor
ExclusiveArch: %{rust_arches}
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-language-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- nwchem
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- oidn
ExclusiveArch: x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- oneVPL
ExclusiveArch: x86_64
- oneVPL-intel-gpu
ExclusiveArch: x86_64
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- onedrive
ExclusiveArch: %{ldc_arches}
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 aarch64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: x86_64
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openms
ExclusiveArch: %{qt5_qtwebengine_arches}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openshadinglanguage
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- openssl-ibmca
ExclusiveArch: s390 s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- pacemaker
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm}
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- paflib
ExclusiveArch: ppc %{power64}
- parsec
ExclusiveArch: %{rust_arches}
- parsec-tool
ExclusiveArch: %{rust_arches}
- pasdoc
ExclusiveArch: %{fpc_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcm
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- pmdk-convert
ExclusiveArch: x86_64
- pmemkv
ExclusiveArch: x86_64
- podman
ExclusiveArch: %{golang_arches}
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- pveclib
ExclusiveArch: ppc %{power64}
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-cryptography
ExclusiveArch: %{rust_arches}
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-javabridge
ExclusiveArch: i686 x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-setuptools-rust
ExclusiveArch: %{rust_arches}
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qatzip
ExclusiveArch: x86_64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86} aarch64 %{power64}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- reg
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- renderdoc
ExclusiveArch: x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- rescene
ExclusiveArch: %{mono_arches}
- restool
ExclusiveArch: aarch64
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rocm-compilersupport
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-device-libs
ExclusiveArch: x86_64 aarch64 ppc64le
- rocm-runtime
ExclusiveArch: x86_64 aarch64 ppc64le
- rocminfo
ExclusiveArch: x86_64 aarch64 ppc64le
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64 aarch64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-Inflector
ExclusiveArch: %{rust_arches}
- rust-ab_glyph
ExclusiveArch: %{rust_arches}
- rust-ab_glyph_rasterizer
ExclusiveArch: %{rust_arches}
- rust-abomonation
ExclusiveArch: %{rust_arches}
- rust-actix
ExclusiveArch: %{rust_arches}
- rust-actix-codec
ExclusiveArch: %{rust_arches}
- rust-actix-connect
ExclusiveArch: %{rust_arches}
- rust-actix-http
ExclusiveArch: %{rust_arches}
- rust-actix-macros
ExclusiveArch: %{rust_arches}
- rust-actix-macros0.1
ExclusiveArch: %{rust_arches}
- rust-actix-router
ExclusiveArch: %{rust_arches}
- rust-actix-rt
ExclusiveArch: %{rust_arches}
- rust-actix-rt1
ExclusiveArch: %{rust_arches}
- rust-actix-server
ExclusiveArch: %{rust_arches}
- rust-actix-service
ExclusiveArch: %{rust_arches}
- rust-actix-testing
ExclusiveArch: %{rust_arches}
- rust-actix-threadpool
ExclusiveArch: %{rust_arches}
- rust-actix-tls
ExclusiveArch: %{rust_arches}
- rust-actix-utils
ExclusiveArch: %{rust_arches}
- rust-actix-web
ExclusiveArch: %{rust_arches}
- rust-actix-web-codegen
ExclusiveArch: %{rust_arches}
- rust-actix0.10
ExclusiveArch: %{rust_arches}
- rust-actix_derive
ExclusiveArch: %{rust_arches}
- rust-actix_derive0.5
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aead
ExclusiveArch: %{rust_arches}
- rust-aes
ExclusiveArch: %{rust_arches}
- rust-aes-gcm
ExclusiveArch: %{rust_arches}
- rust-aes0.7
ExclusiveArch: %{rust_arches}
- rust-afterburn
ExclusiveArch: %{rust_arches}
- rust-ahash
ExclusiveArch: %{rust_arches}
- rust-ahash0.4
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-alacritty
ExclusiveArch: %{rust_arches}
- rust-alacritty_config_derive
ExclusiveArch: %{rust_arches}
- rust-alacritty_terminal
ExclusiveArch: %{rust_arches}
- rust-alga
ExclusiveArch: %{rust_arches}
- rust-alga_derive
ExclusiveArch: %{rust_arches}
- rust-aliasable
ExclusiveArch: %{rust_arches}
- rust-alloc-no-stdlib
ExclusiveArch: %{rust_arches}
- rust-alloc-stdlib
ExclusiveArch: %{rust_arches}
- rust-alsa
ExclusiveArch: %{rust_arches}
- rust-alsa-sys
ExclusiveArch: %{rust_arches}
- rust-ambient-authority
ExclusiveArch: %{rust_arches}
- rust-ammonia
ExclusiveArch: %{rust_arches}
- rust-ansi_colours
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-ansi_term0.11
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-anyhow
ExclusiveArch: %{rust_arches}
- rust-aom-sys
ExclusiveArch: %{rust_arches}
- rust-app_dirs
ExclusiveArch: %{rust_arches}
- rust-approx
ExclusiveArch: %{rust_arches}
- rust-ar
ExclusiveArch: %{rust_arches}
- rust-arbitrary
ExclusiveArch: %{rust_arches}
- rust-arbitrary0.4
ExclusiveArch: %{rust_arches}
- rust-arc-swap
ExclusiveArch: %{rust_arches}
- rust-arf-strings
ExclusiveArch: %{rust_arches}
- rust-arg_enum_proc_macro
ExclusiveArch: %{rust_arches}
- rust-argh
ExclusiveArch: %{rust_arches}
- rust-argh_derive
ExclusiveArch: %{rust_arches}
- rust-argh_shared
ExclusiveArch: %{rust_arches}
- rust-argparse
ExclusiveArch: %{rust_arches}
- rust-array-init
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-arrayvec0.5
ExclusiveArch: %{rust_arches}
- rust-article_scraper
ExclusiveArch: %{rust_arches}
- rust-ascii
ExclusiveArch: %{rust_arches}
- rust-ascii-canvas
ExclusiveArch: %{rust_arches}
- rust-askalono
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-askama
ExclusiveArch: %{rust_arches}
- rust-askama_derive
ExclusiveArch: %{rust_arches}
- rust-askama_escape
ExclusiveArch: %{rust_arches}
- rust-askama_shared
ExclusiveArch: %{rust_arches}
- rust-asn1
ExclusiveArch: %{rust_arches}
- rust-asn1_derive
ExclusiveArch: %{rust_arches}
- rust-assert-impl
ExclusiveArch: %{rust_arches}
- rust-assert-json-diff
ExclusiveArch: %{rust_arches}
- rust-assert_approx_eq
ExclusiveArch: %{rust_arches}
- rust-assert_cli
ExclusiveArch: %{rust_arches}
- rust-assert_cmd
ExclusiveArch: %{rust_arches}
- rust-assert_fs
ExclusiveArch: %{rust_arches}
- rust-assert_matches
ExclusiveArch: %{rust_arches}
- rust-assign
ExclusiveArch: %{rust_arches}
- rust-async-attributes
ExclusiveArch: %{rust_arches}
- rust-async-channel
ExclusiveArch: %{rust_arches}
- rust-async-compression
ExclusiveArch: %{rust_arches}
- rust-async-executor
ExclusiveArch: %{rust_arches}
- rust-async-global-executor
ExclusiveArch: %{rust_arches}
- rust-async-io
ExclusiveArch: %{rust_arches}
- rust-async-lock
ExclusiveArch: %{rust_arches}
- rust-async-mutex
ExclusiveArch: %{rust_arches}
- rust-async-process
ExclusiveArch: %{rust_arches}
- rust-async-std
ExclusiveArch: %{rust_arches}
- rust-async-stream
ExclusiveArch: %{rust_arches}
- rust-async-stream-impl
ExclusiveArch: %{rust_arches}
- rust-async-task
ExclusiveArch: %{rust_arches}
- rust-async-trait
ExclusiveArch: %{rust_arches}
- rust-asyncgit
ExclusiveArch: %{rust_arches}
- rust-atk
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atom
ExclusiveArch: %{rust_arches}
- rust-atomic
ExclusiveArch: %{rust_arches}
- rust-atomic-traits
ExclusiveArch: %{rust_arches}
- rust-atomic-waker
ExclusiveArch: %{rust_arches}
- rust-attohttpc
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-autocfg
ExclusiveArch: %{rust_arches}
- rust-automod
ExclusiveArch: %{rust_arches}
- rust-av-metrics
ExclusiveArch: %{rust_arches}
- rust-average
ExclusiveArch: %{rust_arches}
- rust-awc
ExclusiveArch: %{rust_arches}
- rust-aws-nitro-enclaves-cose
ExclusiveArch: %{rust_arches}
- rust-az
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-base64-0.10
ExclusiveArch: %{rust_arches}
- rust-base64-0.11
ExclusiveArch: %{rust_arches}
- rust-base64_0.12
ExclusiveArch: %{rust_arches}
- rust-base64ct
ExclusiveArch: %{rust_arches}
- rust-bat
ExclusiveArch: %{rust_arches}
- rust-battery
ExclusiveArch: %{rust_arches}
- rust-beef
ExclusiveArch: %{rust_arches}
- rust-below
ExclusiveArch: %{rust_arches}
- rust-below-common
ExclusiveArch: %{rust_arches}
- rust-below-config
ExclusiveArch: %{rust_arches}
- rust-below-dump
ExclusiveArch: %{rust_arches}
- rust-below-model
ExclusiveArch: %{rust_arches}
- rust-below-render
ExclusiveArch: %{rust_arches}
- rust-below-store
ExclusiveArch: %{rust_arches}
- rust-below-view
ExclusiveArch: %{rust_arches}
- rust-below_derive
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-benfred-read-process-memory
ExclusiveArch: %{rust_arches}
- rust-bigdecimal
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bindgen
ExclusiveArch: %{rust_arches}
- rust-binfarce
ExclusiveArch: %{rust_arches}
- rust-bit-set
ExclusiveArch: %{rust_arches}
- rust-bit-vec
ExclusiveArch: %{rust_arches}
- rust-bitfield
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitmaps
ExclusiveArch: %{rust_arches}
- rust-bitreader
ExclusiveArch: %{rust_arches}
- rust-bitstream-io
ExclusiveArch: %{rust_arches}
- rust-bitvec
ExclusiveArch: %{rust_arches}
- rust-blake2
ExclusiveArch: %{rust_arches}
- rust-blobby
ExclusiveArch: %{rust_arches}
- rust-blobby0.1
ExclusiveArch: %{rust_arches}
- rust-block-buffer
ExclusiveArch: %{rust_arches}
- rust-block-buffer0.9
ExclusiveArch: %{rust_arches}
- rust-block-modes
ExclusiveArch: %{rust_arches}
- rust-block-padding
ExclusiveArch: %{rust_arches}
- rust-block-padding0.2
ExclusiveArch: %{rust_arches}
- rust-blocking
ExclusiveArch: %{rust_arches}
- rust-blsctl
ExclusiveArch: %{rust_arches}
- rust-bodhi
ExclusiveArch: %{rust_arches}
- rust-bodhi-cli
ExclusiveArch: %{rust_arches}
- rust-bootupd
ExclusiveArch: x86_64 aarch64
- rust-box_drawing
ExclusiveArch: %{rust_arches}
- rust-boxfnonce
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-brotli-decompressor
ExclusiveArch: %{rust_arches}
- rust-brotli-sys
ExclusiveArch: %{rust_arches}
- rust-brotli2
ExclusiveArch: %{rust_arches}
- rust-bstr
ExclusiveArch: %{rust_arches}
- rust-btrd
ExclusiveArch: %{rust_arches}
- rust-buf_redux
ExclusiveArch: %{rust_arches}
- rust-buffered-reader
ExclusiveArch: %{rust_arches}
- rust-bufsize
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-bugreport
ExclusiveArch: %{rust_arches}
- rust-build-env
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bumpalo
ExclusiveArch: %{rust_arches}
- rust-byte-unit
ExclusiveArch: %{rust_arches}
- rust-byte-unit3
ExclusiveArch: %{rust_arches}
- rust-bytecheck
ExclusiveArch: %{rust_arches}
- rust-bytecheck_derive
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-bytelines
ExclusiveArch: %{rust_arches}
- rust-bytemuck
ExclusiveArch: %{rust_arches}
- rust-bytemuck_derive
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes-cast
ExclusiveArch: %{rust_arches}
- rust-bytes-cast-derive
ExclusiveArch: %{rust_arches}
- rust-bytes0.4
ExclusiveArch: %{rust_arches}
- rust-bytes0.5
ExclusiveArch: %{rust_arches}
- rust-bytesize
ExclusiveArch: %{rust_arches}
- rust-bytestring
ExclusiveArch: %{rust_arches}
- rust-bzip2
ExclusiveArch: %{rust_arches}
- rust-bzip2-sys
ExclusiveArch: %{rust_arches}
- rust-cache-padded
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-calloop
ExclusiveArch: %{rust_arches}
- rust-camino
ExclusiveArch: %{rust_arches}
- rust-cap-async-std
ExclusiveArch: %{rust_arches}
- rust-cap-fs-ext
ExclusiveArch: %{rust_arches}
- rust-cap-primitives
ExclusiveArch: %{rust_arches}
- rust-cap-rand
ExclusiveArch: %{rust_arches}
- rust-cap-std
ExclusiveArch: %{rust_arches}
- rust-cap-tempfile
ExclusiveArch: %{rust_arches}
- rust-cap-time-ext
ExclusiveArch: %{rust_arches}
- rust-capng
ExclusiveArch: %{rust_arches}
- rust-capnp
ExclusiveArch: %{rust_arches}
- rust-capnp-futures
ExclusiveArch: %{rust_arches}
- rust-capnp-rpc
ExclusiveArch: %{rust_arches}
- rust-caps
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cargo-bloat
ExclusiveArch: %{rust_arches}
- rust-cargo-c
ExclusiveArch: %{rust_arches}
- rust-cargo-edit
ExclusiveArch: %{rust_arches}
- rust-cargo-husky
ExclusiveArch: %{rust_arches}
- rust-cargo-insta
ExclusiveArch: %{rust_arches}
- rust-cargo-platform
ExclusiveArch: %{rust_arches}
- rust-cargo-readme
ExclusiveArch: %{rust_arches}
- rust-cargo-util
ExclusiveArch: %{rust_arches}
- rust-cargo_metadata
ExclusiveArch: %{rust_arches}
- rust-cascade
ExclusiveArch: %{rust_arches}
- rust-case
ExclusiveArch: %{rust_arches}
- rust-cassowary
ExclusiveArch: %{rust_arches}
- rust-cast
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cedarwood
ExclusiveArch: %{rust_arches}
- rust-cexpr
ExclusiveArch: %{rust_arches}
- rust-cfb
ExclusiveArch: %{rust_arches}
- rust-cfg-expr
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-cfg-if0.1
ExclusiveArch: %{rust_arches}
- rust-cgmath
ExclusiveArch: %{rust_arches}
- rust-cgroupfs
ExclusiveArch: %{rust_arches}
- rust-chainerror
ExclusiveArch: %{rust_arches}
- rust-charset
ExclusiveArch: %{rust_arches}
- rust-chbs
ExclusiveArch: %{rust_arches}
- rust-checked_int_cast
ExclusiveArch: %{rust_arches}
- rust-chlorine
ExclusiveArch: %{rust_arches}
- rust-choosier
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-chrono-humanize
ExclusiveArch: %{rust_arches}
- rust-chrono-tz
ExclusiveArch: %{rust_arches}
- rust-chunked_transfer
ExclusiveArch: %{rust_arches}
- rust-cipher
ExclusiveArch: %{rust_arches}
- rust-cipher0.3
ExclusiveArch: %{rust_arches}
- rust-clang-ast
ExclusiveArch: %{rust_arches}
- rust-clang-sys
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-clap-verbosity-flag
ExclusiveArch: %{rust_arches}
- rust-clap2
ExclusiveArch: %{rust_arches}
- rust-clap_complete
ExclusiveArch: %{rust_arches}
- rust-clap_complete_fig
ExclusiveArch: %{rust_arches}
- rust-clap_derive
ExclusiveArch: %{rust_arches}
- rust-clap_generate
ExclusiveArch: %{rust_arches}
- rust-clap_generate_fig
ExclusiveArch: %{rust_arches}
- rust-claxon
ExclusiveArch: %{rust_arches}
- rust-clicolors-control
ExclusiveArch: %{rust_arches}
- rust-clipboard
ExclusiveArch: %{rust_arches}
- rust-clircle
ExclusiveArch: %{rust_arches}
- rust-cloudflare-zlib
ExclusiveArch: x86_64 aarch64
- rust-cloudflare-zlib-sys
ExclusiveArch: x86_64 aarch64
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-codespan-reporting
ExclusiveArch: %{rust_arches}
- rust-codicon
ExclusiveArch: %{rust_arches}
- rust-color-backtrace
ExclusiveArch: %{rust_arches}
- rust-color_quant
ExclusiveArch: %{rust_arches}
- rust-colored
ExclusiveArch: %{rust_arches}
- rust-colored1
ExclusiveArch: %{rust_arches}
- rust-colored_json
ExclusiveArch: %{rust_arches}
- rust-colorful
ExclusiveArch: %{rust_arches}
- rust-combine
ExclusiveArch: %{rust_arches}
- rust-comfy-table
ExclusiveArch: %{rust_arches}
- rust-common-path
ExclusiveArch: %{rust_arches}
- rust-compiletest_rs
ExclusiveArch: %{rust_arches}
- rust-compress-tools
ExclusiveArch: %{rust_arches}
- rust-comrak
ExclusiveArch: %{rust_arches}
- rust-concurrent-queue
ExclusiveArch: %{rust_arches}
- rust-configparser
ExclusiveArch: %{rust_arches}
- rust-confy
ExclusiveArch: %{rust_arches}
- rust-conhash
ExclusiveArch: %{rust_arches}
- rust-console
ExclusiveArch: %{rust_arches}
- rust-console0.11
ExclusiveArch: %{rust_arches}
- rust-console0.12
ExclusiveArch: %{rust_arches}
- rust-console0.13
ExclusiveArch: %{rust_arches}
- rust-console0.14
ExclusiveArch: %{rust_arches}
- rust-console0.9
ExclusiveArch: %{rust_arches}
- rust-console_error_panic_hook
ExclusiveArch: %{rust_arches}
- rust-const-cstr
ExclusiveArch: %{rust_arches}
- rust-const-oid
ExclusiveArch: %{rust_arches}
- rust-const-random
ExclusiveArch: %{rust_arches}
- rust-const-random-macro
ExclusiveArch: %{rust_arches}
- rust-const_fn
ExclusiveArch: %{rust_arches}
- rust-constant_time_eq
ExclusiveArch: %{rust_arches}
- rust-content_inspector
ExclusiveArch: %{rust_arches}
- rust-conv
ExclusiveArch: %{rust_arches}
- rust-convert_case
ExclusiveArch: %{rust_arches}
- rust-cookie
ExclusiveArch: %{rust_arches}
- rust-cookie-factory
ExclusiveArch: %{rust_arches}
- rust-cookie0.14
ExclusiveArch: %{rust_arches}
- rust-cookie_store
ExclusiveArch: %{rust_arches}
- rust-cookie_store0.12
ExclusiveArch: %{rust_arches}
- rust-coolor
ExclusiveArch: %{rust_arches}
- rust-copydeps
ExclusiveArch: %{rust_arches}
- rust-copyless
ExclusiveArch: %{rust_arches}
- rust-copypasta
ExclusiveArch: %{rust_arches}
- rust-cordic
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-count-zeroes
ExclusiveArch: %{rust_arches}
- rust-counted-array
ExclusiveArch: %{rust_arches}
- rust-cpal
ExclusiveArch: %{rust_arches}
- rust-cpio
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-cpufeatures
ExclusiveArch: %{rust_arches}
- rust-cpython
ExclusiveArch: %{rust_arches}
- rust-cranelift-bforest
ExclusiveArch: %{rust_arches}
- rust-cranelift-codegen
ExclusiveArch: x86_64 aarch64 s390x
- rust-cranelift-codegen-meta
ExclusiveArch: %{rust_arches}
- rust-cranelift-codegen-shared
ExclusiveArch: %{rust_arches}
- rust-cranelift-entity
ExclusiveArch: %{rust_arches}
- rust-cranelift-frontend
ExclusiveArch: x86_64 aarch64 s390x
- rust-cranelift-native
ExclusiveArch: x86_64 aarch64 s390x
- rust-cranelift-wasm
ExclusiveArch: x86_64 aarch64 s390x
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-any
ExclusiveArch: %{rust_arches}
- rust-crc-catalog
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crc32fast
ExclusiveArch: %{rust_arches}
- rust-criterion
ExclusiveArch: %{rust_arches}
- rust-criterion-plot
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel0.4
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch0.8
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue0.2
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam0.7
ExclusiveArch: %{rust_arches}
- rust-crossfont
ExclusiveArch: %{rust_arches}
- rust-crossterm
ExclusiveArch: %{rust_arches}
- rust-crossterm0.17
ExclusiveArch: %{rust_arches}
- rust-crossterm0.19
ExclusiveArch: %{rust_arches}
- rust-crosstermion
ExclusiveArch: %{rust_arches}
- rust-crunchy
ExclusiveArch: %{rust_arches}
- rust-crypto-bigint
ExclusiveArch: %{rust_arches}
- rust-crypto-common
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-crypto-mac
ExclusiveArch: %{rust_arches}
- rust-cryptoki
ExclusiveArch: %{rust_arches}
- rust-cryptoki-sys
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-cstr-argument
ExclusiveArch: %{rust_arches}
- rust-cstr_core
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ct-logs
ExclusiveArch: %{rust_arches}
- rust-ctor
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-ctr0.8
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-cty
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-cursive
ExclusiveArch: %{rust_arches}
- rust-cursive-tabs
ExclusiveArch: %{rust_arches}
- rust-cursive_buffered_backend
ExclusiveArch: %{rust_arches}
- rust-cursive_core
ExclusiveArch: %{rust_arches}
- rust-curve25519-dalek
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-custom_error
ExclusiveArch: %{rust_arches}
- rust-cxx
ExclusiveArch: %{rust_arches}
- rust-cxx-build
ExclusiveArch: %{rust_arches}
- rust-cxx-gen
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-flags
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-macro
ExclusiveArch: %{rust_arches}
- rust-darling
ExclusiveArch: %{rust_arches}
- rust-darling0.12
ExclusiveArch: %{rust_arches}
- rust-darling_core
ExclusiveArch: %{rust_arches}
- rust-darling_core0.12
ExclusiveArch: %{rust_arches}
- rust-darling_macro
ExclusiveArch: %{rust_arches}
- rust-darling_macro0.12
ExclusiveArch: %{rust_arches}
- rust-dashmap
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-data-url
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dav1d-sys
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-dbus-codegen
ExclusiveArch: %{rust_arches}
- rust-dbus-crossroads
ExclusiveArch: %{rust_arches}
- rust-dbus-tokio
ExclusiveArch: %{rust_arches}
- rust-dbus-tree
ExclusiveArch: %{rust_arches}
- rust-dbus0.8
ExclusiveArch: %{rust_arches}
- rust-debug-helper
ExclusiveArch: %{rust_arches}
- rust-decimal
ExclusiveArch: %{rust_arches}
- rust-defer-drop
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-deflate0.8
ExclusiveArch: %{rust_arches}
- rust-defmac
ExclusiveArch: %{rust_arches}
- rust-delta_e
ExclusiveArch: %{rust_arches}
- rust-der
ExclusiveArch: %{rust_arches}
- rust-der_derive
ExclusiveArch: %{rust_arches}
- rust-derivative
ExclusiveArch: %{rust_arches}
- rust-derive-new
ExclusiveArch: %{rust_arches}
- rust-derive_arbitrary
ExclusiveArch: %{rust_arches}
- rust-derive_arbitrary0.4
ExclusiveArch: %{rust_arches}
- rust-derive_builder
ExclusiveArch: %{rust_arches}
- rust-derive_builder0.9
ExclusiveArch: %{rust_arches}
- rust-derive_builder_core
ExclusiveArch: %{rust_arches}
- rust-derive_builder_core0.9
ExclusiveArch: %{rust_arches}
- rust-derive_builder_macro
ExclusiveArch: %{rust_arches}
- rust-derive_more
ExclusiveArch: %{rust_arches}
- rust-des
ExclusiveArch: %{rust_arches}
- rust-des0.7
ExclusiveArch: %{rust_arches}
- rust-desed
ExclusiveArch: %{rust_arches}
- rust-deunicode
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-devicemapper-sys
ExclusiveArch: %{rust_arches}
- rust-dialoguer
ExclusiveArch: %{rust_arches}
- rust-diesel
ExclusiveArch: %{rust_arches}
- rust-diesel_derives
ExclusiveArch: %{rust_arches}
- rust-diesel_migrations
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-difflib
ExclusiveArch: %{rust_arches}
- rust-diffus
ExclusiveArch: %{rust_arches}
- rust-diffus-derive
ExclusiveArch: %{rust_arches}
- rust-digest
ExclusiveArch: %{rust_arches}
- rust-digest0.9
ExclusiveArch: %{rust_arches}
- rust-directories
ExclusiveArch: %{rust_arches}
- rust-directories-next
ExclusiveArch: %{rust_arches}
- rust-dirs
ExclusiveArch: %{rust_arches}
- rust-dirs-next
ExclusiveArch: %{rust_arches}
- rust-dirs-sys
ExclusiveArch: %{rust_arches}
- rust-dirs-sys-next
ExclusiveArch: %{rust_arches}
- rust-dirs2
ExclusiveArch: %{rust_arches}
- rust-dirs3
ExclusiveArch: %{rust_arches}
- rust-diskonaut
ExclusiveArch: %{rust_arches}
- rust-displaydoc
ExclusiveArch: %{rust_arches}
- rust-dissimilar
ExclusiveArch: %{rust_arches}
- rust-dlib
ExclusiveArch: %{rust_arches}
- rust-dlv-list
ExclusiveArch: %{rust_arches}
- rust-dns-lookup
ExclusiveArch: %{rust_arches}
- rust-dns-parser
ExclusiveArch: %{rust_arches}
- rust-doc-comment
ExclusiveArch: %{rust_arches}
- rust-docmatic
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-dotenv
ExclusiveArch: %{rust_arches}
- rust-downcast
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-drg
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-dua-cli
ExclusiveArch: %{rust_arches}
- rust-duct
ExclusiveArch: %{rust_arches}
- rust-dummy
ExclusiveArch: %{rust_arches}
- rust-dunce
ExclusiveArch: %{rust_arches}
- rust-dutree
ExclusiveArch: %{rust_arches}
- rust-dyn-clone
ExclusiveArch: %{rust_arches}
- rust-easy-cast
ExclusiveArch: %{rust_arches}
- rust-easy-parallel
ExclusiveArch: %{rust_arches}
- rust-edit
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-elasticlunr-rs
ExclusiveArch: %{rust_arches}
- rust-elf
ExclusiveArch: %{rust_arches}
- rust-elfcat
ExclusiveArch: %{rust_arches}
- rust-ena
ExclusiveArch: %{rust_arches}
- rust-encode_unicode
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-endian-type
ExclusiveArch: %{rust_arches}
- rust-enquote
ExclusiveArch: %{rust_arches}
- rust-entities
ExclusiveArch: %{rust_arches}
- rust-enum-as-inner
ExclusiveArch: %{rust_arches}
- rust-enum-iterator
ExclusiveArch: %{rust_arches}
- rust-enum-iterator-derive
ExclusiveArch: %{rust_arches}
- rust-enum-map
ExclusiveArch: %{rust_arches}
- rust-enum-map-derive
ExclusiveArch: %{rust_arches}
- rust-enum-repr
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-enumflags2
ExclusiveArch: %{rust_arches}
- rust-enumflags2_0.6
ExclusiveArch: %{rust_arches}
- rust-enumflags2_derive
ExclusiveArch: %{rust_arches}
- rust-enumflags2_derive0.6
ExclusiveArch: %{rust_arches}
- rust-enumset
ExclusiveArch: %{rust_arches}
- rust-enumset_derive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-env_logger0.5
ExclusiveArch: %{rust_arches}
- rust-env_logger0.6
ExclusiveArch: %{rust_arches}
- rust-env_logger0.7
ExclusiveArch: %{rust_arches}
- rust-env_logger0.8
ExclusiveArch: %{rust_arches}
- rust-env_proxy
ExclusiveArch: %{rust_arches}
- rust-environment
ExclusiveArch: %{rust_arches}
- rust-envsubst
ExclusiveArch: %{rust_arches}
- rust-epoll
ExclusiveArch: %{rust_arches}
- rust-erased-serde
ExclusiveArch: %{rust_arches}
- rust-err-derive
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-escaper
ExclusiveArch: %{rust_arches}
- rust-escargot
ExclusiveArch: %{rust_arches}
- rust-ethtool
ExclusiveArch: %{rust_arches}
- rust-euclid
ExclusiveArch: %{rust_arches}
- rust-event-listener
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-executable-path
ExclusiveArch: %{rust_arches}
- rust-exitcode
ExclusiveArch: %{rust_arches}
- rust-exitfailure
ExclusiveArch: %{rust_arches}
- rust-expat-sys
ExclusiveArch: %{rust_arches}
- rust-extend
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-faccess
ExclusiveArch: %{rust_arches}
- rust-fail
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure-tools
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake
ExclusiveArch: %{rust_arches}
- rust-fake-simd
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fallible-streaming-iterator
ExclusiveArch: %{rust_arches}
- rust-fallible_collections
ExclusiveArch: %{rust_arches}
- rust-fancy-regex
ExclusiveArch: %{rust_arches}
- rust-fastrand
ExclusiveArch: %{rust_arches}
- rust-fatfs
ExclusiveArch: %{rust_arches}
- rust-fb_procfs
ExclusiveArch: %{rust_arches}
- rust-fbthrift_codegen_includer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-fd-lock
ExclusiveArch: %{rust_arches}
- rust-fdlimit
ExclusiveArch: %{rust_arches}
- rust-fedora
ExclusiveArch: %{rust_arches}
- rust-fedora-coreos-pinger
ExclusiveArch: %{rust_arches}
- rust-fedora-update-feedback
ExclusiveArch: %{rust_arches}
- rust-feed-rs
ExclusiveArch: %{rust_arches}
- rust-feedbin_api
ExclusiveArch: %{rust_arches}
- rust-feedly_api
ExclusiveArch: %{rust_arches}
- rust-femme
ExclusiveArch: %{rust_arches}
- rust-fern
ExclusiveArch: %{rust_arches}
- rust-fever_api
ExclusiveArch: %{rust_arches}
- rust-ffsend
ExclusiveArch: %{rust_arches}
- rust-ffsend-api
ExclusiveArch: %{rust_arches}
- rust-field-offset
ExclusiveArch: %{rust_arches}
- rust-file-per-thread-logger
ExclusiveArch: %{rust_arches}
- rust-filedescriptor
ExclusiveArch: %{rust_arches}
- rust-filesize
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-filetreelist
ExclusiveArch: %{rust_arches}
- rust-find-crate
ExclusiveArch: %{rust_arches}
- rust-fixed
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-float-ord
ExclusiveArch: %{rust_arches}
- rust-fluent
ExclusiveArch: %{rust_arches}
- rust-fluent-bundle
ExclusiveArch: %{rust_arches}
- rust-fluent-langneg
ExclusiveArch: %{rust_arches}
- rust-fluent-syntax
ExclusiveArch: %{rust_arches}
- rust-fn-error-context
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-font-kit
ExclusiveArch: %{rust_arches}
- rust-fontconfig-parser
ExclusiveArch: %{rust_arches}
- rust-fontdb
ExclusiveArch: %{rust_arches}
- rust-fontdue
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-macros
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared0.1
ExclusiveArch: %{rust_arches}
- rust-foreign-types0.3
ExclusiveArch: %{rust_arches}
- rust-form_urlencoded
ExclusiveArch: %{rust_arches}
- rust-format-bytes
ExclusiveArch: %{rust_arches}
- rust-format-bytes-macros
ExclusiveArch: %{rust_arches}
- rust-fragile
ExclusiveArch: %{rust_arches}
- rust-freetype
ExclusiveArch: %{rust_arches}
- rust-freetype-rs
ExclusiveArch: %{rust_arches}
- rust-freetype-sys
ExclusiveArch: %{rust_arches}
- rust-fs-err
ExclusiveArch: %{rust_arches}
- rust-fs-set-times
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fs_extra
ExclusiveArch: %{rust_arches}
- rust-fscommon
ExclusiveArch: %{rust_arches}
- rust-funty
ExclusiveArch: %{rust_arches}
- rust-futf
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-lite
ExclusiveArch: %{rust_arches}
- rust-futures-macro
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-task
ExclusiveArch: %{rust_arches}
- rust-futures-test
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-fuzzy-matcher
ExclusiveArch: %{rust_arches}
- rust-fxhash
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-gdk4
ExclusiveArch: %{rust_arches}
- rust-gdk4-sys
ExclusiveArch: %{rust_arches}
- rust-generic-array
ExclusiveArch: %{rust_arches}
- rust-generic-array0.12
ExclusiveArch: %{rust_arches}
- rust-genetlink
ExclusiveArch: %{rust_arches}
- rust-genmesh
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gethostname
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-getrandom
ExclusiveArch: %{rust_arches}
- rust-getrandom0.1
ExclusiveArch: %{rust_arches}
- rust-getset
ExclusiveArch: %{rust_arches}
- rust-gettext-rs
ExclusiveArch: %{rust_arches}
- rust-gettext-sys
ExclusiveArch: %{rust_arches}
- rust-gh-emoji
ExclusiveArch: %{rust_arches}
- rust-ghash
ExclusiveArch: %{rust_arches}
- rust-ghost
ExclusiveArch: %{rust_arches}
- rust-gif
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-gir-format-check
ExclusiveArch: %{rust_arches}
- rust-git-delta
ExclusiveArch: %{rust_arches}
- rust-git-version
ExclusiveArch: %{rust_arches}
- rust-git-version-macro
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-gitui
ExclusiveArch: %{rust_arches}
- rust-gl_generator
ExclusiveArch: %{rust_arches}
- rust-glam
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-macros
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-globwalk
ExclusiveArch: %{rust_arches}
- rust-glutin
ExclusiveArch: %{rust_arches}
- rust-glutin_egl_sys
ExclusiveArch: %{rust_arches}
- rust-glutin_glx_sys
ExclusiveArch: %{rust_arches}
- rust-glyph_brush_layout
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-gptman
ExclusiveArch: %{rust_arches}
- rust-graphene-rs
ExclusiveArch: %{rust_arches}
- rust-graphene-sys
ExclusiveArch: %{rust_arches}
- rust-greetd_ipc
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-grep-cli
ExclusiveArch: %{rust_arches}
- rust-grep-matcher
ExclusiveArch: %{rust_arches}
- rust-grep-pcre2
ExclusiveArch: %{rust_arches}
- rust-grep-printer
ExclusiveArch: %{rust_arches}
- rust-grep-regex
ExclusiveArch: %{rust_arches}
- rust-grep-searcher
ExclusiveArch: %{rust_arches}
- rust-groupable
ExclusiveArch: %{rust_arches}
- rust-gsk4
ExclusiveArch: %{rust_arches}
- rust-gsk4-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video-sys
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gtk3-macros
ExclusiveArch: %{rust_arches}
- rust-gtk4
ExclusiveArch: %{rust_arches}
- rust-gtk4-macros
ExclusiveArch: %{rust_arches}
- rust-gtk4-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-h2_0.2
ExclusiveArch: %{rust_arches}
- rust-half
ExclusiveArch: %{rust_arches}
- rust-hamcrest2
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-hashbrown
ExclusiveArch: %{rust_arches}
- rust-hashbrown0.9
ExclusiveArch: %{rust_arches}
- rust-hashlink
ExclusiveArch: %{rust_arches}
- rust-headers
ExclusiveArch: %{rust_arches}
- rust-headers-core
ExclusiveArch: %{rust_arches}
- rust-headers-derive
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-heatseeker
ExclusiveArch: %{rust_arches}
- rust-heck
ExclusiveArch: %{rust_arches}
- rust-heck0.3
ExclusiveArch: %{rust_arches}
- rust-helvum
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-hex-literal
ExclusiveArch: %{rust_arches}
- rust-hex-literal-impl
ExclusiveArch: %{rust_arches}
- rust-hex-literal0.2
ExclusiveArch: %{rust_arches}
- rust-hexyl
ExclusiveArch: %{rust_arches}
- rust-hidapi
ExclusiveArch: %{rust_arches}
- rust-hkdf
ExclusiveArch: %{rust_arches}
- rust-hkdf0.11
ExclusiveArch: %{rust_arches}
- rust-hmac
ExclusiveArch: %{rust_arches}
- rust-hmac0.11
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-hostname
ExclusiveArch: %{rust_arches}
- rust-hostname-validator
ExclusiveArch: %{rust_arches}
- rust-hound
ExclusiveArch: %{rust_arches}
- rust-html-escape
ExclusiveArch: %{rust_arches}
- rust-html2pango
ExclusiveArch: %{rust_arches}
- rust-html5ever
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-http-body
ExclusiveArch: %{rust_arches}
- rust-http-body0.3
ExclusiveArch: %{rust_arches}
- rust-http0.1
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-httpdate
ExclusiveArch: %{rust_arches}
- rust-human-panic
ExclusiveArch: %{rust_arches}
- rust-human-sort
ExclusiveArch: %{rust_arches}
- rust-humansize
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-humantime-serde
ExclusiveArch: %{rust_arches}
- rust-humantime1
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-rustls
ExclusiveArch: %{rust_arches}
- rust-hyper-staticfile
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-tls0.4
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-hyper0.13
ExclusiveArch: %{rust_arches}
- rust-hyperfine
ExclusiveArch: %{rust_arches}
- rust-i18n-config
ExclusiveArch: %{rust_arches}
- rust-i18n-embed
ExclusiveArch: %{rust_arches}
- rust-i18n-embed-fl
ExclusiveArch: %{rust_arches}
- rust-i18n-embed-impl
ExclusiveArch: %{rust_arches}
- rust-i3ipc
ExclusiveArch: %{rust_arches}
- rust-iai
ExclusiveArch: %{rust_arches}
- rust-id-arena
ExclusiveArch: %{rust_arches}
- rust-ident_case
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-idna0.1
ExclusiveArch: %{rust_arches}
- rust-ifcfg-devname
ExclusiveArch: %{rust_arches}
- rust-ignition-config
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-im-rc
ExclusiveArch: %{rust_arches}
- rust-image
ExclusiveArch: %{rust_arches}
- rust-image-roll
ExclusiveArch: %{rust_arches}
- rust-imgref
ExclusiveArch: %{rust_arches}
- rust-imgui
ExclusiveArch: %{rust_arches}
- rust-imgui-sys
ExclusiveArch: %{rust_arches}
- rust-imgui-winit-support
ExclusiveArch: %{rust_arches}
- rust-indenter
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-indicatif
ExclusiveArch: %{rust_arches}
- rust-indicatif0.15
ExclusiveArch: %{rust_arches}
- rust-indoc
ExclusiveArch: %{rust_arches}
- rust-infer
ExclusiveArch: %{rust_arches}
- rust-inferno
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-inotify
ExclusiveArch: %{rust_arches}
- rust-inotify-sys
ExclusiveArch: %{rust_arches}
- rust-inout
ExclusiveArch: %{rust_arches}
- rust-input_buffer
ExclusiveArch: %{rust_arches}
- rust-insta
ExclusiveArch: %{rust_arches}
- rust-instant
ExclusiveArch: %{rust_arches}
- rust-interpolate_name
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-intl-memoizer
ExclusiveArch: %{rust_arches}
- rust-intl_pluralrules
ExclusiveArch: %{rust_arches}
- rust-invalidstring
ExclusiveArch: %{rust_arches}
- rust-inventory
ExclusiveArch: %{rust_arches}
- rust-inventory-impl
ExclusiveArch: %{rust_arches}
- rust-io-extras
ExclusiveArch: %{rust_arches}
- rust-io-lifetimes
ExclusiveArch: %{rust_arches}
- rust-ioctl-rs
ExclusiveArch: %{rust_arches}
- rust-iocuddle
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-ipnet
ExclusiveArch: %{rust_arches}
- rust-ipnetwork
ExclusiveArch: %{rust_arches}
- rust-ipnetwork0.17
ExclusiveArch: %{rust_arches}
- rust-iptables
ExclusiveArch: %{rust_arches}
- rust-iron
ExclusiveArch: %{rust_arches}
- rust-is_ci
ExclusiveArch: %{rust_arches}
- rust-is_debug
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-iter-read
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itertools-num
ExclusiveArch: %{rust_arches}
- rust-itertools0.8
ExclusiveArch: %{rust_arches}
- rust-itertools0.9
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-itoa0.4
ExclusiveArch: %{rust_arches}
- rust-ivf
ExclusiveArch: %{rust_arches}
- rust-jetscii
ExclusiveArch: %{rust_arches}
- rust-jieba-rs
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-josekit
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder
ExclusiveArch: %{rust_arches}
- rust-jql
ExclusiveArch: %{rust_arches}
- rust-js-sys
ExclusiveArch: %{rust_arches}
- rust-js_int
ExclusiveArch: %{rust_arches}
- rust-json
ExclusiveArch: %{rust_arches}
- rust-json_value_merge
ExclusiveArch: %{rust_arches}
- rust-just
ExclusiveArch: %{rust_arches}
- rust-jwalk
ExclusiveArch: %{rust_arches}
- rust-k9
ExclusiveArch: %{rust_arches}
- rust-keccak
ExclusiveArch: %{rust_arches}
- rust-khronos_api
ExclusiveArch: %{rust_arches}
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kurbo
ExclusiveArch: %{rust_arches}
- rust-kv-log-macro
ExclusiveArch: %{rust_arches}
- rust-lab
ExclusiveArch: %{rust_arches}
- rust-lalrpop
ExclusiveArch: %{rust_arches}
- rust-lalrpop-util
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-leb128
ExclusiveArch: %{rust_arches}
- rust-lewton
ExclusiveArch: %{rust_arches}
- rust-lexical-core
ExclusiveArch: %{rust_arches}
- rust-lexiclean
ExclusiveArch: %{rust_arches}
- rust-libblkid-rs
ExclusiveArch: %{rust_arches}
- rust-libblkid-rs-sys
ExclusiveArch: %{rust_arches}
- rust-libbpf-cargo
ExclusiveArch: %{rust_arches}
- rust-libbpf-rs
ExclusiveArch: %{rust_arches}
- rust-libbpf-sys
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs-sys
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libdeflate-sys
ExclusiveArch: %{rust_arches}
- rust-libdeflater
ExclusiveArch: %{rust_arches}
- rust-libflate
ExclusiveArch: %{rust_arches}
- rust-libflate_lz77
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libhandy
ExclusiveArch: %{rust_arches}
- rust-libhandy-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libloading0.6
ExclusiveArch: %{rust_arches}
- rust-libm
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libnotcurses-sys
ExclusiveArch: %{rust_arches}
- rust-liboverdrop
ExclusiveArch: %{rust_arches}
- rust-libpulse-binding
ExclusiveArch: %{rust_arches}
- rust-libpulse-sys
ExclusiveArch: %{rust_arches}
- rust-libseccomp-sys
ExclusiveArch: %{rust_arches}
- rust-libslirp
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-libspa
ExclusiveArch: %{rust_arches}
- rust-libspa-sys
ExclusiveArch: %{rust_arches}
- rust-libsqlite3-sys
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libsystemd
ExclusiveArch: %{rust_arches}
- rust-libsystemd-sys
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libwebp
ExclusiveArch: %{rust_arches}
- rust-libwebp-sys2
ExclusiveArch: %{rust_arches}
- rust-libxml
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-line-wrap
ExclusiveArch: %{rust_arches}
- rust-link-cplusplus
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-linkify
ExclusiveArch: %{rust_arches}
- rust-linreg
ExclusiveArch: %{rust_arches}
- rust-linux-raw-sys
ExclusiveArch: %{rust_arches}
- rust-linux_proc
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-listenfd
ExclusiveArch: %{rust_arches}
- rust-lmdb
ExclusiveArch: %{rust_arches}
- rust-lmdb-sys
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-locale_config
ExclusiveArch: %{rust_arches}
- rust-lock_api
ExclusiveArch: %{rust_arches}
- rust-lockfree
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log-mdc
ExclusiveArch: %{rust_arches}
- rust-log-panics
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-log4rs
ExclusiveArch: %{rust_arches}
- rust-loggerv
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru-cache
ExclusiveArch: %{rust_arches}
- rust-lscolors
ExclusiveArch: %{rust_arches}
- rust-lsd
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-lzw
ExclusiveArch: %{rust_arches}
- rust-mac
ExclusiveArch: %{rust_arches}
- rust-mac_address
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-macroquad_macro
ExclusiveArch: %{rust_arches}
- rust-madvr_parse
ExclusiveArch: %{rust_arches}
- rust-magic-crypt
ExclusiveArch: %{rust_arches}
- rust-maildir
ExclusiveArch: %{rust_arches}
- rust-mailparse
ExclusiveArch: %{rust_arches}
- rust-man
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-markup5ever
ExclusiveArch: %{rust_arches}
- rust-markup5ever_rcdom
ExclusiveArch: %{rust_arches}
- rust-match_cfg
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-matrixcompare
ExclusiveArch: %{rust_arches}
- rust-matrixcompare-core
ExclusiveArch: %{rust_arches}
- rust-matrixcompare-mock
ExclusiveArch: %{rust_arches}
- rust-matrixmultiply
ExclusiveArch: %{rust_arches}
- rust-maxminddb
ExclusiveArch: %{rust_arches}
- rust-maybe-owned
ExclusiveArch: %{rust_arches}
- rust-maybe-uninit
ExclusiveArch: %{rust_arches}
- rust-mbox
ExclusiveArch: %{rust_arches}
- rust-mbrman
ExclusiveArch: %{rust_arches}
- rust-md-5
ExclusiveArch: %{rust_arches}
- rust-md-5_0.9
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-mdl
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memmap2
ExclusiveArch: %{rust_arches}
- rust-memmem
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-memoffset0.5
ExclusiveArch: %{rust_arches}
- rust-memsec
ExclusiveArch: %{rust_arches}
- rust-micro-timer
ExclusiveArch: %{rust_arches}
- rust-micro-timer-macros
ExclusiveArch: %{rust_arches}
- rust-miette
ExclusiveArch: %{rust_arches}
- rust-miette-derive
ExclusiveArch: %{rust_arches}
- rust-migrations_internals
ExclusiveArch: %{rust_arches}
- rust-migrations_macros
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-mime_guess
ExclusiveArch: %{rust_arches}
- rust-mime_guess1
ExclusiveArch: %{rust_arches}
- rust-miniflux_api
ExclusiveArch: %{rust_arches}
- rust-minify-html
ExclusiveArch: %{rust_arches}
- rust-minimad
ExclusiveArch: %{rust_arches}
- rust-minimal-lexical
ExclusiveArch: %{rust_arches}
- rust-minimp3
ExclusiveArch: %{rust_arches}
- rust-minimp3-sys
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide0.3
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mint
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mio0.6
ExclusiveArch: %{rust_arches}
- rust-mio0.7
ExclusiveArch: %{rust_arches}
- rust-mktemp
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-mockall
ExclusiveArch: %{rust_arches}
- rust-mockall_derive
ExclusiveArch: %{rust_arches}
- rust-mockall_double
ExclusiveArch: %{rust_arches}
- rust-mockito
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-more-asserts
ExclusiveArch: %{rust_arches}
- rust-mp4parse
ExclusiveArch: %{rust_arches}
- rust-msgbox
ExclusiveArch: %{rust_arches}
- rust-muldiv
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-multipart
ExclusiveArch: %{rust_arches}
- rust-mustache
ExclusiveArch: %{rust_arches}
- rust-nalgebra
ExclusiveArch: %{rust_arches}
- rust-nalgebra-macros
ExclusiveArch: %{rust_arches}
- rust-nasm-rs
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-navi
ExclusiveArch: %{rust_arches}
- rust-nb-connect
ExclusiveArch: %{rust_arches}
- rust-ncurses
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-core
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-generic
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-route
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-utils
ExclusiveArch: %{rust_arches}
- rust-netlink-proto
ExclusiveArch: %{rust_arches}
- rust-netlink-sys
ExclusiveArch: %{rust_arches}
- rust-netmap_sys
ExclusiveArch: %{rust_arches}
- rust-nettle
ExclusiveArch: %{rust_arches}
- rust-nettle-sys
ExclusiveArch: %{rust_arches}
- rust-new_debug_unreachable
ExclusiveArch: %{rust_arches}
- rust-news-flash
ExclusiveArch: %{rust_arches}
- rust-newsblur_api
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nibble_vec
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nix0.14
ExclusiveArch: %{rust_arches}
- rust-nix0.17
ExclusiveArch: %{rust_arches}
- rust-nix0.18
ExclusiveArch: %{rust_arches}
- rust-nix0.20
ExclusiveArch: %{rust_arches}
- rust-nix0.22
ExclusiveArch: %{rust_arches}
- rust-no-panic
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nohash-hasher
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom4
ExclusiveArch: %{rust_arches}
- rust-nom5
ExclusiveArch: %{rust_arches}
- rust-nom6
ExclusiveArch: %{rust_arches}
- rust-noop_proc_macro
ExclusiveArch: %{rust_arches}
- rust-normalize-line-endings
ExclusiveArch: %{rust_arches}
- rust-notify
ExclusiveArch: %{rust_arches}
- rust-notify-rust
ExclusiveArch: %{rust_arches}
- rust-nu-ansi-term
ExclusiveArch: %{rust_arches}
- rust-nu-json
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-bigint-dig
ExclusiveArch: %{rust_arches}
- rust-num-bigint0.3
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-complex0.3
ExclusiveArch: %{rust_arches}
- rust-num-derive
ExclusiveArch: %{rust_arches}
- rust-num-format
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-rational0.3
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num0.3
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-num_enum
ExclusiveArch: %{rust_arches}
- rust-num_enum_derive
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-numtoa
ExclusiveArch: %{rust_arches}
- rust-oauth2
ExclusiveArch: %{rust_arches}
- rust-obfstr
ExclusiveArch: %{rust_arches}
- rust-obj
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-odds
ExclusiveArch: %{rust_arches}
- rust-ogg
ExclusiveArch: %{rust_arches}
- rust-oid
ExclusiveArch: %{rust_arches}
- rust-once_cell
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-onig_sys
ExclusiveArch: %{rust_arches}
- rust-oorandom
ExclusiveArch: %{rust_arches}
- rust-opaque-debug
ExclusiveArch: %{rust_arches}
- rust-open
ExclusiveArch: %{rust_arches}
- rust-open1
ExclusiveArch: %{rust_arches}
- rust-openat
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-opener
ExclusiveArch: %{rust_arches}
- rust-openssh-keys
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-opml
ExclusiveArch: %{rust_arches}
- rust-option-operations
ExclusiveArch: %{rust_arches}
- rust-ord_subset
ExclusiveArch: %{rust_arches}
- rust-ordered-float
ExclusiveArch: %{rust_arches}
- rust-ordered-multimap
ExclusiveArch: %{rust_arches}
- rust-os-release
ExclusiveArch: %{rust_arches}
- rust-os_info
ExclusiveArch: %{rust_arches}
- rust-os_pipe
ExclusiveArch: %{rust_arches}
- rust-os_pipe0.9
ExclusiveArch: %{rust_arches}
- rust-os_str_bytes
ExclusiveArch: %{rust_arches}
- rust-os_type
ExclusiveArch: %{rust_arches}
- rust-osmesa-sys
ExclusiveArch: %{rust_arches}
- rust-osstrtools
ExclusiveArch: %{rust_arches}
- rust-ouroboros
ExclusiveArch: %{rust_arches}
- rust-ouroboros_macro
ExclusiveArch: %{rust_arches}
- rust-overload
ExclusiveArch: %{rust_arches}
- rust-owned-alloc
ExclusiveArch: %{rust_arches}
- rust-owned_ttf_parser
ExclusiveArch: %{rust_arches}
- rust-owned_ttf_parser0.12
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-owo-colors
ExclusiveArch: %{rust_arches}
- rust-oxipng
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches}
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-page_size
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-palette
ExclusiveArch: %{rust_arches}
- rust-palette_derive
ExclusiveArch: %{rust_arches}
- rust-pam
ExclusiveArch: %{rust_arches}
- rust-pam-client
ExclusiveArch: %{rust_arches}
- rust-pam-sys
ExclusiveArch: %{rust_arches}
- rust-pancurses
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-paris
ExclusiveArch: %{rust_arches}
- rust-parity-wasm
ExclusiveArch: %{rust_arches}
- rust-parking
ExclusiveArch: %{rust_arches}
- rust-parking_lot
ExclusiveArch: %{rust_arches}
- rust-parking_lot0.11
ExclusiveArch: %{rust_arches}
- rust-parking_lot_core
ExclusiveArch: %{rust_arches}
- rust-parking_lot_core0.8
ExclusiveArch: %{rust_arches}
- rust-parse-zoneinfo
ExclusiveArch: %{rust_arches}
- rust-parse_cfg
ExclusiveArch: %{rust_arches}
- rust-parsec-client
ExclusiveArch: %{rust_arches}
- rust-parsec-interface
ExclusiveArch: %{rust_arches}
- rust-partial-io
ExclusiveArch: %{rust_arches}
- rust-partition-identity
ExclusiveArch: %{rust_arches}
- rust-password-hash
ExclusiveArch: %{rust_arches}
- rust-paste
ExclusiveArch: %{rust_arches}
- rust-path-absolutize
ExclusiveArch: %{rust_arches}
- rust-path-dedot
ExclusiveArch: %{rust_arches}
- rust-path-slash
ExclusiveArch: %{rust_arches}
- rust-pathdiff
ExclusiveArch: %{rust_arches}
- rust-pathfinder_geometry
ExclusiveArch: %{rust_arches}
- rust-pathfinder_simd
ExclusiveArch: %{rust_arches}
- rust-pbkdf2
ExclusiveArch: %{rust_arches}
- rust-pbr
ExclusiveArch: %{rust_arches}
- rust-pcap
ExclusiveArch: %{rust_arches}
- rust-pcre2
ExclusiveArch: %{rust_arches}
- rust-pcre2-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-peg-macros
ExclusiveArch: %{rust_arches}
- rust-peg-runtime
ExclusiveArch: %{rust_arches}
- rust-peg0.5
ExclusiveArch: %{rust_arches}
- rust-pem
ExclusiveArch: %{rust_arches}
- rust-pem-rfc7468
ExclusiveArch: %{rust_arches}
- rust-pem0.8
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-percent-encoding1
ExclusiveArch: %{rust_arches}
- rust-peresil
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-pest_generator
ExclusiveArch: %{rust_arches}
- rust-pest_meta
ExclusiveArch: %{rust_arches}
- rust-petgraph
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf0.7
ExclusiveArch: %{rust_arches}
- rust-phf0.8
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_codegen0.7
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_generator0.7
ExclusiveArch: %{rust_arches}
- rust-phf_generator0.8
ExclusiveArch: %{rust_arches}
- rust-phf_macros
ExclusiveArch: %{rust_arches}
- rust-phf_macros0.7
ExclusiveArch: %{rust_arches}
- rust-phf_macros0.8
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-phf_shared0.7
ExclusiveArch: %{rust_arches}
- rust-phf_shared0.8
ExclusiveArch: %{rust_arches}
- rust-picky-asn1
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-der
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-x509
ExclusiveArch: %{rust_arches}
- rust-pico-args
ExclusiveArch: %{rust_arches}
- rust-pid
ExclusiveArch: %{rust_arches}
- rust-pin-project
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal0.4
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite0.1
ExclusiveArch: %{rust_arches}
- rust-pin-project0.4
ExclusiveArch: %{rust_arches}
- rust-pin-utils
ExclusiveArch: %{rust_arches}
- rust-pipe
ExclusiveArch: %{rust_arches}
- rust-piper
ExclusiveArch: %{rust_arches}
- rust-pipewire
ExclusiveArch: %{rust_arches}
- rust-pipewire-sys
ExclusiveArch: %{rust_arches}
- rust-piston-float
ExclusiveArch: %{rust_arches}
- rust-piston-graphics_api_version
ExclusiveArch: %{rust_arches}
- rust-piston-viewport
ExclusiveArch: %{rust_arches}
- rust-pistoncore-input
ExclusiveArch: %{rust_arches}
- rust-pistoncore-window
ExclusiveArch: %{rust_arches}
- rust-pkcs1
ExclusiveArch: %{rust_arches}
- rust-pkcs11
ExclusiveArch: %{rust_arches}
- rust-pkcs5
ExclusiveArch: %{rust_arches}
- rust-pkcs8
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-pleaser
ExclusiveArch: %{rust_arches}
- rust-plist
ExclusiveArch: %{rust_arches}
- rust-plotlib
ExclusiveArch: %{rust_arches}
- rust-plotters
ExclusiveArch: %{rust_arches}
- rust-plotters-backend
ExclusiveArch: %{rust_arches}
- rust-plotters-bitmap
ExclusiveArch: %{rust_arches}
- rust-plotters-svg
ExclusiveArch: %{rust_arches}
- rust-plugin
ExclusiveArch: %{rust_arches}
- rust-pnet_base
ExclusiveArch: %{rust_arches}
- rust-pnet_datalink
ExclusiveArch: %{rust_arches}
- rust-pnet_sys
ExclusiveArch: %{rust_arches}
- rust-png
ExclusiveArch: %{rust_arches}
- rust-png0.16
ExclusiveArch: %{rust_arches}
- rust-podio
ExclusiveArch: %{rust_arches}
- rust-polling
ExclusiveArch: %{rust_arches}
- rust-polyval
ExclusiveArch: %{rust_arches}
- rust-pom
ExclusiveArch: %{rust_arches}
- rust-pommes
ExclusiveArch: %{rust_arches}
- rust-ppv-lite86
ExclusiveArch: %{rust_arches}
- rust-pq-sys
ExclusiveArch: %{rust_arches}
- rust-precomputed-hash
ExclusiveArch: %{rust_arches}
- rust-predicates
ExclusiveArch: %{rust_arches}
- rust-predicates-core
ExclusiveArch: %{rust_arches}
- rust-predicates-tree
ExclusiveArch: %{rust_arches}
- rust-predicates1
ExclusiveArch: %{rust_arches}
- rust-pretty
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions0.6
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions0.7
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-prettytable-rs
ExclusiveArch: %{rust_arches}
- rust-proc-macro-crate
ExclusiveArch: %{rust_arches}
- rust-proc-macro-crate0.1
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error-attr
ExclusiveArch: %{rust_arches}
- rust-proc-macro-hack
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.4
ExclusiveArch: %{rust_arches}
- rust-proc-maps
ExclusiveArch: %{rust_arches}
- rust-proc-mounts
ExclusiveArch: %{rust_arches}
- rust-proc-quote-impl
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-process_control
ExclusiveArch: %{rust_arches}
- rust-process_path
ExclusiveArch: %{rust_arches}
- rust-procfs
ExclusiveArch: %{rust_arches}
- rust-procs
ExclusiveArch: %{rust_arches}
- rust-progress-streams
ExclusiveArch: %{rust_arches}
- rust-prometheus
ExclusiveArch: %{rust_arches}
- rust-proptest
ExclusiveArch: %{rust_arches}
- rust-proptest-derive
ExclusiveArch: %{rust_arches}
- rust-proptest0.10
ExclusiveArch: %{rust_arches}
- rust-prost
ExclusiveArch: %{rust_arches}
- rust-prost-build
ExclusiveArch: %{rust_arches}
- rust-prost-derive
ExclusiveArch: %{rust_arches}
- rust-prost-types
ExclusiveArch: %{rust_arches}
- rust-protobuf
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen-pure
ExclusiveArch: %{rust_arches}
- rust-protoc
ExclusiveArch: %{rust_arches}
- rust-protoc-rust
ExclusiveArch: %{rust_arches}
- rust-psa-crypto
ExclusiveArch: %{rust_arches}
- rust-psa-crypto-sys
ExclusiveArch: %{rust_arches}
- rust-psd
ExclusiveArch: %{rust_arches}
- rust-psl-types
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-ptr_meta
ExclusiveArch: %{rust_arches}
- rust-ptr_meta_derive
ExclusiveArch: %{rust_arches}
- rust-publicsuffix
ExclusiveArch: %{rust_arches}
- rust-publicsuffix1
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-pulse
ExclusiveArch: %{rust_arches}
- rust-pure-rust-locales
ExclusiveArch: %{rust_arches}
- rust-pyo3
ExclusiveArch: %{rust_arches}
- rust-pyo3-build-config
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros-backend
ExclusiveArch: %{rust_arches}
- rust-python-launcher
ExclusiveArch: %{rust_arches}
- rust-python3-sys
ExclusiveArch: %{rust_arches}
- rust-qr2term
ExclusiveArch: %{rust_arches}
- rust-qrcode
ExclusiveArch: %{rust_arches}
- rust-qstring
ExclusiveArch: %{rust_arches}
- rust-quad-rand
ExclusiveArch: %{rust_arches}
- rust-quantiles
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quick-error1
ExclusiveArch: %{rust_arches}
- rust-quick-xml
ExclusiveArch: %{rust_arches}
- rust-quick-xml0.20
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickcheck0.6
ExclusiveArch: %{rust_arches}
- rust-quickcheck0.9
ExclusiveArch: %{rust_arches}
- rust-quickcheck_macros
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quicli
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.6
ExclusiveArch: %{rust_arches}
- rust-quoted_printable
ExclusiveArch: %{rust_arches}
- rust-r2d2
ExclusiveArch: %{rust_arches}
- rust-radium
ExclusiveArch: %{rust_arches}
- rust-radix64
ExclusiveArch: %{rust_arches}
- rust-radix_trie
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand0.5
ExclusiveArch: %{rust_arches}
- rust-rand0.6
ExclusiveArch: %{rust_arches}
- rust-rand0.7
ExclusiveArch: %{rust_arches}
- rust-rand_chacha
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.1
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.2
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rand_core0.3
ExclusiveArch: %{rust_arches}
- rust-rand_core0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core0.5
ExclusiveArch: %{rust_arches}
- rust-rand_distr
ExclusiveArch: %{rust_arches}
- rust-rand_hc
ExclusiveArch: %{rust_arches}
- rust-rand_hc0.1
ExclusiveArch: %{rust_arches}
- rust-rand_isaac
ExclusiveArch: %{rust_arches}
- rust-rand_isaac0.1
ExclusiveArch: %{rust_arches}
- rust-rand_jitter
ExclusiveArch: %{rust_arches}
- rust-rand_jitter0.1
ExclusiveArch: %{rust_arches}
- rust-rand_os
ExclusiveArch: %{rust_arches}
- rust-rand_os0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.2
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift0.1
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift0.2
ExclusiveArch: %{rust_arches}
- rust-rand_xoshiro
ExclusiveArch: %{rust_arches}
- rust-random
ExclusiveArch: %{rust_arches}
- rust-random-fast-rng
ExclusiveArch: %{rust_arches}
- rust-random-trait
ExclusiveArch: %{rust_arches}
- rust-randomize
ExclusiveArch: %{rust_arches}
- rust-rav1e
ExclusiveArch: %{rust_arches}
- rust-raw-window-handle
ExclusiveArch: %{rust_arches}
- rust-rawpointer
ExclusiveArch: %{rust_arches}
- rust-rawslice
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-rbspy
ExclusiveArch: %{rust_arches}
- rust-rbspy-ruby-structs
ExclusiveArch: %{rust_arches}
- rust-rbspy-testdata
ExclusiveArch: %{rust_arches}
- rust-rd-agent
ExclusiveArch: %{rust_arches}
- rust-rd-agent-intf
ExclusiveArch: %{rust_arches}
- rust-rd-hashd
ExclusiveArch: %{rust_arches}
- rust-rd-hashd-intf
ExclusiveArch: %{rust_arches}
- rust-rd-util
ExclusiveArch: %{rust_arches}
- rust-read-process-memory
ExclusiveArch: %{rust_arches}
- rust-read_input
ExclusiveArch: %{rust_arches}
- rust-readability-fork
ExclusiveArch: %{rust_arches}
- rust-readwrite
ExclusiveArch: %{rust_arches}
- rust-recycler
ExclusiveArch: %{rust_arches}
- rust-ref-cast
ExclusiveArch: %{rust_arches}
- rust-ref-cast-impl
ExclusiveArch: %{rust_arches}
- rust-regalloc
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-automata
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-region
ExclusiveArch: %{rust_arches}
- rust-relative-path
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remoteprocess
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-rend
ExclusiveArch: %{rust_arches}
- rust-rental
ExclusiveArch: %{rust_arches}
- rust-rental-impl
ExclusiveArch: %{rust_arches}
- rust-reqwest
ExclusiveArch: %{rust_arches}
- rust-reqwest0.10
ExclusiveArch: %{rust_arches}
- rust-resctl-bench
ExclusiveArch: %{rust_arches}
- rust-resctl-bench-intf
ExclusiveArch: %{rust_arches}
- rust-resctl-demo
ExclusiveArch: %{rust_arches}
- rust-resize
ExclusiveArch: %{rust_arches}
- rust-resolv-conf
ExclusiveArch: %{rust_arches}
- rust-restson
ExclusiveArch: %{rust_arches}
- rust-retry
ExclusiveArch: %{rust_arches}
- rust-rgb
ExclusiveArch: %{rust_arches}
- rust-ring
ExclusiveArch: %{rust_arches}
- rust-ringbuf
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rkyv
ExclusiveArch: %{rust_arches}
- rust-rkyv_derive
ExclusiveArch: %{rust_arches}
- rust-rle-decode-fast
ExclusiveArch: %{rust_arches}
- rust-rmp
ExclusiveArch: %{rust_arches}
- rust-rmp-serde
ExclusiveArch: %{rust_arches}
- rust-rodio
ExclusiveArch: %{rust_arches}
- rust-roff
ExclusiveArch: %{rust_arches}
- rust-ron
ExclusiveArch: %{rust_arches}
- rust-roxmltree
ExclusiveArch: %{rust_arches}
- rust-rpassword
ExclusiveArch: %{rust_arches}
- rust-rpick
ExclusiveArch: %{rust_arches}
- rust-rsa
ExclusiveArch: %{rust_arches}
- rust-rspec
ExclusiveArch: %{rust_arches}
- rust-rtnetlink
ExclusiveArch: %{rust_arches}
- rust-rudo
ExclusiveArch: %{rust_arches}
- rust-rusqlite
ExclusiveArch: %{rust_arches}
- rust-rust-embed
ExclusiveArch: %{rust_arches}
- rust-rust-embed-impl
ExclusiveArch: %{rust_arches}
- rust-rust-embed-utils
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rust-stemmers
ExclusiveArch: %{rust_arches}
- rust-rust_decimal
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_normal_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_sys
ExclusiveArch: %{rust_arches}
- rust-rustbus
ExclusiveArch: %{rust_arches}
- rust-rustbus_derive
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-hash
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_tools_util
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustc_version0.3
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-rustfix
ExclusiveArch: %{rust_arches}
- rust-rustio
ExclusiveArch: %{rust_arches}
- rust-rustix
ExclusiveArch: %{rust_arches}
- rust-rustls
ExclusiveArch: %{rust_arches}
- rust-rustls-native-certs
ExclusiveArch: %{rust_arches}
- rust-rustls-pemfile
ExclusiveArch: %{rust_arches}
- rust-rusttype
ExclusiveArch: %{rust_arches}
- rust-rustversion
ExclusiveArch: %{rust_arches}
- rust-rusty-fork
ExclusiveArch: %{rust_arches}
- rust-rustyline
ExclusiveArch: %{rust_arches}
- rust-rustyline-derive
ExclusiveArch: %{rust_arches}
- rust-ryu
ExclusiveArch: %{rust_arches}
- rust-safe-transmute
ExclusiveArch: %{rust_arches}
- rust-safe_arch
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-salsa20
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-sapp-kms
ExclusiveArch: %{rust_arches}
- rust-sapp-linux
ExclusiveArch: %{rust_arches}
- rust-sass-rs
ExclusiveArch: %{rust_arches}
- rust-sass-sys
ExclusiveArch: %{rust_arches}
- rust-scan_fmt
ExclusiveArch: %{rust_arches}
- rust-scheduled-thread-pool
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped-tls-hkt
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scopetime
ExclusiveArch: %{rust_arches}
- rust-scratch
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-scrypt
ExclusiveArch: %{rust_arches}
- rust-sct
ExclusiveArch: %{rust_arches}
- rust-sd
ExclusiveArch: %{rust_arches}
- rust-sd-notify
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-seahash3
ExclusiveArch: %{rust_arches}
- rust-secrecy
ExclusiveArch: %{rust_arches}
- rust-secret-service
ExclusiveArch: %{rust_arches}
- rust-self_cell
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.9
ExclusiveArch: %{rust_arches}
- rust-semver0.11
ExclusiveArch: %{rust_arches}
- rust-sequoia-autocrypt
ExclusiveArch: %{rust_arches}
- rust-sequoia-ipc
ExclusiveArch: %{rust_arches}
- rust-sequoia-keyring-linter
ExclusiveArch: %{rust_arches}
- rust-sequoia-net
ExclusiveArch: %{rust_arches}
- rust-sequoia-octopus-librnp
ExclusiveArch: %{rust_arches}
- rust-sequoia-openpgp
ExclusiveArch: %{rust_arches}
- rust-sequoia-openpgp-mt
ExclusiveArch: %{rust_arches}
- rust-sequoia-sop
ExclusiveArch: %{rust_arches}
- rust-sequoia-sq
ExclusiveArch: %{rust_arches}
- rust-sequoia-sqv
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde-pickle
ExclusiveArch: %{rust_arches}
- rust-serde-value
ExclusiveArch: %{rust_arches}
- rust-serde-xml-rs
ExclusiveArch: %{rust_arches}
- rust-serde_bser
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_fmt
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_repr
ExclusiveArch: %{rust_arches}
- rust-serde_stacker
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_url_params
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded0.6
ExclusiveArch: %{rust_arches}
- rust-serde_with
ExclusiveArch: %{rust_arches}
- rust-serde_with_macros
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-serial-core
ExclusiveArch: %{rust_arches}
- rust-serial_test
ExclusiveArch: %{rust_arches}
- rust-serial_test_derive
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig-sys
ExclusiveArch: %{rust_arches}
- rust-sev
ExclusiveArch: %{rust_arches}
- rust-sevctl
ExclusiveArch: x86_64
- rust-sha-1
ExclusiveArch: %{rust_arches}
- rust-sha-1_0.9
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-sha1_0.6
ExclusiveArch: %{rust_arches}
- rust-sha1_smol
ExclusiveArch: %{rust_arches}
- rust-sha1collisiondetection
ExclusiveArch: %{rust_arches}
- rust-sha2
ExclusiveArch: %{rust_arches}
- rust-sha2_0.9
ExclusiveArch: %{rust_arches}
- rust-sha3
ExclusiveArch: %{rust_arches}
- rust-sha3_0.9
ExclusiveArch: %{rust_arches}
- rust-shadow-rs
ExclusiveArch: %{rust_arches}
- rust-shared_child
ExclusiveArch: %{rust_arches}
- rust-shared_library
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shell-words
ExclusiveArch: %{rust_arches}
- rust-shellexpand
ExclusiveArch: %{rust_arches}
- rust-shellwords
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-signal
ExclusiveArch: %{rust_arches}
- rust-signal-hook
ExclusiveArch: %{rust_arches}
- rust-signal-hook-mio
ExclusiveArch: %{rust_arches}
- rust-signal-hook-registry
ExclusiveArch: %{rust_arches}
- rust-signal-hook0.1
ExclusiveArch: %{rust_arches}
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-simba
ExclusiveArch: %{rust_arches}
- rust-simd_helpers
ExclusiveArch: %{rust_arches}
- rust-simdutf8
ExclusiveArch: %{rust_arches}
- rust-similar
ExclusiveArch: %{rust_arches}
- rust-similar-asserts
ExclusiveArch: %{rust_arches}
- rust-simple-error
ExclusiveArch: %{rust_arches}
- rust-simple_asn1
ExclusiveArch: %{rust_arches}
- rust-simple_logger
ExclusiveArch: %{rust_arches}
- rust-simplelog
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-size
ExclusiveArch: %{rust_arches}
- rust-sized-chunks
ExclusiveArch: %{rust_arches}
- rust-skeptic
ExclusiveArch: %{rust_arches}
- rust-skim
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slice-deque
ExclusiveArch: %{rust_arches}
- rust-slog
ExclusiveArch: %{rust_arches}
- rust-slog-async
ExclusiveArch: %{rust_arches}
- rust-slog-scope
ExclusiveArch: %{rust_arches}
- rust-slog-term
ExclusiveArch: %{rust_arches}
- rust-slotmap
ExclusiveArch: %{rust_arches}
- rust-slug
ExclusiveArch: %{rust_arches}
- rust-sluice
ExclusiveArch: %{rust_arches}
- rust-smallbitvec
ExclusiveArch: %{rust_arches}
- rust-smallstr
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-smart-default
ExclusiveArch: %{rust_arches}
- rust-smawk
ExclusiveArch: %{rust_arches}
- rust-smithay-client-toolkit
ExclusiveArch: %{rust_arches}
- rust-smithay-clipboard
ExclusiveArch: %{rust_arches}
- rust-smol_str
ExclusiveArch: %{rust_arches}
- rust-snafu
ExclusiveArch: %{rust_arches}
- rust-snafu-derive
ExclusiveArch: %{rust_arches}
- rust-snake_case
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-socket2_0.3
ExclusiveArch: %{rust_arches}
- rust-sop
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spin0.5
ExclusiveArch: %{rust_arches}
- rust-spin_on
ExclusiveArch: %{rust_arches}
- rust-spin_sleep
ExclusiveArch: %{rust_arches}
- rust-spinning_top
ExclusiveArch: %{rust_arches}
- rust-spki
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-standback
ExclusiveArch: %{rust_arches}
- rust-starship
ExclusiveArch: %{rust_arches}
- rust-starship-battery
ExclusiveArch: %{rust_arches}
- rust-starship_module_config_derive
ExclusiveArch: %{rust_arches}
- rust-static_assertions
ExclusiveArch: %{rust_arches}
- rust-statistical
ExclusiveArch: %{rust_arches}
- rust-statrs
ExclusiveArch: %{rust_arches}
- rust-stb_truetype
ExclusiveArch: %{rust_arches}
- rust-stderrlog
ExclusiveArch: %{rust_arches}
- rust-str_stack
ExclusiveArch: %{rust_arches}
- rust-stratisd_proc_macros
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-streebog
ExclusiveArch: %{rust_arches}
- rust-streebog0.9
ExclusiveArch: %{rust_arches}
- rust-strict
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-string_cache
ExclusiveArch: %{rust_arches}
- rust-string_cache_codegen
ExclusiveArch: %{rust_arches}
- rust-string_cache_shared
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strip-ansi-escapes
ExclusiveArch: %{rust_arches}
- rust-strong-xml
ExclusiveArch: %{rust_arches}
- rust-strong-xml-derive
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-structopt-derive0.2
ExclusiveArch: %{rust_arches}
- rust-structopt0.2
ExclusiveArch: %{rust_arches}
- rust-strum
ExclusiveArch: %{rust_arches}
- rust-strum_macros
ExclusiveArch: %{rust_arches}
- rust-subprocess
ExclusiveArch: %{rust_arches}
- rust-subtle
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin-sys
ExclusiveArch: %{rust_arches}
- rust-supports-color
ExclusiveArch: %{rust_arches}
- rust-supports-hyperlinks
ExclusiveArch: %{rust_arches}
- rust-supports-unicode
ExclusiveArch: %{rust_arches}
- rust-sval
ExclusiveArch: %{rust_arches}
- rust-sval_derive
ExclusiveArch: %{rust_arches}
- rust-sval_json
ExclusiveArch: %{rust_arches}
- rust-svg
ExclusiveArch: %{rust_arches}
- rust-svg_metadata
ExclusiveArch: %{rust_arches}
- rust-svgfilters
ExclusiveArch: %{rust_arches}
- rust-svgtypes
ExclusiveArch: %{rust_arches}
- rust-sxd-document
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn0.15
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-syntect
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-sysctl
ExclusiveArch: %{rust_arches}
- rust-sysinfo
ExclusiveArch: %{rust_arches}
- rust-syslog
ExclusiveArch: %{rust_arches}
- rust-system-deps
ExclusiveArch: %{rust_arches}
- rust-system-interface
ExclusiveArch: %{rust_arches}
- rust-system76_ectool
ExclusiveArch: %{rust_arches}
- rust-systemd
ExclusiveArch: %{rust_arches}
- rust-tabular
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-takeable
ExclusiveArch: %{rust_arches}
- rust-takeable-option
ExclusiveArch: %{rust_arches}
- rust-tap
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-target
ExclusiveArch: %{rust_arches}
- rust-target-lexicon
ExclusiveArch: %{rust_arches}
- rust-tealdeer
ExclusiveArch: %{rust_arches}
- rust-teloxide
ExclusiveArch: %{rust_arches}
- rust-teloxide-macros
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-temporary
ExclusiveArch: %{rust_arches}
- rust-temptree
ExclusiveArch: %{rust_arches}
- rust-tendril
ExclusiveArch: %{rust_arches}
- rust-tera
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term0.6
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termbg
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-terminal_size
ExclusiveArch: %{rust_arches}
- rust-terminfo
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-termios
ExclusiveArch: %{rust_arches}
- rust-termwiz
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-test-case
ExclusiveArch: %{rust_arches}
- rust-tester
ExclusiveArch: %{rust_arches}
- rust-testing_logger
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-textwrap0.11
ExclusiveArch: %{rust_arches}
- rust-thiserror
ExclusiveArch: %{rust_arches}
- rust-thiserror-impl
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-tree
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-tiff
ExclusiveArch: %{rust_arches}
- rust-tiger
ExclusiveArch: %{rust_arches}
- rust-tiger0.1
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-time-macros
ExclusiveArch: %{rust_arches}
- rust-time-macros-impl
ExclusiveArch: %{rust_arches}
- rust-time-macros0.1
ExclusiveArch: %{rust_arches}
- rust-time0.1
ExclusiveArch: %{rust_arches}
- rust-time0.2
ExclusiveArch: %{rust_arches}
- rust-timebomb
ExclusiveArch: %{rust_arches}
- rust-timer
ExclusiveArch: %{rust_arches}
- rust-timerfd
ExclusiveArch: %{rust_arches}
- rust-tiny-keccak
ExclusiveArch: %{rust_arches}
- rust-tiny-skia
ExclusiveArch: %{rust_arches}
- rust-tiny_http
ExclusiveArch: %{rust_arches}
- rust-tiny_http0.6
ExclusiveArch: %{rust_arches}
- rust-tinyfiledialogs
ExclusiveArch: %{rust_arches}
- rust-tinystr
ExclusiveArch: %{rust_arches}
- rust-tinytemplate
ExclusiveArch: %{rust_arches}
- rust-tinyvec
ExclusiveArch: %{rust_arches}
- rust-tinyvec_macros
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-macros
ExclusiveArch: %{rust_arches}
- rust-tokio-macros0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-mock-task
ExclusiveArch: %{rust_arches}
- rust-tokio-native-tls
ExclusiveArch: %{rust_arches}
- rust-tokio-openssl
ExclusiveArch: %{rust_arches}
- rust-tokio-openssl0.4
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-rustls
ExclusiveArch: %{rust_arches}
- rust-tokio-socks
ExclusiveArch: %{rust_arches}
- rust-tokio-socks0.3
ExclusiveArch: %{rust_arches}
- rust-tokio-stream
ExclusiveArch: %{rust_arches}
- rust-tokio-sync
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-test
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-tls
ExclusiveArch: %{rust_arches}
- rust-tokio-tls0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-tungstenite
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-tokio-uds
ExclusiveArch: %{rust_arches}
- rust-tokio-util
ExclusiveArch: %{rust_arches}
- rust-tokio-util0.3
ExclusiveArch: %{rust_arches}
- rust-tokio0.1
ExclusiveArch: %{rust_arches}
- rust-tokio0.2
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-toml0.4
ExclusiveArch: %{rust_arches}
- rust-toml_edit
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tower-service
ExclusiveArch: %{rust_arches}
- rust-tower-test
ExclusiveArch: %{rust_arches}
- rust-tower-util
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-tracing
ExclusiveArch: %{rust_arches}
- rust-tracing-attributes
ExclusiveArch: %{rust_arches}
- rust-tracing-core
ExclusiveArch: %{rust_arches}
- rust-tracing-futures
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-trash
ExclusiveArch: %{rust_arches}
- rust-tree-sitter
ExclusiveArch: %{rust_arches}
- rust-tree-sitter-config
ExclusiveArch: %{rust_arches}
- rust-tree-sitter-highlight
ExclusiveArch: %{rust_arches}
- rust-tree-sitter-loader
ExclusiveArch: %{rust_arches}
- rust-tree-sitter-tags
ExclusiveArch: %{rust_arches}
- rust-treebitmap
ExclusiveArch: %{rust_arches}
- rust-treeline
ExclusiveArch: %{rust_arches}
- rust-trust-dns-https
ExclusiveArch: %{rust_arches}
- rust-trust-dns-native-tls
ExclusiveArch: %{rust_arches}
- rust-trust-dns-native-tls0.19
ExclusiveArch: %{rust_arches}
- rust-trust-dns-openssl
ExclusiveArch: %{rust_arches}
- rust-trust-dns-openssl0.19
ExclusiveArch: %{rust_arches}
- rust-trust-dns-proto
ExclusiveArch: %{rust_arches}
- rust-trust-dns-proto0.19
ExclusiveArch: %{rust_arches}
- rust-trust-dns-resolver
ExclusiveArch: %{rust_arches}
- rust-trust-dns-resolver0.19
ExclusiveArch: %{rust_arches}
- rust-trust-dns-rustls
ExclusiveArch: %{rust_arches}
- rust-try-lock
ExclusiveArch: %{rust_arches}
- rust-trybuild
ExclusiveArch: %{rust_arches}
- rust-tss-esapi
ExclusiveArch: %{rust_arches}
- rust-tss-esapi-sys
ExclusiveArch: %{rust_arches}
- rust-ttf-parser
ExclusiveArch: %{rust_arches}
- rust-ttf-parser0.12
ExclusiveArch: %{rust_arches}
- rust-tui
ExclusiveArch: %{rust_arches}
- rust-tui-react
ExclusiveArch: %{rust_arches}
- rust-tui0.11
ExclusiveArch: %{rust_arches}
- rust-tui0.9
ExclusiveArch: %{rust_arches}
- rust-tuikit
ExclusiveArch: %{rust_arches}
- rust-tungstenite
ExclusiveArch: %{rust_arches}
- rust-twoway
ExclusiveArch: %{rust_arches}
- rust-twox-hash
ExclusiveArch: %{rust_arches}
- rust-type-map
ExclusiveArch: %{rust_arches}
- rust-typeable
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-typemap
ExclusiveArch: %{rust_arches}
- rust-typenum
ExclusiveArch: %{rust_arches}
- rust-typetag
ExclusiveArch: %{rust_arches}
- rust-typetag-impl
ExclusiveArch: %{rust_arches}
- rust-tzfile
ExclusiveArch: %{rust_arches}
- rust-ucd-parse
ExclusiveArch: %{rust_arches}
- rust-ucd-trie
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-umask
ExclusiveArch: %{rust_arches}
- rust-uncased
ExclusiveArch: %{rust_arches}
- rust-unchecked-index
ExclusiveArch: %{rust_arches}
- rust-unescape
ExclusiveArch: %{rust_arches}
- rust-unic-char-property
ExclusiveArch: %{rust_arches}
- rust-unic-char-range
ExclusiveArch: %{rust_arches}
- rust-unic-common
ExclusiveArch: %{rust_arches}
- rust-unic-langid
ExclusiveArch: %{rust_arches}
- rust-unic-langid-impl
ExclusiveArch: %{rust_arches}
- rust-unic-langid-macros
ExclusiveArch: %{rust_arches}
- rust-unic-langid-macros-impl
ExclusiveArch: %{rust_arches}
- rust-unic-locale
ExclusiveArch: %{rust_arches}
- rust-unic-locale-impl
ExclusiveArch: %{rust_arches}
- rust-unic-locale-macros
ExclusiveArch: %{rust_arches}
- rust-unic-locale-macros-impl
ExclusiveArch: %{rust_arches}
- rust-unic-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-category
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-common
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-version
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicase1
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-linebreak
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-truncate
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unicode-xid0.1
ExclusiveArch: %{rust_arches}
- rust-unicode_categories
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-universal-hash
ExclusiveArch: %{rust_arches}
- rust-unix_socket
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-uom
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-url1
ExclusiveArch: %{rust_arches}
- rust-url_serde
ExclusiveArch: %{rust_arches}
- rust-urlencoding
ExclusiveArch: %{rust_arches}
- rust-urlocator
ExclusiveArch: %{rust_arches}
- rust-urlshortener
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-users0.10
ExclusiveArch: %{rust_arches}
- rust-utf-8
ExclusiveArch: %{rust_arches}
- rust-utf8-cstr
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-utf8-width
ExclusiveArch: %{rust_arches}
- rust-utf8parse
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-uuid0.7
ExclusiveArch: %{rust_arches}
- rust-v_frame
ExclusiveArch: %{rust_arches}
- rust-value-bag
ExclusiveArch: %{rust_arches}
- rust-varbincode
ExclusiveArch: %{rust_arches}
- rust-varlink
ExclusiveArch: %{rust_arches}
- rust-varlink-cli
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
- rust-vcpkg
ExclusiveArch: %{rust_arches}
- rust-vcsgraph
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-vergen
ExclusiveArch: %{rust_arches}
- rust-vergen3
ExclusiveArch: %{rust_arches}
- rust-version
ExclusiveArch: %{rust_arches}
- rust-version-compare
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version-sync0.8
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-versions
ExclusiveArch: %{rust_arches}
- rust-vhost
ExclusiveArch: %{rust_arches}
- rust-virtio-bindings
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-virtio-queue
ExclusiveArch: x86_64 aarch64 s390x
- rust-vm-memory
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmm-sys-util
ExclusiveArch: x86_64 aarch64 ppc64le
- rust-vmw_backdoor
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-vsprintf
ExclusiveArch: %{rust_arches}
- rust-vte
ExclusiveArch: %{rust_arches}
- rust-vte_generate_state_changes
ExclusiveArch: %{rust_arches}
- rust-vtparse
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-waker-fn
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-want
ExclusiveArch: %{rust_arches}
- rust-warp
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-backend
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-futures
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro-support
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-shared
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-test
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-test-macro
ExclusiveArch: %{rust_arches}
- rust-wasmer_enumset
ExclusiveArch: %{rust_arches}
- rust-wasmer_enumset_derive
ExclusiveArch: %{rust_arches}
- rust-wasmparser
ExclusiveArch: %{rust_arches}
- rust-wasmtime
ExclusiveArch: x86_64 aarch64 s390x
- rust-wasmtime-cache
ExclusiveArch: %{rust_arches}
- rust-wasmtime-cranelift
ExclusiveArch: x86_64 aarch64 s390x
- rust-wasmtime-environ
ExclusiveArch: %{rust_arches}
- rust-wasmtime-fiber
ExclusiveArch: x86_64 aarch64 s390x
- rust-wasmtime-jit
ExclusiveArch: x86_64 aarch64 s390x
- rust-wasmtime-runtime
ExclusiveArch: x86_64 aarch64 s390x
- rust-wasmtime-types
ExclusiveArch: %{rust_arches}
- rust-wasmtime-wast
ExclusiveArch: x86_64 aarch64 s390x
- rust-wast
ExclusiveArch: %{rust_arches}
- rust-wat
ExclusiveArch: %{rust_arches}
- rust-watchman_client
ExclusiveArch: %{rust_arches}
- rust-wayland-client
ExclusiveArch: %{rust_arches}
- rust-wayland-commons
ExclusiveArch: %{rust_arches}
- rust-wayland-cursor
ExclusiveArch: %{rust_arches}
- rust-wayland-egl
ExclusiveArch: %{rust_arches}
- rust-wayland-protocols
ExclusiveArch: %{rust_arches}
- rust-wayland-scanner
ExclusiveArch: %{rust_arches}
- rust-wayland-server
ExclusiveArch: %{rust_arches}
- rust-wayland-sys
ExclusiveArch: %{rust_arches}
- rust-web-sys
ExclusiveArch: %{rust_arches}
- rust-webbrowser
ExclusiveArch: %{rust_arches}
- rust-webpki
ExclusiveArch: %{rust_arches}
- rust-webpki-roots
ExclusiveArch: %{rust_arches}
- rust-websocket
ExclusiveArch: %{rust_arches}
- rust-websocket-base
ExclusiveArch: %{rust_arches}
- rust-weezl
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-wide
ExclusiveArch: %{rust_arches}
- rust-wiggle
ExclusiveArch: x86_64 aarch64 s390x
- rust-wiggle-generate
ExclusiveArch: %{rust_arches}
- rust-wiggle-macro
ExclusiveArch: %{rust_arches}
- rust-wild
ExclusiveArch: %{rust_arches}
- rust-wildmatch
ExclusiveArch: %{rust_arches}
- rust-winit
ExclusiveArch: %{rust_arches}
- rust-witx
ExclusiveArch: %{rust_arches}
- rust-ws
ExclusiveArch: %{rust_arches}
- rust-wyz
ExclusiveArch: %{rust_arches}
- rust-x11
ExclusiveArch: %{rust_arches}
- rust-x11-clipboard
ExclusiveArch: %{rust_arches}
- rust-x11-dl
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xcb
ExclusiveArch: %{rust_arches}
- rust-xcursor
ExclusiveArch: %{rust_arches}
- rust-xdg
ExclusiveArch: %{rust_arches}
- rust-xi-unicode
ExclusiveArch: %{rust_arches}
- rust-xkbcommon
ExclusiveArch: %{rust_arches}
- rust-xml-rs
ExclusiveArch: %{rust_arches}
- rust-xml5ever
ExclusiveArch: %{rust_arches}
- rust-xmlparser
ExclusiveArch: %{rust_arches}
- rust-xmltree
ExclusiveArch: %{rust_arches}
- rust-xmlwriter
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-y4m
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-ybaas
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-zbase32
ExclusiveArch: %{rust_arches}
- rust-zbus
ExclusiveArch: %{rust_arches}
- rust-zbus_macros
ExclusiveArch: %{rust_arches}
- rust-zcomponents
ExclusiveArch: %{rust_arches}
- rust-zeroize
ExclusiveArch: %{rust_arches}
- rust-zeroize_derive
ExclusiveArch: %{rust_arches}
- rust-zincati
ExclusiveArch: %{rust_arches}
- rust-zip
ExclusiveArch: %{rust_arches}
- rust-zmq
ExclusiveArch: %{rust_arches}
- rust-zmq-sys
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- rust-zopfli
ExclusiveArch: %{rust_arches}
- rust-zoxide
ExclusiveArch: %{rust_arches}
- rust-zram-generator
ExclusiveArch: %{rust_arches}
- rust-zstd
ExclusiveArch: %{rust_arches}
- rust-zstd-safe
ExclusiveArch: %{rust_arches}
- rust-zstd-sys
ExclusiveArch: %{rust_arches}
- rust-zvariant
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sagemath
ExclusiveArch: aarch64 x86_64
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- sdsl-lite
ExclusiveArch: %{power64} x86_64 aarch64
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skopeo
ExclusiveArch: %{go_arches}
- skychart
ExclusiveArch: %{fpc_arches}
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- soup-sharp
ExclusiveArch: %{mono_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- springlobby
ExclusiveArch: %{ix86} x86_64
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svt-av1
ExclusiveArch: x86_64
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- system76-keyboard-configurator
ExclusiveArch: %{rust_arches}
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64 aarch64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- usd
ExclusiveArch: aarch64 x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- vmemcache
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 aarch64
ExclusiveArch: %{ix86}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zeal
ExclusiveArch: %{qt5_qtwebengine_arches}
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zig
ExclusiveArch: %{zig_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
2 years, 1 month
Architecture specific change in rpms/gaupol.git
by githook-noreply@fedoraproject.org
The package rpms/gaupol.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gaupol.git/commit/?id=21c93f4745a....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 21c93f4745a897656a8734daee45d94409c7a327
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 08:14:41 2022 -0400
Recommend AV1/VP9 support only on arches where available
diff --git a/gaupol.spec b/gaupol.spec
index c471d7a..977560e 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -19,7 +19,10 @@ License: GPLv3+
URL: https://otsaloma.io/gaupol/
Source0: https://github.com/otsaloma/gaupol/archive/%{version}/gaupol-%{version}.t...
-BuildArch: noarch
+# The package cannot be noarch because it has weak dependencies and BR’s
+# conditioned on architecture. There is still no compiled code, so there will
+# be no debug packages.
+%global debug_package %{nil}
BuildRequires: python3-devel
# Note that this package does not (yet) require python3dist(setuptools)!
@@ -49,8 +52,12 @@ BuildRequires: gstreamer1-plugins-base >= 1.6
BuildRequires: gstreamer1-plugins-good >= 1.6
BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
BuildRequires: gstreamer1-vaapi >= 1.6
+%ifarch x86_64
+# svt-av1 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-av1
+# svt-vp9 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-vp9
+%endif
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
@@ -76,8 +83,10 @@ Recommends: gstreamer1-plugins-good-gtk
Requires: (gstreamer1-plugins-good-gtk >= 1.6 if gstreamer1-plugins-good-gtk)
Recommends: gstreamer1-vaapi
Requires: (gstreamer1-vaapi >= 1.6 if gstreamer1-vaapi)
+%ifarch x86_64
Recommends: gstreamer1-svt-av1
Recommends: gstreamer1-svt-vp9
+%endif
Recommends: gspell
Requires: (gspell >= 1.0.0 if gspell)
Recommends: python3dist(chardet)
@@ -169,6 +178,8 @@ düzenleme ve altyazıları zamanlama araçları sağlar.
%package -n python3-aeidon
Summary: Read, write, and manipulate text-based subtitle files
+BuildArch: noarch
+
Provides: aeidon = %{version}-%{release}
Obsoletes: aeidon <= 1.4-11
Conflicts: aeidon <= 1.4-11
commit c098039e0b95ddd0d8affecd5d09629a5fa7198b
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 07:34:14 2022 -0400
BR the gstreamer weak dependencies to make sure they are satisfiable
diff --git a/gaupol.spec b/gaupol.spec
index 75969b2..c471d7a 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -42,14 +42,15 @@ BuildRequires: appstream
%if %{with tests}
BuildRequires: python3dist(pygobject) >= 3.12
BuildRequires: gtk3 >= 3.12
-# Not actually used in tests:
-#BuildRequires: gstreamer1 >= 1.6
-#BuildRequires: gstreamer1-plugins-base >= 1.6
-#BuildRequires: gstreamer1-plugins-good >= 1.6
-#BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
-#BuildRequires: gstreamer1-vaapi >= 1.6
-#BuildRequires: gstreamer1-svt-av1
-#BuildRequires: gstreamer1-svt-vp9
+# The gstreamer weak dependencies are not actually used in the tests, but we
+# BuildRequire them anyway to make sure they are satisfiable.
+BuildRequires: gstreamer1 >= 1.6
+BuildRequires: gstreamer1-plugins-base >= 1.6
+BuildRequires: gstreamer1-plugins-good >= 1.6
+BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
+BuildRequires: gstreamer1-vaapi >= 1.6
+BuildRequires: gstreamer1-svt-av1
+BuildRequires: gstreamer1-svt-vp9
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
2 years, 1 month
Architecture specific change in rpms/gaupol.git
by githook-noreply@fedoraproject.org
The package rpms/gaupol.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gaupol.git/commit/?id=d20b17856c7....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit d20b17856c7c600e0a3e96a92c39bdae65df29cf
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 08:14:41 2022 -0400
Recommend AV1/VP9 support only on arches where available
diff --git a/gaupol.spec b/gaupol.spec
index c471d7a..977560e 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -19,7 +19,10 @@ License: GPLv3+
URL: https://otsaloma.io/gaupol/
Source0: https://github.com/otsaloma/gaupol/archive/%{version}/gaupol-%{version}.t...
-BuildArch: noarch
+# The package cannot be noarch because it has weak dependencies and BR’s
+# conditioned on architecture. There is still no compiled code, so there will
+# be no debug packages.
+%global debug_package %{nil}
BuildRequires: python3-devel
# Note that this package does not (yet) require python3dist(setuptools)!
@@ -49,8 +52,12 @@ BuildRequires: gstreamer1-plugins-base >= 1.6
BuildRequires: gstreamer1-plugins-good >= 1.6
BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
BuildRequires: gstreamer1-vaapi >= 1.6
+%ifarch x86_64
+# svt-av1 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-av1
+# svt-vp9 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-vp9
+%endif
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
@@ -76,8 +83,10 @@ Recommends: gstreamer1-plugins-good-gtk
Requires: (gstreamer1-plugins-good-gtk >= 1.6 if gstreamer1-plugins-good-gtk)
Recommends: gstreamer1-vaapi
Requires: (gstreamer1-vaapi >= 1.6 if gstreamer1-vaapi)
+%ifarch x86_64
Recommends: gstreamer1-svt-av1
Recommends: gstreamer1-svt-vp9
+%endif
Recommends: gspell
Requires: (gspell >= 1.0.0 if gspell)
Recommends: python3dist(chardet)
@@ -169,6 +178,8 @@ düzenleme ve altyazıları zamanlama araçları sağlar.
%package -n python3-aeidon
Summary: Read, write, and manipulate text-based subtitle files
+BuildArch: noarch
+
Provides: aeidon = %{version}-%{release}
Obsoletes: aeidon <= 1.4-11
Conflicts: aeidon <= 1.4-11
commit 0029ec1246c40bff61712d69a3bf652fb9b393e5
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 07:34:14 2022 -0400
BR the gstreamer weak dependencies to make sure they are satisfiable
diff --git a/gaupol.spec b/gaupol.spec
index 75969b2..c471d7a 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -42,14 +42,15 @@ BuildRequires: appstream
%if %{with tests}
BuildRequires: python3dist(pygobject) >= 3.12
BuildRequires: gtk3 >= 3.12
-# Not actually used in tests:
-#BuildRequires: gstreamer1 >= 1.6
-#BuildRequires: gstreamer1-plugins-base >= 1.6
-#BuildRequires: gstreamer1-plugins-good >= 1.6
-#BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
-#BuildRequires: gstreamer1-vaapi >= 1.6
-#BuildRequires: gstreamer1-svt-av1
-#BuildRequires: gstreamer1-svt-vp9
+# The gstreamer weak dependencies are not actually used in the tests, but we
+# BuildRequire them anyway to make sure they are satisfiable.
+BuildRequires: gstreamer1 >= 1.6
+BuildRequires: gstreamer1-plugins-base >= 1.6
+BuildRequires: gstreamer1-plugins-good >= 1.6
+BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
+BuildRequires: gstreamer1-vaapi >= 1.6
+BuildRequires: gstreamer1-svt-av1
+BuildRequires: gstreamer1-svt-vp9
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
2 years, 1 month
Architecture specific change in rpms/gaupol.git
by githook-noreply@fedoraproject.org
The package rpms/gaupol.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gaupol.git/commit/?id=a69edadde93....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit a69edadde937c0feb2abe1d02662407d6dc1507e
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 08:14:41 2022 -0400
Recommend AV1/VP9 support only on arches where available
diff --git a/gaupol.spec b/gaupol.spec
index c471d7a..977560e 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -19,7 +19,10 @@ License: GPLv3+
URL: https://otsaloma.io/gaupol/
Source0: https://github.com/otsaloma/gaupol/archive/%{version}/gaupol-%{version}.t...
-BuildArch: noarch
+# The package cannot be noarch because it has weak dependencies and BR’s
+# conditioned on architecture. There is still no compiled code, so there will
+# be no debug packages.
+%global debug_package %{nil}
BuildRequires: python3-devel
# Note that this package does not (yet) require python3dist(setuptools)!
@@ -49,8 +52,12 @@ BuildRequires: gstreamer1-plugins-base >= 1.6
BuildRequires: gstreamer1-plugins-good >= 1.6
BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
BuildRequires: gstreamer1-vaapi >= 1.6
+%ifarch x86_64
+# svt-av1 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-av1
+# svt-vp9 is ExclusiveArch: x86_64
BuildRequires: gstreamer1-svt-vp9
+%endif
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
@@ -76,8 +83,10 @@ Recommends: gstreamer1-plugins-good-gtk
Requires: (gstreamer1-plugins-good-gtk >= 1.6 if gstreamer1-plugins-good-gtk)
Recommends: gstreamer1-vaapi
Requires: (gstreamer1-vaapi >= 1.6 if gstreamer1-vaapi)
+%ifarch x86_64
Recommends: gstreamer1-svt-av1
Recommends: gstreamer1-svt-vp9
+%endif
Recommends: gspell
Requires: (gspell >= 1.0.0 if gspell)
Recommends: python3dist(chardet)
@@ -169,6 +178,8 @@ düzenleme ve altyazıları zamanlama araçları sağlar.
%package -n python3-aeidon
Summary: Read, write, and manipulate text-based subtitle files
+BuildArch: noarch
+
Provides: aeidon = %{version}-%{release}
Obsoletes: aeidon <= 1.4-11
Conflicts: aeidon <= 1.4-11
commit 57681e7d6910e6c6059193040f7a85cebbfe0957
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Apr 5 07:34:14 2022 -0400
BR the gstreamer weak dependencies to make sure they are satisfiable
diff --git a/gaupol.spec b/gaupol.spec
index 75969b2..c471d7a 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -42,14 +42,15 @@ BuildRequires: appstream
%if %{with tests}
BuildRequires: python3dist(pygobject) >= 3.12
BuildRequires: gtk3 >= 3.12
-# Not actually used in tests:
-#BuildRequires: gstreamer1 >= 1.6
-#BuildRequires: gstreamer1-plugins-base >= 1.6
-#BuildRequires: gstreamer1-plugins-good >= 1.6
-#BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
-#BuildRequires: gstreamer1-vaapi >= 1.6
-#BuildRequires: gstreamer1-svt-av1
-#BuildRequires: gstreamer1-svt-vp9
+# The gstreamer weak dependencies are not actually used in the tests, but we
+# BuildRequire them anyway to make sure they are satisfiable.
+BuildRequires: gstreamer1 >= 1.6
+BuildRequires: gstreamer1-plugins-base >= 1.6
+BuildRequires: gstreamer1-plugins-good >= 1.6
+BuildRequires: gstreamer1-plugins-good-gtk >= 1.6
+BuildRequires: gstreamer1-vaapi >= 1.6
+BuildRequires: gstreamer1-svt-av1
+BuildRequires: gstreamer1-svt-vp9
BuildRequires: iso-codes
BuildRequires: gspell >= 1.0.0
BuildRequires: python3dist(chardet) >= 2.2.1
2 years, 1 month