D15227.id43381.diff
No OneTemporary
Actions

Size

662 KB

Referenced Files

None

Subscribers

None

D15227.id43381.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	Index: Mk/Uses/gecko.mk
	===================================================================
	--- Mk/Uses/gecko.mk
	+++ Mk/Uses/gecko.mk
	@@ -37,12 +37,12 @@
	.elif ${gecko_ARGS:Mfirefox}

	_GECKO_DEFAULT_VERSION= 52
	-_GECKO_VERSIONS= 52 60
	+_GECKO_VERSIONS= 52 61
	_GECKO_TYPE= firefox

	# Dependence lines for different Firefox versions
	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
	-60_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
	+61_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox

	.if exists(${LOCALBASE}/bin/firefox)
	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null
	Index: Mk/bsd.gecko.mk
	===================================================================
	--- Mk/bsd.gecko.mk
	+++ Mk/bsd.gecko.mk
	@@ -111,6 +111,11 @@
	MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
	.endif

	+.if ${MOZILLA_VER:R:R} >= 61
	+BUILD_DEPENDS+= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g}
	+MOZ_EXPORT+= PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}"
	+.endif
	+
	.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1
	LLD_UNSAFE= yes
	.endif
	Index: www/firefox-i18n/Makefile
	===================================================================
	--- www/firefox-i18n/Makefile
	+++ www/firefox-i18n/Makefile
	@@ -2,7 +2,7 @@
	# $FreeBSD$

	PORTNAME= firefox-i18n
	-PORTVERSION= 60.0.2
	+PORTVERSION= 61.0b11
	CATEGORIES= www
	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \
	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
	@@ -15,7 +15,7 @@

	EXTRACT_DEPENDS= zip:archivers/zip

	-USES= zip:infozip gecko:firefox,60,build
	+USES= zip:infozip gecko:firefox,61,build
	USE_XPI= firefox

	NO_ARCH= yes
	Index: www/firefox-i18n/distinfo
	===================================================================
	--- www/firefox-i18n/distinfo
	+++ www/firefox-i18n/distinfo
	@@ -1,197 +1,197 @@
	-TIMESTAMP = 1528228087
	-SHA256 (xpi/firefox-i18n-60.0.2/ach.xpi) = 3264cdac77964c001d27c1da36d280702c6e28bb9caedf06a7a57d2d034f5097
	-SIZE (xpi/firefox-i18n-60.0.2/ach.xpi) = 496058
	-SHA256 (xpi/firefox-i18n-60.0.2/af.xpi) = 46c49276255243becdddff6102bea42c4860cc3c008d4b01f8d95b91812cdfca
	-SIZE (xpi/firefox-i18n-60.0.2/af.xpi) = 486534
	-SHA256 (xpi/firefox-i18n-60.0.2/an.xpi) = 037f8ec9d96f019059d8131eff4ab06fff8ecc657f98ea231b1e5e7bae730880
	-SIZE (xpi/firefox-i18n-60.0.2/an.xpi) = 519729
	-SHA256 (xpi/firefox-i18n-60.0.2/ar.xpi) = cda7d8d114da54e4ecd6a5781795ab590c3510c59ab74d1c8343a2834489fa73
	-SIZE (xpi/firefox-i18n-60.0.2/ar.xpi) = 546953
	-SHA256 (xpi/firefox-i18n-60.0.2/as.xpi) = b978d40a6ebe0ec9ae07fe9d0b2a24c181422c1c09939255f7984a4b153b9a26
	-SIZE (xpi/firefox-i18n-60.0.2/as.xpi) = 529953
	-SHA256 (xpi/firefox-i18n-60.0.2/ast.xpi) = 5be044c2ea120e039e73a33c334314ce488bc12f0d0d5605a86320a023ed3ea3
	-SIZE (xpi/firefox-i18n-60.0.2/ast.xpi) = 507870
	-SHA256 (xpi/firefox-i18n-60.0.2/az.xpi) = c692cc2f12e4df1b5e45a5070766e8c5cf468aeb3315180228defdc5704e61d1
	-SIZE (xpi/firefox-i18n-60.0.2/az.xpi) = 523974
	-SHA256 (xpi/firefox-i18n-60.0.2/be.xpi) = cc291a855dcb454f114b40c7673db18dd7c0b2962a3c11ff9c0a986e3231eaa6
	-SIZE (xpi/firefox-i18n-60.0.2/be.xpi) = 579945
	-SHA256 (xpi/firefox-i18n-60.0.2/bg.xpi) = 62178b8aa781941a3de9d11e597092d479f682b5c6738de010110a3b9a9a42d8
	-SIZE (xpi/firefox-i18n-60.0.2/bg.xpi) = 573080
	-SHA256 (xpi/firefox-i18n-60.0.2/bn-BD.xpi) = cbd8950fdab635e864c10a5358d0495210effd6160a62b9599b093338dc67a16
	-SIZE (xpi/firefox-i18n-60.0.2/bn-BD.xpi) = 589638
	-SHA256 (xpi/firefox-i18n-60.0.2/bn-IN.xpi) = 026b702fdec8e922e71e6a9198d42de7a615d47d9ce47d8a58fdc8c0ee4ffe5a
	-SIZE (xpi/firefox-i18n-60.0.2/bn-IN.xpi) = 570083
	-SHA256 (xpi/firefox-i18n-60.0.2/br.xpi) = acd17442b0918ddadaa324223b70cc240e3e5f9377ee1bf966cecb6f1bd124cf
	-SIZE (xpi/firefox-i18n-60.0.2/br.xpi) = 511252
	-SHA256 (xpi/firefox-i18n-60.0.2/bs.xpi) = 6fc982720e171f8c4e1b06eed294735a6514e3e54bb9ada39cca697315afb48f
	-SIZE (xpi/firefox-i18n-60.0.2/bs.xpi) = 513936
	-SHA256 (xpi/firefox-i18n-60.0.2/ca.xpi) = 41f425b998c4f37c2e506d24e06ab692597d5d5f191c1042cef42b53b164377e
	-SIZE (xpi/firefox-i18n-60.0.2/ca.xpi) = 524484
	-SHA256 (xpi/firefox-i18n-60.0.2/cak.xpi) = e511a882edb4fe78c5759c716cc5313875dde60dcb144cb19f1ff2d3dd97478d
	-SIZE (xpi/firefox-i18n-60.0.2/cak.xpi) = 535516
	-SHA256 (xpi/firefox-i18n-60.0.2/cs.xpi) = 5bd65f390119dcd6f09be4c71a158187e3d0ce3aa775b17459c4b57b6931877b
	-SIZE (xpi/firefox-i18n-60.0.2/cs.xpi) = 531015
	-SHA256 (xpi/firefox-i18n-60.0.2/cy.xpi) = e2c989a044c9a4af5ec60676d1e2f652d3bea657d0b51f91fe763458781d6279
	-SIZE (xpi/firefox-i18n-60.0.2/cy.xpi) = 515864
	-SHA256 (xpi/firefox-i18n-60.0.2/da.xpi) = fe33cf6e6b118cbd56af791fce6b57640af600f3ed483ff71b3dace8c3ec378a
	-SIZE (xpi/firefox-i18n-60.0.2/da.xpi) = 509975
	-SHA256 (xpi/firefox-i18n-60.0.2/de.xpi) = eda7bc1cd123f24b57ce6d0fcfca3e6c0954c71a32ef610ae62dfe8ae8477140
	-SIZE (xpi/firefox-i18n-60.0.2/de.xpi) = 525689
	-SHA256 (xpi/firefox-i18n-60.0.2/dsb.xpi) = 73daa18ad8e7a42c781242a506587fed18158f0bf1f9f2e7e9c2c8fa4916b4a3
	-SIZE (xpi/firefox-i18n-60.0.2/dsb.xpi) = 538745
	-SHA256 (xpi/firefox-i18n-60.0.2/el.xpi) = c447405287531c915afde8ca535b1b812b29a4a15b8aa1bb562b26276801a371
	-SIZE (xpi/firefox-i18n-60.0.2/el.xpi) = 592917
	-SHA256 (xpi/firefox-i18n-60.0.2/en-GB.xpi) = fe02706b63725e0ef67d23cecae9e0a592c1b0c8bb0050773954f142793ef0d4
	-SIZE (xpi/firefox-i18n-60.0.2/en-GB.xpi) = 490903
	-SHA256 (xpi/firefox-i18n-60.0.2/en-US.xpi) = 3a012162ccef7068fd5b16117ede3eb8c151e99635e83c031a37f1989565f16b
	-SIZE (xpi/firefox-i18n-60.0.2/en-US.xpi) = 472384
	-SHA256 (xpi/firefox-i18n-60.0.2/en-ZA.xpi) = 0df9291489150fa400c0927b770f5a94e7d3ad641ea59ac720cbf006f3c58e50
	-SIZE (xpi/firefox-i18n-60.0.2/en-ZA.xpi) = 473896
	-SHA256 (xpi/firefox-i18n-60.0.2/eo.xpi) = 05cc1895271e735fa0d4e73c0cc792de6d7bea63034777fd7facd3e45d0630da
	-SIZE (xpi/firefox-i18n-60.0.2/eo.xpi) = 510494
	-SHA256 (xpi/firefox-i18n-60.0.2/es-AR.xpi) = 005ee9da32ea33d4f420ecbcd8add9cf2ab5bf332b0a7699ecab4ee67331a564
	-SIZE (xpi/firefox-i18n-60.0.2/es-AR.xpi) = 523819
	-SHA256 (xpi/firefox-i18n-60.0.2/es-CL.xpi) = f76adcbda565019c183d8a4ecb38a911a7fca78b7db158a5a1fa5402627e0566
	-SIZE (xpi/firefox-i18n-60.0.2/es-CL.xpi) = 526509
	-SHA256 (xpi/firefox-i18n-60.0.2/es-ES.xpi) = 76b7ab024878427cf6ea87b9a74632c667b4cdcf03bdc899f95bb802dfc304d6
	-SIZE (xpi/firefox-i18n-60.0.2/es-ES.xpi) = 459139
	-SHA256 (xpi/firefox-i18n-60.0.2/es-MX.xpi) = 2829924eee326add8b7f9f9dffd6a42f54e26bb573307d7655f74dff3fa4df43
	-SIZE (xpi/firefox-i18n-60.0.2/es-MX.xpi) = 527838
	-SHA256 (xpi/firefox-i18n-60.0.2/et.xpi) = d9f0ff92b02ae4b6674432c191950fce9d5b85307b3dd4a7b818b6c73a701271
	-SIZE (xpi/firefox-i18n-60.0.2/et.xpi) = 504174
	-SHA256 (xpi/firefox-i18n-60.0.2/eu.xpi) = a80e87f4151defb992312fcd143890c6b86cf5067222a2742257f12eb81fb067
	-SIZE (xpi/firefox-i18n-60.0.2/eu.xpi) = 510932
	-SHA256 (xpi/firefox-i18n-60.0.2/fa.xpi) = 0bf0337cbd82f45f141eeae5433b4b77da449e3077fc0b32c9a3dc511da47f93
	-SIZE (xpi/firefox-i18n-60.0.2/fa.xpi) = 565489
	-SHA256 (xpi/firefox-i18n-60.0.2/ff.xpi) = bcf099ecd8ad1544e7d084417d6c876f6629b2689a194d7b38a0988a528e5d15
	-SIZE (xpi/firefox-i18n-60.0.2/ff.xpi) = 511432
	-SHA256 (xpi/firefox-i18n-60.0.2/fi.xpi) = 657ad94dfd99269ada99636ebf7a7ee9bb7364bdcabaede2f6305bd793793f92
	-SIZE (xpi/firefox-i18n-60.0.2/fi.xpi) = 505404
	-SHA256 (xpi/firefox-i18n-60.0.2/fr.xpi) = 6c13eaf3cbd4ef845be167f40509e6bb1b6732a3a8f0b7dac8a4b27bb1fb5244
	-SIZE (xpi/firefox-i18n-60.0.2/fr.xpi) = 535238
	-SHA256 (xpi/firefox-i18n-60.0.2/fy-NL.xpi) = 2def398c510f0417922c6155a47b532a2604794aff25dfaa1a64927e5112e69c
	-SIZE (xpi/firefox-i18n-60.0.2/fy-NL.xpi) = 523736
	-SHA256 (xpi/firefox-i18n-60.0.2/ga-IE.xpi) = a07e724a94de27dcd7efad3b518519eb2dc8fce2e6c6ad82c49d7340f1aae654
	-SIZE (xpi/firefox-i18n-60.0.2/ga-IE.xpi) = 526199
	-SHA256 (xpi/firefox-i18n-60.0.2/gd.xpi) = f9f60f239d7091ac4fe4e8797fe66a2cf8f1998229439b64f02d12189fc56ed8
	-SIZE (xpi/firefox-i18n-60.0.2/gd.xpi) = 520093
	-SHA256 (xpi/firefox-i18n-60.0.2/gl.xpi) = 8dbe92bf6e56417998bb581600f33abdc9ced8015a2f5b5404ad16331377d469
	-SIZE (xpi/firefox-i18n-60.0.2/gl.xpi) = 496593
	-SHA256 (xpi/firefox-i18n-60.0.2/gn.xpi) = 2f8f02fbff9dcafe6e97f56e3bb4cd30dab599cfeac5aa08176ddf115e93c230
	-SIZE (xpi/firefox-i18n-60.0.2/gn.xpi) = 532439
	-SHA256 (xpi/firefox-i18n-60.0.2/gu-IN.xpi) = 0d5ccd4b83d3bc510f48466b647956d356da98b2873bf324e0449f795418b83c
	-SIZE (xpi/firefox-i18n-60.0.2/gu-IN.xpi) = 589483
	-SHA256 (xpi/firefox-i18n-60.0.2/he.xpi) = ec0799c68a0f054ec30fdf9f7b698517b12d960235dabcbfd6ea828e38647cee
	-SIZE (xpi/firefox-i18n-60.0.2/he.xpi) = 535211
	-SHA256 (xpi/firefox-i18n-60.0.2/hi-IN.xpi) = 3fd33dabf5a465fba7983553ba89d7189cb156132bd2060932b11f1bc3efbabf
	-SIZE (xpi/firefox-i18n-60.0.2/hi-IN.xpi) = 590076
	-SHA256 (xpi/firefox-i18n-60.0.2/hr.xpi) = be54a7a81d3d2aecd5bda7266034f2c41dd2271ca41c4a59dfc2d95ef8ef6876
	-SIZE (xpi/firefox-i18n-60.0.2/hr.xpi) = 515186
	-SHA256 (xpi/firefox-i18n-60.0.2/hsb.xpi) = c552a2302b5832c953db367475d9eb292e75ef3f1319e034ade05e6e5ef1f15b
	-SIZE (xpi/firefox-i18n-60.0.2/hsb.xpi) = 536278
	-SHA256 (xpi/firefox-i18n-60.0.2/hu.xpi) = 61bb78d4604bb4f4fee525751486e6e5612c285565bb7e42f6e3b388a9dbbe31
	-SIZE (xpi/firefox-i18n-60.0.2/hu.xpi) = 537587
	-SHA256 (xpi/firefox-i18n-60.0.2/hy-AM.xpi) = 54deba7f2a00e48cadd99208472e467f1f78a678db91ba3fbb8ffe2d925f5dda
	-SIZE (xpi/firefox-i18n-60.0.2/hy-AM.xpi) = 568629
	-SHA256 (xpi/firefox-i18n-60.0.2/ia.xpi) = c69a5c604f90f239a6c78de43b1f7884a5f553eaa49211f81cf76b1c256638f0
	-SIZE (xpi/firefox-i18n-60.0.2/ia.xpi) = 509951
	-SHA256 (xpi/firefox-i18n-60.0.2/id.xpi) = f7fb19719341975e08328270ba1f4933d589fb4d2798ef9a00965828aba55227
	-SIZE (xpi/firefox-i18n-60.0.2/id.xpi) = 501449
	-SHA256 (xpi/firefox-i18n-60.0.2/is.xpi) = 0164a3686761abf0be0a1d8f773762031222e22362152865c4e38ac306b0cdd3
	-SIZE (xpi/firefox-i18n-60.0.2/is.xpi) = 512502
	-SHA256 (xpi/firefox-i18n-60.0.2/it.xpi) = 02b80d059ae403c04b2e130f521b1d80ea71f505cfe4dbd120ea218a84bedeb0
	-SIZE (xpi/firefox-i18n-60.0.2/it.xpi) = 398263
	-SHA256 (xpi/firefox-i18n-60.0.2/ja.xpi) = dcb3446a228a3cde462264e0ba39c606aea4dc711919e6c7d5dae252ecdd5a67
	-SIZE (xpi/firefox-i18n-60.0.2/ja.xpi) = 571244
	-SHA256 (xpi/firefox-i18n-60.0.2/ka.xpi) = fcfe7fc9d2cff0399e369eaf1d8bb5d8adb73773d095858bbefd2758d69f7f27
	-SIZE (xpi/firefox-i18n-60.0.2/ka.xpi) = 556072
	-SHA256 (xpi/firefox-i18n-60.0.2/kab.xpi) = 049404f2dcb4d32ddcce2b36739b4301b69586906defa775fc6500c8fad678ac
	-SIZE (xpi/firefox-i18n-60.0.2/kab.xpi) = 519624
	-SHA256 (xpi/firefox-i18n-60.0.2/kk.xpi) = ed233b274feec630f92c432ea9adf7624548c628308724aa4046baa51a9d6004
	-SIZE (xpi/firefox-i18n-60.0.2/kk.xpi) = 582205
	-SHA256 (xpi/firefox-i18n-60.0.2/km.xpi) = a67c04fb6437227a68ab8083491119fc0931dc8b397d605b92f804f9f2f4c710
	-SIZE (xpi/firefox-i18n-60.0.2/km.xpi) = 582332
	-SHA256 (xpi/firefox-i18n-60.0.2/kn.xpi) = 3427d552400dde0e3d73019cdf6d3ff7e0235d8ea0e9647b90da923c60365924
	-SIZE (xpi/firefox-i18n-60.0.2/kn.xpi) = 585098
	-SHA256 (xpi/firefox-i18n-60.0.2/ko.xpi) = 22eed6eba57f8cb38bda67e8a90e7bff5668f2e596869bc5a1c60c24453733d3
	-SIZE (xpi/firefox-i18n-60.0.2/ko.xpi) = 547056
	-SHA256 (xpi/firefox-i18n-60.0.2/lij.xpi) = d1d4e0d940eb4a19ea6ba8f4dd883c4e365d9f1ac7dfe90160764278fec29119
	-SIZE (xpi/firefox-i18n-60.0.2/lij.xpi) = 512397
	-SHA256 (xpi/firefox-i18n-60.0.2/lt.xpi) = 5d7a35f2890260978d0d7110e73ae2109bb3703d6cd65d36048e66e77062c7fe
	-SIZE (xpi/firefox-i18n-60.0.2/lt.xpi) = 535632
	-SHA256 (xpi/firefox-i18n-60.0.2/lv.xpi) = 462e8d28b118e601f8eaadf7ee495fceac969e1110debe2e0b12f4afdc5b1834
	-SIZE (xpi/firefox-i18n-60.0.2/lv.xpi) = 525636
	-SHA256 (xpi/firefox-i18n-60.0.2/mai.xpi) = 66e8e472fcdd9532a8401a4a9bb7293fcfab4535e6129e62d0aba974753d0c0c
	-SIZE (xpi/firefox-i18n-60.0.2/mai.xpi) = 548471
	-SHA256 (xpi/firefox-i18n-60.0.2/mk.xpi) = d752302445ac0f14496e4230c1c094d2b78fef42f3272914c3a52b72fb8dc4d3
	-SIZE (xpi/firefox-i18n-60.0.2/mk.xpi) = 513025
	-SHA256 (xpi/firefox-i18n-60.0.2/ml.xpi) = 0652ddfd12240e1a7a258835b6b72af06856d541c99c6a0d2275dca9157674e5
	-SIZE (xpi/firefox-i18n-60.0.2/ml.xpi) = 598198
	-SHA256 (xpi/firefox-i18n-60.0.2/mr.xpi) = 2a05310d226bd5be71ede145c898eeb1c2e135aefa0245254201266e0595b969
	-SIZE (xpi/firefox-i18n-60.0.2/mr.xpi) = 578337
	-SHA256 (xpi/firefox-i18n-60.0.2/ms.xpi) = 877a6de579035a20ff32075e5d4d36079af06c0f307428ecf508c39d2af9aab7
	-SIZE (xpi/firefox-i18n-60.0.2/ms.xpi) = 508781
	-SHA256 (xpi/firefox-i18n-60.0.2/my.xpi) = 6702089f2b5560f7774f6abd432cbaeb8a3364f4897dde19a158efa647bd7a0d
	-SIZE (xpi/firefox-i18n-60.0.2/my.xpi) = 569572
	-SHA256 (xpi/firefox-i18n-60.0.2/nb-NO.xpi) = 773f9a9843c79f34bfa459829b8c9cd3546b544dccefde0e7c468098de47f383
	-SIZE (xpi/firefox-i18n-60.0.2/nb-NO.xpi) = 509104
	-SHA256 (xpi/firefox-i18n-60.0.2/ne-NP.xpi) = d3e33d855d4e0d0d89fda9c4cd6b1322348059e2ec378d522904f40e81a3f763
	-SIZE (xpi/firefox-i18n-60.0.2/ne-NP.xpi) = 554577
	-SHA256 (xpi/firefox-i18n-60.0.2/nl.xpi) = 4f419acfd5824b75e6be4a8a95645ff6bc8798fe3e54c740f8652ca7836ef539
	-SIZE (xpi/firefox-i18n-60.0.2/nl.xpi) = 516653
	-SHA256 (xpi/firefox-i18n-60.0.2/nn-NO.xpi) = 29aa2f24e4bdd67c58d17caecd8b2c7d81bb0bbdc682d76487614621561f1085
	-SIZE (xpi/firefox-i18n-60.0.2/nn-NO.xpi) = 510621
	-SHA256 (xpi/firefox-i18n-60.0.2/oc.xpi) = ec8836cd689ebb864cb994dfaee342dbcf9a5f2423f0f399ffbc1c6a118d2a7d
	-SIZE (xpi/firefox-i18n-60.0.2/oc.xpi) = 526207
	-SHA256 (xpi/firefox-i18n-60.0.2/or.xpi) = 9da7b23e12d90aeed04e637772a0b8a3f75d7d6dd8d7cfcfc5d60a99f8d2fd19
	-SIZE (xpi/firefox-i18n-60.0.2/or.xpi) = 540089
	-SHA256 (xpi/firefox-i18n-60.0.2/pa-IN.xpi) = 77432ae4cf8faa53fb3aaa51749547b63205d301cc9b3cbb17cf8837589554da
	-SIZE (xpi/firefox-i18n-60.0.2/pa-IN.xpi) = 557086
	-SHA256 (xpi/firefox-i18n-60.0.2/pl.xpi) = 6c120bfcc19c4b68b21adffdda876eec2e928509eb0441bc0f6290098e3f333c
	-SIZE (xpi/firefox-i18n-60.0.2/pl.xpi) = 418192
	-SHA256 (xpi/firefox-i18n-60.0.2/pt-BR.xpi) = aa3613bea650524dbb7f5dd7114759df3581479602a64f57f520e267582d4987
	-SIZE (xpi/firefox-i18n-60.0.2/pt-BR.xpi) = 513944
	-SHA256 (xpi/firefox-i18n-60.0.2/pt-PT.xpi) = 67f4f4e4b1bf773cbe5712042fe99af140d85da9366126aa39c59798bb1dd0cf
	-SIZE (xpi/firefox-i18n-60.0.2/pt-PT.xpi) = 518540
	-SHA256 (xpi/firefox-i18n-60.0.2/rm.xpi) = 569994da2a6f808a8d6c533b76487e19088d60085a043afb273c0cdb0f598685
	-SIZE (xpi/firefox-i18n-60.0.2/rm.xpi) = 505263
	-SHA256 (xpi/firefox-i18n-60.0.2/ro.xpi) = 5a97e49719592a6d5ef0f829947afb54e2e4449a89a354bcb0bced8e6594fde5
	-SIZE (xpi/firefox-i18n-60.0.2/ro.xpi) = 513283
	-SHA256 (xpi/firefox-i18n-60.0.2/ru.xpi) = 2ea09073bf39fd18f2257176c71044c8fb9eda6c9e7fedab8c23316f5167d9fb
	-SIZE (xpi/firefox-i18n-60.0.2/ru.xpi) = 590511
	-SHA256 (xpi/firefox-i18n-60.0.2/si.xpi) = 200e788abd768d1ea478a341a2b9ed56b44097b36cde8d9b1818157d30c96cec
	-SIZE (xpi/firefox-i18n-60.0.2/si.xpi) = 544795
	-SHA256 (xpi/firefox-i18n-60.0.2/sk.xpi) = f396351241475b099f7924ee78bc156be5213323789e88f013608d908b0df8f6
	-SIZE (xpi/firefox-i18n-60.0.2/sk.xpi) = 540928
	-SHA256 (xpi/firefox-i18n-60.0.2/sl.xpi) = b10e2296960aa0a98aaf6fecfd08ce64e223e8f7aec169b1a94d628b2c8348c1
	-SIZE (xpi/firefox-i18n-60.0.2/sl.xpi) = 518573
	-SHA256 (xpi/firefox-i18n-60.0.2/son.xpi) = a63256b85d637d60086cfff632957c44c45ba53c843634f252e42601d54e7abd
	-SIZE (xpi/firefox-i18n-60.0.2/son.xpi) = 496920
	-SHA256 (xpi/firefox-i18n-60.0.2/sq.xpi) = e8b0fe2f702f3c1858adc19521a4a661275df80664303934c79e14839843f067
	-SIZE (xpi/firefox-i18n-60.0.2/sq.xpi) = 520487
	-SHA256 (xpi/firefox-i18n-60.0.2/sr.xpi) = 6a4e20050e2b4416ebaa35a32fe5e3ed7ac2191bbf0a5cfa7d5e1e046c1c8dfc
	-SIZE (xpi/firefox-i18n-60.0.2/sr.xpi) = 547998
	-SHA256 (xpi/firefox-i18n-60.0.2/sv-SE.xpi) = 942d86553fe7224497e497464537fecf8de2f5fd9819330821e05b7968a4ebd2
	-SIZE (xpi/firefox-i18n-60.0.2/sv-SE.xpi) = 517850
	-SHA256 (xpi/firefox-i18n-60.0.2/ta.xpi) = 8c03cea19a64a176f135b6de774740292f93cfdfff262440900b3e8117b789b9
	-SIZE (xpi/firefox-i18n-60.0.2/ta.xpi) = 577139
	-SHA256 (xpi/firefox-i18n-60.0.2/te.xpi) = ea6dbd7a2f4379f8c980d5bdba84cfd2bcc91b81243e01d2770dd8dc238fca82
	-SIZE (xpi/firefox-i18n-60.0.2/te.xpi) = 590179
	-SHA256 (xpi/firefox-i18n-60.0.2/th.xpi) = be48a1f68ce337997b6b5cc5f14a44ea53c8a6f9f5fcb9bd4f037e83a5e27f3f
	-SIZE (xpi/firefox-i18n-60.0.2/th.xpi) = 562042
	-SHA256 (xpi/firefox-i18n-60.0.2/tr.xpi) = 114102a3af7a638d2a988c97c47f95631fe9c795770db1238e8329226e6c5087
	-SIZE (xpi/firefox-i18n-60.0.2/tr.xpi) = 525034
	-SHA256 (xpi/firefox-i18n-60.0.2/uk.xpi) = c72bd318699dcef64d285a970850f1b2953c263033bec419a89b86d06a000ce0
	-SIZE (xpi/firefox-i18n-60.0.2/uk.xpi) = 580148
	-SHA256 (xpi/firefox-i18n-60.0.2/ur.xpi) = b336ad7af245f94e221d96648a0eafd186c9b0aafabdca13d9495a5a2f0f7cea
	-SIZE (xpi/firefox-i18n-60.0.2/ur.xpi) = 562604
	-SHA256 (xpi/firefox-i18n-60.0.2/uz.xpi) = 72c1d09b935e26dd3838c8121527a768cd3518e0010452be062bd7459b84e944
	-SIZE (xpi/firefox-i18n-60.0.2/uz.xpi) = 512908
	-SHA256 (xpi/firefox-i18n-60.0.2/vi.xpi) = 8598e67bf41d660c443b62b1feccd8fc4904026bd26304278057028028096822
	-SIZE (xpi/firefox-i18n-60.0.2/vi.xpi) = 527412
	-SHA256 (xpi/firefox-i18n-60.0.2/xh.xpi) = 4fb78a9f7515ab7e3a1d1c7329a53dd91e090312ffbec6c9141454da8e24a000
	-SIZE (xpi/firefox-i18n-60.0.2/xh.xpi) = 511086
	-SHA256 (xpi/firefox-i18n-60.0.2/zh-CN.xpi) = 8dccc0a7ec90bd42c0beb420d8572fa591afc3deb949fdbb68a610c53949159d
	-SIZE (xpi/firefox-i18n-60.0.2/zh-CN.xpi) = 542797
	-SHA256 (xpi/firefox-i18n-60.0.2/zh-TW.xpi) = f0d1047fcf359865b99a44f873e210cf5adcde8a9f577cb6e5c517f2bcfa84bb
	-SIZE (xpi/firefox-i18n-60.0.2/zh-TW.xpi) = 541123
	+TIMESTAMP = 1528129778
	+SHA256 (xpi/firefox-i18n-61.0b11/ach.xpi) = 57ae21fc4b9c20404c641420f118c49014a1bd85b84aeb79c67beb061122fe7a
	+SIZE (xpi/firefox-i18n-61.0b11/ach.xpi) = 468320
	+SHA256 (xpi/firefox-i18n-61.0b11/af.xpi) = a04267f3a9930260ecba699eda6131676432e1e63a583859ab3501271d2f147a
	+SIZE (xpi/firefox-i18n-61.0b11/af.xpi) = 458278
	+SHA256 (xpi/firefox-i18n-61.0b11/an.xpi) = 3199a442d25df87ed48d016f746a7ec8ccdf109e72a0467ed292af13d2afc13f
	+SIZE (xpi/firefox-i18n-61.0b11/an.xpi) = 492780
	+SHA256 (xpi/firefox-i18n-61.0b11/ar.xpi) = 6f95e3ad3a3f6ab1796407bc8ecfdf6e9c760503914930bd7598e2ba9f4ba23b
	+SIZE (xpi/firefox-i18n-61.0b11/ar.xpi) = 514915
	+SHA256 (xpi/firefox-i18n-61.0b11/as.xpi) = 081b65e0129f25cad7f5fc2d1fe83046316461ca97d3f6afe8297bb8b5f9952e
	+SIZE (xpi/firefox-i18n-61.0b11/as.xpi) = 498325
	+SHA256 (xpi/firefox-i18n-61.0b11/ast.xpi) = ae2159439203d1a48f85b751db97a7a73e7556ee27f025a037fac75ee3e91967
	+SIZE (xpi/firefox-i18n-61.0b11/ast.xpi) = 478589
	+SHA256 (xpi/firefox-i18n-61.0b11/az.xpi) = 5ab65d407a5ae43562a8f27f3d2770f92a76c51deefd8e15d97540463efb7327
	+SIZE (xpi/firefox-i18n-61.0b11/az.xpi) = 492865
	+SHA256 (xpi/firefox-i18n-61.0b11/be.xpi) = fe93a602d74801181740b653767738f11a724237842d7c929757990b4f0e8420
	+SIZE (xpi/firefox-i18n-61.0b11/be.xpi) = 546799
	+SHA256 (xpi/firefox-i18n-61.0b11/bg.xpi) = c846bc14de8470efbddac990eff3f71d6e60ccd7717fb9929876a8c4e849003e
	+SIZE (xpi/firefox-i18n-61.0b11/bg.xpi) = 540215
	+SHA256 (xpi/firefox-i18n-61.0b11/bn-BD.xpi) = f2fd7cafe5bb021e7bb019dc88c2e233f324b2f7f2373132975ae06c307ca4f5
	+SIZE (xpi/firefox-i18n-61.0b11/bn-BD.xpi) = 556539
	+SHA256 (xpi/firefox-i18n-61.0b11/bn-IN.xpi) = 643165f22f0b177257f99be260d41dbb6ccc3173d0a6d06edff548446c91815c
	+SIZE (xpi/firefox-i18n-61.0b11/bn-IN.xpi) = 535411
	+SHA256 (xpi/firefox-i18n-61.0b11/br.xpi) = 927ce2a783eb97001e1ba720c7ecf4e0873626390d31e7b2a20e452578f5e8ef
	+SIZE (xpi/firefox-i18n-61.0b11/br.xpi) = 483059
	+SHA256 (xpi/firefox-i18n-61.0b11/bs.xpi) = 5e206e5f4a34f9bcb77f8c048a8b68488091b2bec43c83bb4900b3a8a706ae7e
	+SIZE (xpi/firefox-i18n-61.0b11/bs.xpi) = 489128
	+SHA256 (xpi/firefox-i18n-61.0b11/ca.xpi) = 95d4b9d7572117c3584adb50e5edb3dd8c1c2d9294e4a9cc0882311d8462dbb4
	+SIZE (xpi/firefox-i18n-61.0b11/ca.xpi) = 497054
	+SHA256 (xpi/firefox-i18n-61.0b11/cak.xpi) = b062f182742880c905550bae8a60846dc00b6996bc35db4339259e71a52eb28f
	+SIZE (xpi/firefox-i18n-61.0b11/cak.xpi) = 505375
	+SHA256 (xpi/firefox-i18n-61.0b11/cs.xpi) = 61e56571e0e42715219bc416dac809c68087f341b5f3326842940a54a9cfe050
	+SIZE (xpi/firefox-i18n-61.0b11/cs.xpi) = 502368
	+SHA256 (xpi/firefox-i18n-61.0b11/cy.xpi) = 63bd6439c334ec380a571083b0b93de0ecba8677df7a7020e37b943927974851
	+SIZE (xpi/firefox-i18n-61.0b11/cy.xpi) = 487999
	+SHA256 (xpi/firefox-i18n-61.0b11/da.xpi) = 559aceb2818207d743c2303caf7941a4b68252838102f42b95f1aaf9d32589fc
	+SIZE (xpi/firefox-i18n-61.0b11/da.xpi) = 480080
	+SHA256 (xpi/firefox-i18n-61.0b11/de.xpi) = 42db10e97dc08d4877f0f97018455567562e39f4e79f990f5a2e5e2bca2b9786
	+SIZE (xpi/firefox-i18n-61.0b11/de.xpi) = 499463
	+SHA256 (xpi/firefox-i18n-61.0b11/dsb.xpi) = 7092d418bf143aabd5bd256ead8507b01d7985c772a0c61752f2a6cd45bd30df
	+SIZE (xpi/firefox-i18n-61.0b11/dsb.xpi) = 508853
	+SHA256 (xpi/firefox-i18n-61.0b11/el.xpi) = 3d64bcba809b8e795bb942da42977cfc68f7cfc2dd1a22e07177c64008aede09
	+SIZE (xpi/firefox-i18n-61.0b11/el.xpi) = 557955
	+SHA256 (xpi/firefox-i18n-61.0b11/en-GB.xpi) = 7e295162d491cde6d431b8a10a42c2c61131367071bae4f882e32add2ce15368
	+SIZE (xpi/firefox-i18n-61.0b11/en-GB.xpi) = 464880
	+SHA256 (xpi/firefox-i18n-61.0b11/en-US.xpi) = 9ff1c726aebc0e31b23f4c9c12660ae9c1a6f47d6c845814152b626b3e0c4374
	+SIZE (xpi/firefox-i18n-61.0b11/en-US.xpi) = 456417
	+SHA256 (xpi/firefox-i18n-61.0b11/en-ZA.xpi) = 10a14b810d123d74e45499fa6645cf8b010772544262af074e0541b7af09b199
	+SIZE (xpi/firefox-i18n-61.0b11/en-ZA.xpi) = 446647
	+SHA256 (xpi/firefox-i18n-61.0b11/eo.xpi) = f209921edb6c5733b96614730718943b77511afc0d2c4262175ff7975b4c66d2
	+SIZE (xpi/firefox-i18n-61.0b11/eo.xpi) = 484761
	+SHA256 (xpi/firefox-i18n-61.0b11/es-AR.xpi) = 79b64f918ff0810a9afdf1367fac63baa7f5a659d8c3eb5ce9f51785fdcee91b
	+SIZE (xpi/firefox-i18n-61.0b11/es-AR.xpi) = 495641
	+SHA256 (xpi/firefox-i18n-61.0b11/es-CL.xpi) = b0544b6755b0979900634a71ec945e19e4b830208b20c846e6d5f519b31809d9
	+SIZE (xpi/firefox-i18n-61.0b11/es-CL.xpi) = 498386
	+SHA256 (xpi/firefox-i18n-61.0b11/es-ES.xpi) = a396ea341410f0531d1ce30d6292cf22ecd3bd6d090a20a9acc1f09f994f3c94
	+SIZE (xpi/firefox-i18n-61.0b11/es-ES.xpi) = 434179
	+SHA256 (xpi/firefox-i18n-61.0b11/es-MX.xpi) = 2e0bdcd4f554818a42e50a752bf45fc890dfb5082d5fd5953190659971919063
	+SIZE (xpi/firefox-i18n-61.0b11/es-MX.xpi) = 497455
	+SHA256 (xpi/firefox-i18n-61.0b11/et.xpi) = 82c0f929c3a1a136b7b674191b55d0d0c058e5c629efc35bf2a204205066b304
	+SIZE (xpi/firefox-i18n-61.0b11/et.xpi) = 477544
	+SHA256 (xpi/firefox-i18n-61.0b11/eu.xpi) = 3798137fef3fb9573c92e2390e188a53dee0931b7eae1a5063abd2eb67c3c2c7
	+SIZE (xpi/firefox-i18n-61.0b11/eu.xpi) = 484810
	+SHA256 (xpi/firefox-i18n-61.0b11/fa.xpi) = 0bbb039a5272fb6f04f01c21659789ecb65fcb507822c226b7a7a9f2a99c1739
	+SIZE (xpi/firefox-i18n-61.0b11/fa.xpi) = 535575
	+SHA256 (xpi/firefox-i18n-61.0b11/ff.xpi) = 8ea8c6e8d8b74229470ff509bcd0b9e026db06f966f0862f0b6e713286cddc8c
	+SIZE (xpi/firefox-i18n-61.0b11/ff.xpi) = 483855
	+SHA256 (xpi/firefox-i18n-61.0b11/fi.xpi) = 16070b601f8e5b228c93e2d8ed2249613058f9e2a70c0a00984b8be8e3aaa500
	+SIZE (xpi/firefox-i18n-61.0b11/fi.xpi) = 477498
	+SHA256 (xpi/firefox-i18n-61.0b11/fr.xpi) = ada2bdd38c83f76dc483162a3c6fe82d80e6d2a0547a04901f7fd6b18222a804
	+SIZE (xpi/firefox-i18n-61.0b11/fr.xpi) = 506754
	+SHA256 (xpi/firefox-i18n-61.0b11/fy-NL.xpi) = 19e72e639e273d3d298766ac483e2c93c45dde16c3c7feafef4d5e545e229086
	+SIZE (xpi/firefox-i18n-61.0b11/fy-NL.xpi) = 495561
	+SHA256 (xpi/firefox-i18n-61.0b11/ga-IE.xpi) = 42cd35650ef315efaf84b87463dd9de021f8f71a9fbbfa8a709ab97a660b33e1
	+SIZE (xpi/firefox-i18n-61.0b11/ga-IE.xpi) = 495805
	+SHA256 (xpi/firefox-i18n-61.0b11/gd.xpi) = 3f9ccd594b529596288bdd079a8dcb803da390997191ecccc872b6cb9349446b
	+SIZE (xpi/firefox-i18n-61.0b11/gd.xpi) = 493745
	+SHA256 (xpi/firefox-i18n-61.0b11/gl.xpi) = a9e7d671984e201bff2fc400f914061c385597d569588ef3ce3da9f7d36950ae
	+SIZE (xpi/firefox-i18n-61.0b11/gl.xpi) = 471469
	+SHA256 (xpi/firefox-i18n-61.0b11/gn.xpi) = 03cab182c6686178d7de94240e775108dc09e6c319b4fe3cae5f2f67b8e69884
	+SIZE (xpi/firefox-i18n-61.0b11/gn.xpi) = 503878
	+SHA256 (xpi/firefox-i18n-61.0b11/gu-IN.xpi) = ca164e8c95605dfbf270f2c31cd676eb2fa0c9f531eb683785413d7b33e8f339
	+SIZE (xpi/firefox-i18n-61.0b11/gu-IN.xpi) = 556491
	+SHA256 (xpi/firefox-i18n-61.0b11/he.xpi) = b56580e899835180054d43aa05d79f8d4b684da1e206ecbcb21ed36eeea1dd5b
	+SIZE (xpi/firefox-i18n-61.0b11/he.xpi) = 503659
	+SHA256 (xpi/firefox-i18n-61.0b11/hi-IN.xpi) = e0501b982d2f2f2c6d14014a6f86b1546a01b3709bf756a99b9e9e172a0e563f
	+SIZE (xpi/firefox-i18n-61.0b11/hi-IN.xpi) = 557955
	+SHA256 (xpi/firefox-i18n-61.0b11/hr.xpi) = 0087e7b652777e493e22a45d36bc427006b7d931c2ab03efa0a955660e79d4b0
	+SIZE (xpi/firefox-i18n-61.0b11/hr.xpi) = 486050
	+SHA256 (xpi/firefox-i18n-61.0b11/hsb.xpi) = 6d1ff2200e1d0719a44446f8e36183e874ec8fcef9967f34e4fa85f0c8d6451c
	+SIZE (xpi/firefox-i18n-61.0b11/hsb.xpi) = 507762
	+SHA256 (xpi/firefox-i18n-61.0b11/hu.xpi) = 49293a5c8ea38d1763f2a5256fe36681ec251102fd5171cc06da04ab001e1bb6
	+SIZE (xpi/firefox-i18n-61.0b11/hu.xpi) = 508738
	+SHA256 (xpi/firefox-i18n-61.0b11/hy-AM.xpi) = d36f3a523a4f13539194fd3dbd66b1c0686fd92c510525b8e9dc5e4f6ea0ea8e
	+SIZE (xpi/firefox-i18n-61.0b11/hy-AM.xpi) = 537820
	+SHA256 (xpi/firefox-i18n-61.0b11/ia.xpi) = bdfa6816cffa0e527f1c82e98797d8ab523778f071c32e2386d86881ce116b7e
	+SIZE (xpi/firefox-i18n-61.0b11/ia.xpi) = 482528
	+SHA256 (xpi/firefox-i18n-61.0b11/id.xpi) = 0e6257c6e1f23c6f038da55e94465de08686f3b75f07e38c9a8e9dc36c1f84bc
	+SIZE (xpi/firefox-i18n-61.0b11/id.xpi) = 473598
	+SHA256 (xpi/firefox-i18n-61.0b11/is.xpi) = 17b10898aa3838d80937f22f150f4d7575263cdca43e24ec219e41c1b007735d
	+SIZE (xpi/firefox-i18n-61.0b11/is.xpi) = 482668
	+SHA256 (xpi/firefox-i18n-61.0b11/it.xpi) = 4b5721d449c121197ff6a1ed3d59f540d679588891169ecd94998222cc2e806b
	+SIZE (xpi/firefox-i18n-61.0b11/it.xpi) = 371199
	+SHA256 (xpi/firefox-i18n-61.0b11/ja.xpi) = b13d11458c014581f8402a1833d6569fc88b16865c5e788ea736222154a43682
	+SIZE (xpi/firefox-i18n-61.0b11/ja.xpi) = 538264
	+SHA256 (xpi/firefox-i18n-61.0b11/ka.xpi) = 44ab6ff4d583ceb2e3c4e8342d15e54bb3efdc964c5bdce2c0dbe142e097fe4e
	+SIZE (xpi/firefox-i18n-61.0b11/ka.xpi) = 523416
	+SHA256 (xpi/firefox-i18n-61.0b11/kab.xpi) = 53a2d397122877beb05778d4d8cc4d9946a94247ccc9bd278455c12eb7d8e464
	+SIZE (xpi/firefox-i18n-61.0b11/kab.xpi) = 493298
	+SHA256 (xpi/firefox-i18n-61.0b11/kk.xpi) = 9236849e2538748e38fe0517d8177e6c26d4eef6aa3992e7067c19cb2f300976
	+SIZE (xpi/firefox-i18n-61.0b11/kk.xpi) = 549288
	+SHA256 (xpi/firefox-i18n-61.0b11/km.xpi) = f0e77ad5c2ab8574aafbd20c4c23ba8812032607e2744981a3bcfea1505b423d
	+SIZE (xpi/firefox-i18n-61.0b11/km.xpi) = 547200
	+SHA256 (xpi/firefox-i18n-61.0b11/kn.xpi) = a74b598e8103506d354f62d7d3432fd5f0ec46880de9e5a68dde6ef935aaa604
	+SIZE (xpi/firefox-i18n-61.0b11/kn.xpi) = 552590
	+SHA256 (xpi/firefox-i18n-61.0b11/ko.xpi) = bed6dca2774ee869bdbe64ff830a300997bc956b54d44c0001d3fa144f92af41
	+SIZE (xpi/firefox-i18n-61.0b11/ko.xpi) = 516971
	+SHA256 (xpi/firefox-i18n-61.0b11/lij.xpi) = 1befe0db92efcb73252ca4e67155a6b5ecb1dc3d1413bd7ec394e9b4517a90d4
	+SIZE (xpi/firefox-i18n-61.0b11/lij.xpi) = 483276
	+SHA256 (xpi/firefox-i18n-61.0b11/lt.xpi) = 782c0447e4d8721300e8e68528248cd870c26ce7f9acae6d5e27dfd157e07781
	+SIZE (xpi/firefox-i18n-61.0b11/lt.xpi) = 506852
	+SHA256 (xpi/firefox-i18n-61.0b11/lv.xpi) = 5ef6b24b119c95f8ca160cbf3faea161dd69dcd0685fc4dbee7d828dc9ab9f0d
	+SIZE (xpi/firefox-i18n-61.0b11/lv.xpi) = 497591
	+SHA256 (xpi/firefox-i18n-61.0b11/mai.xpi) = 26c253707c7344ef0bb8da967c27694f5447b8eca788fa47b793161bc62dc8a9
	+SIZE (xpi/firefox-i18n-61.0b11/mai.xpi) = 518900
	+SHA256 (xpi/firefox-i18n-61.0b11/mk.xpi) = 6866bfc24f874f0e628f601408b363ff4b2752e292c0f6d65a84baf21213b08b
	+SIZE (xpi/firefox-i18n-61.0b11/mk.xpi) = 480670
	+SHA256 (xpi/firefox-i18n-61.0b11/ml.xpi) = 308cc995dd4d4a4f80d05b25d6813356a4dd4a70e37339b7125fe410cd7c2e96
	+SIZE (xpi/firefox-i18n-61.0b11/ml.xpi) = 562449
	+SHA256 (xpi/firefox-i18n-61.0b11/mr.xpi) = 903b75ffcac411a16d03fa28a30bad6f95a92eeba841e9dbd0d0f33657fe9935
	+SIZE (xpi/firefox-i18n-61.0b11/mr.xpi) = 547451
	+SHA256 (xpi/firefox-i18n-61.0b11/ms.xpi) = 9c896da517231835663f0f0b9ca7aed556f42a1aeaac7f38024dcecc951652fd
	+SIZE (xpi/firefox-i18n-61.0b11/ms.xpi) = 481127
	+SHA256 (xpi/firefox-i18n-61.0b11/my.xpi) = cc8667c537baa848c63a9325664688b8b5b56d2c6e9da639d5a0319711b46c27
	+SIZE (xpi/firefox-i18n-61.0b11/my.xpi) = 534803
	+SHA256 (xpi/firefox-i18n-61.0b11/nb-NO.xpi) = 0cbb1834baceca9b751376e4972908caee32bfc244e3605a744e003037863ccd
	+SIZE (xpi/firefox-i18n-61.0b11/nb-NO.xpi) = 481216
	+SHA256 (xpi/firefox-i18n-61.0b11/ne-NP.xpi) = c2749b0edc6ca6adabbf06957e0cd2799b9b6d305d0954ab0bc8a65cda4126a0
	+SIZE (xpi/firefox-i18n-61.0b11/ne-NP.xpi) = 523520
	+SHA256 (xpi/firefox-i18n-61.0b11/nl.xpi) = 76c822b4056e43cb0792579d8cf50fb355dbddbfc8ef9af8d888419944a82f9f
	+SIZE (xpi/firefox-i18n-61.0b11/nl.xpi) = 486829
	+SHA256 (xpi/firefox-i18n-61.0b11/nn-NO.xpi) = c8b309d629cb264473fe609659a9da71543910bbe19d5ccd5841ddcc1aadc94d
	+SIZE (xpi/firefox-i18n-61.0b11/nn-NO.xpi) = 482889
	+SHA256 (xpi/firefox-i18n-61.0b11/oc.xpi) = a99aca5aa77874ba0cf74ccc7dd978c88a5892978d31ba7fe6106f50cc12d358
	+SIZE (xpi/firefox-i18n-61.0b11/oc.xpi) = 498091
	+SHA256 (xpi/firefox-i18n-61.0b11/or.xpi) = e260e9ce29f28ed8976ef68f13631e32263d28245804fae2f4ff9ef8aadee8f1
	+SIZE (xpi/firefox-i18n-61.0b11/or.xpi) = 508179
	+SHA256 (xpi/firefox-i18n-61.0b11/pa-IN.xpi) = 9f854f8e1859f3f1c2a9f3d8593c40a547dd05cd4bea15e47af5706da18ba9cf
	+SIZE (xpi/firefox-i18n-61.0b11/pa-IN.xpi) = 523133
	+SHA256 (xpi/firefox-i18n-61.0b11/pl.xpi) = 331919c27b39f81ed6f0b734d5bdc01cfbdb5e625fab07dcd40d6bfdc067b6c8
	+SIZE (xpi/firefox-i18n-61.0b11/pl.xpi) = 388753
	+SHA256 (xpi/firefox-i18n-61.0b11/pt-BR.xpi) = 73e898c40237a46e4874573b404add95334e96715447ca64529c20cceb106473
	+SIZE (xpi/firefox-i18n-61.0b11/pt-BR.xpi) = 485614
	+SHA256 (xpi/firefox-i18n-61.0b11/pt-PT.xpi) = 3465a0bce0257c6be9681203d4ad4cabdd3946d93c3495d279cea250b246a20e
	+SIZE (xpi/firefox-i18n-61.0b11/pt-PT.xpi) = 489694
	+SHA256 (xpi/firefox-i18n-61.0b11/rm.xpi) = a9fd0fcd818a4d99c90a4e2b40e0edf3dc4908f0c0b6665ca0f3fdfc392c037c
	+SIZE (xpi/firefox-i18n-61.0b11/rm.xpi) = 476765
	+SHA256 (xpi/firefox-i18n-61.0b11/ro.xpi) = 022fefe7af948cd183cbe365915edf5833d6ac4506febc9175679bf057420538
	+SIZE (xpi/firefox-i18n-61.0b11/ro.xpi) = 485997
	+SHA256 (xpi/firefox-i18n-61.0b11/ru.xpi) = 93a4bf31ded4343e4fe1c59aa38d2eb8d44aff3c10e788bbd5c0650712dbcafa
	+SIZE (xpi/firefox-i18n-61.0b11/ru.xpi) = 558858
	+SHA256 (xpi/firefox-i18n-61.0b11/si.xpi) = 356c639b4cca4e3ddb01bb374810bfe562defeb97adee903d9bb810c8d71697b
	+SIZE (xpi/firefox-i18n-61.0b11/si.xpi) = 511505
	+SHA256 (xpi/firefox-i18n-61.0b11/sk.xpi) = 652f70793fa392c8d5bcea4210a67ca43b1df3fd4ff5a395f77b9cf701c26993
	+SIZE (xpi/firefox-i18n-61.0b11/sk.xpi) = 511381
	+SHA256 (xpi/firefox-i18n-61.0b11/sl.xpi) = ce0e3096d846461c4dfb97f516f65498b697432030202a6daaf3c859513029d8
	+SIZE (xpi/firefox-i18n-61.0b11/sl.xpi) = 489901
	+SHA256 (xpi/firefox-i18n-61.0b11/son.xpi) = 54c8cc9243260640b341b80d586d879d51ef9dbbe2b7152df72349422661a1b9
	+SIZE (xpi/firefox-i18n-61.0b11/son.xpi) = 468637
	+SHA256 (xpi/firefox-i18n-61.0b11/sq.xpi) = 77c176db29a6db7785792e3f3b13214b39b8c5198dcce58e7a37dbedd7e25652
	+SIZE (xpi/firefox-i18n-61.0b11/sq.xpi) = 496575
	+SHA256 (xpi/firefox-i18n-61.0b11/sr.xpi) = 1d0bf0a494f9abf9e6c31bf699293e60eae07cf0590756a5fcf3bfd9f65f4eda
	+SIZE (xpi/firefox-i18n-61.0b11/sr.xpi) = 517259
	+SHA256 (xpi/firefox-i18n-61.0b11/sv-SE.xpi) = e04d70fce85a432d041e9767c871c6c1145838073542cb0abcdc4db646522181
	+SIZE (xpi/firefox-i18n-61.0b11/sv-SE.xpi) = 488948
	+SHA256 (xpi/firefox-i18n-61.0b11/ta.xpi) = 6f80c82843e8dbcf910fa40cb749f134115ef1c9b90c83cd4fb0209074ed0914
	+SIZE (xpi/firefox-i18n-61.0b11/ta.xpi) = 541895
	+SHA256 (xpi/firefox-i18n-61.0b11/te.xpi) = 23b9a7bfc97c99e412ac2ff0705eed2937692f44dd91d912aac9e0511855a444
	+SIZE (xpi/firefox-i18n-61.0b11/te.xpi) = 556045
	+SHA256 (xpi/firefox-i18n-61.0b11/th.xpi) = 06f5e2b7c2955ded52192a7b36b94f9981dc42adb9ac00805fdc036a8b31484b
	+SIZE (xpi/firefox-i18n-61.0b11/th.xpi) = 529824
	+SHA256 (xpi/firefox-i18n-61.0b11/tr.xpi) = dda0c28fd60c2b0e7795a694163a478caa6fc5adcf0f2eec6bd83898da9fa806
	+SIZE (xpi/firefox-i18n-61.0b11/tr.xpi) = 496386
	+SHA256 (xpi/firefox-i18n-61.0b11/uk.xpi) = 330008c7e507579973628db736aac6c2826defb4f3ca1cef095f4fa28ea0929f
	+SIZE (xpi/firefox-i18n-61.0b11/uk.xpi) = 549658
	+SHA256 (xpi/firefox-i18n-61.0b11/ur.xpi) = f403cd5347a898be348e65f0591d3a36b29c50267d27f41ff5239925b2142064
	+SIZE (xpi/firefox-i18n-61.0b11/ur.xpi) = 531609
	+SHA256 (xpi/firefox-i18n-61.0b11/uz.xpi) = 49f4b48077de000ebdf26f2c6fcf0c2c8973f2ec90f7a8b694863f16e9790d40
	+SIZE (xpi/firefox-i18n-61.0b11/uz.xpi) = 482059
	+SHA256 (xpi/firefox-i18n-61.0b11/vi.xpi) = d8e7cc3614f77253e9544fa6d4bbff43cf217cf11edaf13410a90804271e1423
	+SIZE (xpi/firefox-i18n-61.0b11/vi.xpi) = 498654
	+SHA256 (xpi/firefox-i18n-61.0b11/xh.xpi) = e56460d67efbed86e9b2a3996322910d45d3ba8d6175d46a00025a7b160878be
	+SIZE (xpi/firefox-i18n-61.0b11/xh.xpi) = 481806
	+SHA256 (xpi/firefox-i18n-61.0b11/zh-CN.xpi) = cc4ed503ffcbb55301a68c6d1ae1baac71b6c5f6588884cf804df964d86e1fc3
	+SIZE (xpi/firefox-i18n-61.0b11/zh-CN.xpi) = 511898
	+SHA256 (xpi/firefox-i18n-61.0b11/zh-TW.xpi) = 459e838da4c063a07d01262067b92159a885f66c2f484d7b72f9463bb3fe8073
	+SIZE (xpi/firefox-i18n-61.0b11/zh-TW.xpi) = 511586
	Index: www/firefox/Makefile
	===================================================================
	--- www/firefox/Makefile
	+++ www/firefox/Makefile
	@@ -2,18 +2,19 @@
	# $FreeBSD$

	PORTNAME= firefox
	-DISTVERSION= 60.0.2
	+DISTVERSION= 61.0b11
	PORTEPOCH= 1
	CATEGORIES= www ipv6
	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
	-DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
	+DISTNAME= ${PORTNAME}-${PORTVERSION:R}
	+DISTFILES= ${DISTNAME}${PORTVERSION:E}.source${EXTRACT_SUFX}

	MAINTAINER= gecko@FreeBSD.org
	COMMENT= Web browser based on the browser portion of Mozilla

	BUILD_DEPENDS= nspr>=4.19:devel/nspr \
	- nss>=3.36.1:security/nss \
	+ nss>=3.37:security/nss \
	icu>=59.1,1:devel/icu \
	libevent>=2.1.8:devel/libevent \
	harfbuzz>=1.7.6:print/harfbuzz \
	@@ -21,7 +22,7 @@
	png>=1.6.34:graphics/png \
	libvorbis>=1.3.6,3:audio/libvorbis \
	libvpx>=1.5.0:multimedia/libvpx \
	- sqlite3>=3.22.0:databases/sqlite3 \
	+ sqlite3>=3.23.1:databases/sqlite3 \
	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
	v4l_compat>0:multimedia/v4l_compat \
	autoconf-2.13:devel/autoconf213 \
	@@ -32,7 +33,7 @@
	USE_GECKO= gecko
	CONFLICTS_INSTALL= firefox-esr
	MOZ_PKGCONFIG_FILES= # empty
	-USE_MOZILLA= -cairo -soundtouch
	+USE_MOZILLA= -cairo -hunspell -soundtouch

	USE_GL= gl
	USES= tar:xz
	@@ -43,7 +44,7 @@
	MOZ_OPTIONS= --enable-application=browser \
	--enable-official-branding

	-OPTIONS_EXCLUDE= BUNDLED_CAIRO
	+OPTIONS_EXCLUDE= BUNDLED_CAIRO DTRACE

	.include "${.CURDIR}/../../www/firefox/Makefile.options"

	Index: www/firefox/distinfo
	===================================================================
	--- www/firefox/distinfo
	+++ www/firefox/distinfo
	@@ -1,3 +1,3 @@
	-TIMESTAMP = 1528228087
	-SHA256 (firefox-60.0.2.source.tar.xz) = 764566a06b71164e7fd20b2b0e6b08a71b4ccd4d6fd61867eb08011a551f6725
	-SIZE (firefox-60.0.2.source.tar.xz) = 271930220
	+TIMESTAMP = 1528129778
	+SHA256 (firefox-61.0b11.source.tar.xz) = feb80fa0a88983fd986b521c64439e6160e0efb8273ffdff1488fa1fb6e83228
	+SIZE (firefox-61.0b11.source.tar.xz) = 265898572
	Index: www/firefox/files/patch-addon-search
	===================================================================
	--- www/firefox/files/patch-addon-search
	+++ www/firefox/files/patch-addon-search
	@@ -40,11 +40,11 @@
	if (file.url) {
	addon.sourceURI = NetUtil.newURI(file.url);
	}
	-diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm
	+diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm
	index f70fd8d7e3bd8..81e8cd7764fdf 100644
	---- toolkit/mozapps/extensions/internal/XPIProvider.jsm
	-+++ toolkit/mozapps/extensions/internal/XPIProvider.jsm
	-@@ -4974,7 +4974,7 @@ AddonInternal.prototype = {
	+--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm
	++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
	+@@ -355,7 +355,7 @@ class AddonInternal {
	// Something is causing errors in here
	try {
	for (let platform of this.targetPlatforms) {
	Index: www/firefox/files/patch-bug1021761
	===================================================================
	--- www/firefox/files/patch-bug1021761
	+++ www/firefox/files/patch-bug1021761
	@@ -689,7 +689,7 @@
	index 000000000000..7d96168b9ea6
	--- /dev/null
	+++ media/libcubeb/src/cubeb_oss.c
	-@@ -0,0 +1,454 @@
	+@@ -0,0 +1,453 @@
	+/*
	+ * Copyright © 2014 Mozilla Foundation
	+ *
	@@ -1126,7 +1126,6 @@
	+ .get_max_channel_count = oss_get_max_channel_count,
	+ .get_min_latency = oss_get_min_latency,
	+ .get_preferred_sample_rate = oss_get_preferred_sample_rate,
	-+ .get_preferred_channel_layout = NULL,
	+ .enumerate_devices = NULL,
	+ .device_collection_destroy = NULL,
	+ .destroy = oss_destroy,
	@@ -1161,10 +1160,10 @@
	if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']:
	SOURCES += [
	'cubeb_resampler.cpp',
	-@@ -88,6 +94,7 @@ if CONFIG['OS_TARGET'] == 'Android':
	- FINAL_LIBRARY = 'gkmedias'
	+@@ -89,6 +95,7 @@ FINAL_LIBRARY = 'gkmedias'

	CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
	+ CFLAGS += CONFIG['MOZ_JACK_CFLAGS']
	+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
	CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']

	@@ -1250,9 +1249,9 @@
	+AC_SUBST_LIST(MOZ_OSS_CFLAGS)
	+AC_SUBST_LIST(MOZ_OSS_LIBS)
	+
	- dnl ==================================
	- dnl = Check alsa availability on Linux
	- dnl ==================================
	+ dnl ========================================================
	+ dnl NegotiateAuth
	+ dnl ========================================================
	diff --git toolkit/library/moz.build toolkit/library/moz.build
	index e06592daa265..ce016b96c2bc 100644
	--- toolkit/library/moz.build
	Index: www/firefox/files/patch-bug1375074
	===================================================================
	--- www/firefox/files/patch-bug1375074
	+++ /dev/null
	@@ -1,82 +0,0 @@
	-commit fc25eb4380d0
	-Author: Lars T Hansen <lhansen@mozilla.com>
	-Date: Wed Feb 28 13:57:52 2018 +0100
	-
	- Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl
	-
	- --HG--
	- extra : rebase_source : 4a2824b23cf7453d07c962123f780c0ff2fd5292
	- extra : source : dec6ab6522a4eb4b3c2defc5078b38ed904f3383
	----
	- js/src/jit-test/tests/bug1375074.js \| 18 ++++++++++++++++++
	- js/src/vm/UnboxedObject.cpp \| 25 ++++++++++++++++++++++++-
	- 2 files changed, 42 insertions(+), 1 deletion(-)
	-
	-diff --git js/src/jit-test/tests/bug1375074.js js/src/jit-test/tests/bug1375074.js
	-new file mode 100644
	-index 0000000000000..8bf01d96903fc
	---- /dev/null
	-+++ js/src/jit-test/tests/bug1375074.js
	-@@ -0,0 +1,18 @@
	-+// This forces the VM to start creating unboxed objects and thus stresses a
	-+// particular path into generated code for a specialized unboxed object
	-+// constructor.
	-+
	-+var K = 2000; // 2000 should be plenty
	-+var s = "[";
	-+var i;
	-+for ( i=0; i < K-1; i++ )
	-+ s = s + `{"i":${i}},`;
	-+s += `{"i":${i}}]`;
	-+var v = JSON.parse(s);
	-+
	-+assertEq(v.length == K, true);
	-+
	-+for ( i=0; i < K; i++) {
	-+ assertEq(v[i] instanceof Object, true);
	-+ assertEq(v[i].i, i);
	-+}
	-diff --git js/src/vm/UnboxedObject.cpp js/src/vm/UnboxedObject.cpp
	-index c8c178965c488..5badf328ede4f 100644
	---- js/src/vm/UnboxedObject.cpp
	-+++ js/src/vm/UnboxedObject.cpp
	-@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)
	- #endif
	-
	- #ifdef JS_CODEGEN_ARM64
	-- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
	-+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
	-+ // addressing. The register we use for PSP may however also be used by
	-+ // calling code, and it is nonvolatile, so save it. Do this as a special
	-+ // case first because the generic save/restore code needs the PSP to be
	-+ // initialized already.
	-+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
	-+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
	-+
	-+ // Initialize the PSP from the SP.
	- masm.initStackPtr();
	- #endif
	-
	-@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)
	- masm.pop(ScratchDoubleReg);
	- masm.PopRegsInMask(savedNonVolatileRegisters);
	-
	-+#ifdef JS_CODEGEN_ARM64
	-+ // Now restore the value that was in the PSP register on entry, and return.
	-+
	-+ // Obtain the correct SP from the PSP.
	-+ masm.Mov(sp, PseudoStackPointer64);
	-+
	-+ // Restore the saved value of the PSP register, this value is whatever the
	-+ // caller had saved in it, not any actual SP value, and it must not be
	-+ // overwritten subsequently.
	-+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
	-+
	-+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
	-+ masm.Ret(vixl::lr);
	-+#else
	- masm.abiret();
	-+#endif
	-
	- masm.bind(&failureStoreOther);
	-
	Index: www/firefox/files/patch-bug1411481
	===================================================================
	--- www/firefox/files/patch-bug1411481
	+++ /dev/null
	@@ -1,85 +0,0 @@
	-commit 57a55d1c2d33
	-Author: sotaro <sotaro.ikeda.g@gmail.com>
	-Date: Wed Mar 21 08:59:38 2018 +0900
	-
	- Bug 1411481- Enable SkiaGL canvas usage on Mac r=jrmuizel
	----
	- dom/canvas/CanvasRenderingContext2D.cpp \| 3 ++-
	- gfx/thebes/gfxPlatform.cpp \| 3 ++-
	- gfx/thebes/gfxPlatform.h \| 2 +-
	- gfx/thebes/gfxWindowsPlatform.cpp \| 7 +++++++
	- gfx/thebes/gfxWindowsPlatform.h \| 2 ++
	- 5 files changed, 14 insertions(+), 3 deletions(-)
	-
	-diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingContext2D.cpp
	-index ef3f868bdbf7..8666564b4d0c 100644
	---- dom/canvas/CanvasRenderingContext2D.cpp
	-+++ dom/canvas/CanvasRenderingContext2D.cpp
	-@@ -1438,7 +1438,8 @@ CanvasRenderingContext2D::AllowOpenGLCanvas() const
	- // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE
	- // as well, so it wouldn't help much.
	-
	-- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
	-+ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|
	-+ mCompositorBackend == LayersBackend::LAYERS_WR) &&
	- gfxPlatform::GetPlatform()->AllowOpenGLCanvas();
	- }
	-
	-diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp
	-index b9beea68d8c5..82635f9ab3ce 100644
	---- gfx/thebes/gfxPlatform.cpp
	-+++ gfx/thebes/gfxPlatform.cpp
	-@@ -1386,7 +1386,8 @@ bool gfxPlatform::AllowOpenGLCanvas()
	- // so we let content process always assume correct compositor backend.
	- // The callers have to do the right thing.
	- bool correctBackend = !XRE_IsParentProcess() \|\|
	-- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
	-+ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL \|\|
	-+ mCompositorBackend == LayersBackend::LAYERS_WR) &&
	- (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));
	-
	- if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) {
	-diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h
	-index c988eb1168a8..3bbf2b763f26 100644
	---- gfx/thebes/gfxPlatform.h
	-+++ gfx/thebes/gfxPlatform.h
	-@@ -286,7 +286,7 @@ public:
	- /// asking for it, we will examine the commands in the first few seconds
	- /// of the canvas usage, and potentially change to accelerated or
	- /// non-accelerated canvas.
	-- bool AllowOpenGLCanvas();
	-+ virtual bool AllowOpenGLCanvas();
	- virtual void InitializeSkiaCacheLimits();
	-
	- static bool AsyncPanZoomEnabled();
	-diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp
	-index 9ba6f40c6cc0..4d65791d075f 100644
	---- gfx/thebes/gfxWindowsPlatform.cpp
	-+++ gfx/thebes/gfxWindowsPlatform.cpp
	-@@ -509,6 +509,13 @@ gfxWindowsPlatform::UpdateRenderMode()
	- }
	- }
	-
	-+bool
	-+gfxWindowsPlatform::AllowOpenGLCanvas()
	-+{
	-+ // OpenGL canvas is not supported on windows
	-+ return false;
	-+}
	-+
	- mozilla::gfx::BackendType
	- gfxWindowsPlatform::GetContentBackendFor(mozilla::layers::LayersBackend aLayers)
	- {
	-diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h
	-index 47048de8f5f5..47ec0e9e5547 100644
	---- gfx/thebes/gfxWindowsPlatform.h
	-+++ gfx/thebes/gfxWindowsPlatform.h
	-@@ -174,6 +174,8 @@ public:
	- void SchedulePaintIfDeviceReset() override;
	- void CheckForContentOnlyDeviceReset();
	-
	-+ bool AllowOpenGLCanvas() override;
	-+
	- mozilla::gfx::BackendType GetContentBackendFor(mozilla::layers::LayersBackend aLayers) override;
	-
	- mozilla::gfx::BackendType GetPreferredCanvasBackend() override;
	Index: www/firefox/files/patch-bug1435212
	===================================================================
	--- www/firefox/files/patch-bug1435212
	+++ /dev/null
	@@ -1,13678 +0,0 @@
	-commit abe6e049cdd3
	-Author: Jean-Yves Avenard <jyavenard@mozilla.com>
	-Date: Thu Apr 19 10:19:15 2018 +0200
	-
	- Bug 1435212 - Add support for FFmpeg 4.0. r=bryce
	-
	- MozReview-Commit-ID: JlDFSUyGQu
	-
	- --HG--
	- extra : rebase_source : 310135ac5453b01164910bd3bf50b6107dcbc710
	----
	- dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp \| 6 +
	- dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp \| 13 +-
	- dom/media/platforms/ffmpeg/FFmpegLibs.h \| 4 +-
	- dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp \| 4 +
	- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp \| 2 +-
	- .../ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 \| 504 ++
	- .../ffmpeg/ffmpeg58/include/libavcodec/avcodec.h \| 6146 ++++++++++++++++++++
	- .../ffmpeg/ffmpeg58/include/libavcodec/avfft.h \| 118 +
	- .../ffmpeg/ffmpeg58/include/libavcodec/vaapi.h \| 86 +
	- .../ffmpeg/ffmpeg58/include/libavcodec/vdpau.h \| 176 +
	- .../ffmpeg/ffmpeg58/include/libavcodec/version.h \| 137 +
	- .../ffmpeg/ffmpeg58/include/libavutil/attributes.h \| 167 +
	- .../ffmpeg/ffmpeg58/include/libavutil/avconfig.h \| 6 +
	- .../ffmpeg/ffmpeg58/include/libavutil/avutil.h \| 365 ++
	- .../ffmpeg/ffmpeg58/include/libavutil/buffer.h \| 291 +
	- .../ffmpeg58/include/libavutil/channel_layout.h \| 232 +
	- .../ffmpeg/ffmpeg58/include/libavutil/common.h \| 560 ++
	- .../ffmpeg/ffmpeg58/include/libavutil/cpu.h \| 130 +
	- .../ffmpeg/ffmpeg58/include/libavutil/dict.h \| 200 +
	- .../ffmpeg/ffmpeg58/include/libavutil/error.h \| 126 +
	- .../ffmpeg/ffmpeg58/include/libavutil/frame.h \| 893 +++
	- .../ffmpeg/ffmpeg58/include/libavutil/hwcontext.h \| 584 ++
	- .../ffmpeg/ffmpeg58/include/libavutil/intfloat.h \| 77 +
	- .../ffmpeg/ffmpeg58/include/libavutil/log.h \| 362 ++
	- .../ffmpeg/ffmpeg58/include/libavutil/macros.h \| 50 +
	- .../ffmpeg58/include/libavutil/mathematics.h \| 242 +
	- .../ffmpeg/ffmpeg58/include/libavutil/mem.h \| 700 +++
	- .../ffmpeg/ffmpeg58/include/libavutil/pixfmt.h \| 529 ++
	- .../ffmpeg/ffmpeg58/include/libavutil/rational.h \| 214 +
	- .../ffmpeg/ffmpeg58/include/libavutil/samplefmt.h \| 272 +
	- .../ffmpeg/ffmpeg58/include/libavutil/version.h \| 139 +
	- dom/media/platforms/ffmpeg/ffmpeg58/moz.build \| 25 +
	- dom/media/platforms/ffmpeg/moz.build \| 1 +
	- 33 files changed, 13355 insertions(+), 6 deletions(-)
	-
	-diff --git dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
	-index 4600ad6d247c..a9c7089fa880 100644
	---- dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
	-+++ dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
	-@@ -77,15 +77,21 @@ FFmpegDataDecoder<LIBAV_VER>::InitDecoder()
	- mCodecContext->extradata_size = mExtraData->Length();
	- // FFmpeg may use SIMD instructions to access the data which reads the
	- // data in 32 bytes block. Must ensure we have enough data to read.
	-+#if LIBAVCODEC_VERSION_MAJOR >= 58
	-+ mExtraData->AppendElements(AV_INPUT_BUFFER_PADDING_SIZE);
	-+#else
	- mExtraData->AppendElements(FF_INPUT_BUFFER_PADDING_SIZE);
	-+#endif
	- mCodecContext->extradata = mExtraData->Elements();
	- } else {
	- mCodecContext->extradata_size = 0;
	- }
	-
	-+#if LIBAVCODEC_VERSION_MAJOR < 57
	- if (codec->capabilities & CODEC_CAP_DR1) {
	- mCodecContext->flags \|= CODEC_FLAG_EMU_EDGE;
	- }
	-+#endif
	-
	- if (mLib->avcodec_open2(mCodecContext, codec, nullptr) < 0) {
	- mLib->avcodec_close(mCodecContext);
	-diff --git dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
	-index 6b8b38487d56..d08eee3fc8e8 100644
	---- dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
	-+++ dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
	-@@ -63,12 +63,14 @@ FFmpegLibWrapper::Link()
	- AV_FUNC_55 = 1 << 2,
	- AV_FUNC_56 = 1 << 3,
	- AV_FUNC_57 = 1 << 4,
	-+ AV_FUNC_58 = 1 << 5,
	- 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_AVCODEC_ALL = AV_FUNC_53 \| AV_FUNC_54 \| AV_FUNC_55 \| AV_FUNC_56 \| AV_FUNC_57,
	-+ AV_FUNC_AVUTIL_58 = AV_FUNC_58 \| 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_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL \| AV_FUNC_AVUTIL_MASK
	- };
	-
	-@@ -88,6 +90,9 @@ FFmpegLibWrapper::Link()
	- case 57:
	- version = AV_FUNC_57;
	- break;
	-+ case 58:
	-+ version = AV_FUNC_58;
	-+ break;
	- default:
	- FFMPEG_LOG("Unknown avcodec version");
	- Unlink();
	-@@ -136,9 +141,9 @@ FFmpegLibWrapper::Link()
	- 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(av_frame_free, (AV_FUNC_AVUTIL_55 \| AV_FUNC_AVUTIL_56 \| AV_FUNC_AVUTIL_57))
	-- AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 \| AV_FUNC_AVUTIL_56 \| AV_FUNC_AVUTIL_57))
	-+ 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_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL)
	- #undef AV_FUNC
	- #undef AV_FUNC_OPTION
	-diff --git dom/media/platforms/ffmpeg/FFmpegLibs.h dom/media/platforms/ffmpeg/FFmpegLibs.h
	-index b8c092330212..be99eaa244ca 100644
	---- dom/media/platforms/ffmpeg/FFmpegLibs.h
	-+++ dom/media/platforms/ffmpeg/FFmpegLibs.h
	-@@ -27,9 +27,11 @@ extern "C" {
	- #define AV_CODEC_ID_VP8 CODEC_ID_VP8
	- #define AV_CODEC_ID_NONE CODEC_ID_NONE
	- #define AV_CODEC_ID_FLAC CODEC_ID_FLAC
	--#define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY
	- typedef CodecID AVCodecID;
	- #endif
	-+#if LIBAVCODEC_VERSION_MAJOR <= 55
	-+#define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY
	-+#endif
	-
	- #ifdef FFVPX_VERSION
	- enum { LIBAV_VER = FFVPX_VERSION };
	-diff --git dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
	-index f671e6e61bc4..b7ab49329502 100644
	---- dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
	-+++ dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
	-@@ -26,12 +26,15 @@ static FFmpegLibWrapper sLibAV;
	-
	- static const char* sLibs[] = {
	- #if defined(XP_DARWIN)
	-+ "libavcodec.58.dylib",
	- "libavcodec.57.dylib",
	- "libavcodec.56.dylib",
	- "libavcodec.55.dylib",
	- "libavcodec.54.dylib",
	- "libavcodec.53.dylib",
	- #else
	-+ "libavcodec.so.58",
	-+ "libavcodec-ffmpeg.so.58",
	- "libavcodec-ffmpeg.so.57",
	- "libavcodec-ffmpeg.so.56",
	- "libavcodec.so.57",
	-@@ -134,6 +137,7 @@ FFmpegRuntimeLinker::CreateDecoderModule()
	- case 55:
	- case 56: module = FFmpegDecoderModule<55>::Create(&sLibAV); break;
	- case 57: module = FFmpegDecoderModule<57>::Create(&sLibAV); break;
	-+ case 58: module = FFmpegDecoderModule<58>::Create(&sLibAV); break;
	- default: module = nullptr;
	- }
	- return module.forget();
	-diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
	-index 184fd43b6573..de37e007488f 100644
	---- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
	-+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
	-@@ -166,7 +166,7 @@ FFmpegVideoDecoder<LIBAV_VER>::InitCodecContext()
	- }
	-
	- if (mLowLatency) {
	-- mCodecContext->flags \|= CODEC_FLAG_LOW_DELAY;
	-+ mCodecContext->flags \|= AV_CODEC_FLAG_LOW_DELAY;
	- // ffvp9 and ffvp8 at this stage do not support slice threading, but it may
	- // help with the h264 decoder if there's ever one.
	- mCodecContext->thread_type = FF_THREAD_SLICE;
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 dom/media/platforms/ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1
	-new file mode 100644
	-index 000000000000..00b4fedfe7e7
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h
	-new file mode 100644
	-index 000000000000..fb0c6fae70b3
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avcodec.h
	-@@ -0,0 +1,6146 @@
	-+/*
	-+ * 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 <errno.h>
	-+#include "libavutil/samplefmt.h"
	-+#include "libavutil/attributes.h"
	-+#include "libavutil/avutil.h"
	-+#include "libavutil/buffer.h"
	-+#include "libavutil/cpu.h"
	-+#include "libavutil/channel_layout.h"
	-+#include "libavutil/dict.h"
	-+#include "libavutil/frame.h"
	-+#include "libavutil/hwcontext.h"
	-+#include "libavutil/log.h"
	-+#include "libavutil/pixfmt.h"
	-+#include "libavutil/rational.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.
	-+ *
	-+ * This API replaces the following legacy functions:
	-+ * - avcodec_decode_video2() and avcodec_decode_audio4():
	-+ * Use avcodec_send_packet() to feed input to the decoder, then use
	-+ * avcodec_receive_frame() to receive decoded frames after each packet.
	-+ * Unlike with the old video decoding API, multiple frames might result from
	-+ * a packet. For audio, splitting the input packet into frames by partially
	-+ * decoding packets becomes transparent to the API user. You never need to
	-+ * feed an AVPacket to the API twice (unless it is rejected with AVERROR(EAGAIN) - then
	-+ * no data was read from the packet).
	-+ * Additionally, sending a flush/draining packet is required only once.
	-+ * - avcodec_encode_video2()/avcodec_encode_audio2():
	-+ * Use avcodec_send_frame() to feed input to the encoder, then use
	-+ * avcodec_receive_packet() to receive encoded packets.
	-+ * Providing user-allocated buffers for avcodec_receive_packet() is not
	-+ * possible.
	-+ * - The new API does not handle subtitles yet.
	-+ *
	-+ * Mixing new and old function calls on the same AVCodecContext is not allowed,
	-+ * and will result in undefined behavior.
	-+ *
	-+ * Some codecs might require using the new API; using the old API will return
	-+ * an error when calling it. All codecs support the new API.
	-+ *
	-+ * 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.
	-+ * @{
	-+ */
	-+
	-+
	-+/**
	-+ * 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_Y41P = 0x8000,
	-+ 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,
	-+
	-+ /* 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 = 0x10800,
	-+ AV_CODEC_ID_PCM_S64BE,
	-+ AV_CODEC_ID_PCM_F16LE,
	-+ AV_CODEC_ID_PCM_F24LE,
	-+
	-+ /* 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 = 0x11800,
	-+ 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,
	-+
	-+ /* 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 = 0x14800,
	-+ AV_CODEC_ID_GREMLIN_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 = 0x15800,
	-+ 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,
	-+
	-+ /* 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 = 0x17800,
	-+ 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,
	-+
	-+ /* 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_BINTEXT = 0x18800,
	-+ 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
	-+};
	-+
	-+/**
	-+ * 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)
	-+
	-+/**
	-+ * @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_encoding
	-+ * minimum encoding buffer size
	-+ * Used to avoid some checks during header writing.
	-+ */
	-+#define AV_INPUT_BUFFER_MIN_SIZE 16384
	-+
	-+/**
	-+ * @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
	-+};
	-+
	-+/**
	-+ * @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)
	-+/**
	-+ * 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)
	-+/**
	-+ * Input bitstream might be truncated at a random location
	-+ * instead of only at frame boundaries.
	-+ */
	-+#define AV_CODEC_FLAG_TRUNCATED (1 << 16)
	-+/**
	-+ * 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 */
	-+
	-+/**
	-+ * Decoder can use draw_horiz_band callback.
	-+ */
	-+#define AV_CODEC_CAP_DRAW_HORIZ_BAND (1 << 0)
	-+/**
	-+ * Codec uses get_buffer() for allocating buffers and supports custom allocators.
	-+ * If not set, it might not use get_buffer() at all or use operations that
	-+ * assume the buffer was allocated by avcodec_default_get_buffer.
	-+ */
	-+#define AV_CODEC_CAP_DR1 (1 << 1)
	-+#define AV_CODEC_CAP_TRUNCATED (1 << 3)
	-+/**
	-+ * 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 avctx->thread_count == 0 (auto).
	-+ */
	-+#define AV_CODEC_CAP_AUTO_THREADS (1 << 15)
	-+/**
	-+ * 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)
	-+/**
	-+ * Codec is intra only.
	-+ */
	-+#define AV_CODEC_CAP_INTRA_ONLY 0x40000000
	-+/**
	-+ * Codec is lossless.
	-+ */
	-+#define AV_CODEC_CAP_LOSSLESS 0x80000000
	-+
	-+/**
	-+ * 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)
	-+
	-+/**
	-+ * 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.
	-+ */
	-+ int max_bitrate;
	-+ /**
	-+ * Minimum bitrate of the stream, in bits per second.
	-+ * Zero if unknown or unspecified.
	-+ */
	-+ int min_bitrate;
	-+ /**
	-+ * Average bitrate of the stream, in bits per second.
	-+ * Zero if unknown or unspecified.
	-+ */
	-+ int avg_bitrate;
	-+
	-+ /**
	-+ * The size of the buffer to which the ratecontrol is applied, in bits.
	-+ * Zero if unknown or unspecified.
	-+ */
	-+ int 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;
	-+
	-+/**
	-+ * The decoder will keep a reference to the frame and may reuse it later.
	-+ */
	-+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
	-+
	-+/**
	-+ * @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, 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,
	-+
	-+ /**
	-+ * 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;
	-+ int 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).
	-+ *
	-+ * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
	-+ * ABI. Thus it may be allocated on stack and no new fields can be added to it
	-+ * without libavcodec and libavformat major bump.
	-+ *
	-+ * 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().
	-+ *
	-+ * @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
	-+
	-+#if FF_API_CONVERGENCE_DURATION
	-+ /**
	-+ * @deprecated Same as the duration field, but as int64_t. This was required
	-+ * for Matroska subtitles, whose duration values could overflow when the
	-+ * duration field was still an int.
	-+ */
	-+ attribute_deprecated
	-+ int64_t convergence_duration;
	-+#endif
	-+} AVPacket;
	-+#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,
	-+};
	-+/**
	-+ * @}
	-+ */
	-+
	-+struct AVCodecInternal;
	-+
	-+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
	-+};
	-+
	-+/**
	-+ * 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.
	-+ * - 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_decode_video2 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 pixelFormat
	-+ * @param fmt is the list of formats which are supported by the codec,
	-+ * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.
	-+ * The first is always the native one.
	-+ * @note The callback may be called again immediately if initialization for
	-+ * the selected (hardware-accelerated) pixel format failed.
	-+ * @warning Behavior is undefined if the callback returns a value not
	-+ * in the fmt list of formats.
	-+ * @return the chosen format
	-+ * - encoding: unused
	-+ * - decoding: Set by user, if not set the native format will be chosen.
	-+ */
	-+ 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int b_frame_strategy;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int mpeg_quant;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int prediction_method;
	-+#define FF_PRED_LEFT 0
	-+#define FF_PRED_PLANE 1
	-+#define FF_PRED_MEDIAN 2
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int pre_me;
	-+#endif
	-+
	-+ /**
	-+ * 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
	-+ * - encoding: Set by user, can be NULL.
	-+ * - decoding: Set by libavcodec.
	-+ */
	-+ uint16_t *intra_matrix;
	-+
	-+ /**
	-+ * custom inter quantization matrix
	-+ * - encoding: Set by user, can be NULL.
	-+ * - decoding: Set by libavcodec.
	-+ */
	-+ uint16_t *inter_matrix;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int scenechange_threshold;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int noise_reduction;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /**
	-+ * @deprecated use encoder private options instead
	-+ */
	-+ attribute_deprecated
	-+ int me_penalty_compensation;
	-+#endif
	-+
	-+ /**
	-+ * - encoding: Set by user.
	-+ * - decoding: unused
	-+ */
	-+ int bidir_refine;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int brd_scale;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int chromaoffset;
	-+#endif
	-+
	-+ /**
	-+ * Note: Value depends upon the compare function used for fullpel ME.
	-+ * - encoding: Set by user.
	-+ * - decoding: unused
	-+ */
	-+ int mv0_threshold;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int b_sensitivity;
	-+#endif
	-+
	-+ /**
	-+ * 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 and thread_safe_callbacks is set,
	-+ * 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);
	-+
	-+ /**
	-+ * If non-zero, the decoded audio and video frames returned from
	-+ * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
	-+ * and are valid indefinitely. The caller must free them with
	-+ * av_frame_unref() when they are not needed anymore.
	-+ * Otherwise, the decoded frames must not be freed by the caller and are
	-+ * only valid until the next decode call.
	-+ *
	-+ * This is always automatically enabled if avcodec_receive_frame() is used.
	-+ *
	-+ * - encoding: unused
	-+ * - decoding: set by the caller before avcodec_open2().
	-+ */
	-+ attribute_deprecated
	-+ int refcounted_frames;
	-+
	-+ /* - 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;
	-+
	-+#if FF_API_CODER_TYPE
	-+#define FF_CODER_TYPE_VLC 0
	-+#define FF_CODER_TYPE_AC 1
	-+#define FF_CODER_TYPE_RAW 2
	-+#define FF_CODER_TYPE_RLE 3
	-+ /**
	-+ * @deprecated use encoder private options instead
	-+ */
	-+ attribute_deprecated
	-+ int coder_type;
	-+#endif /* FF_API_CODER_TYPE */
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int context_model;
	-+#endif
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int frame_skip_threshold;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int frame_skip_factor;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int frame_skip_exp;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int frame_skip_cmp;
	-+#endif /* FF_API_PRIVATE_OPT */
	-+
	-+ /**
	-+ * trellis RD quantization
	-+ * - encoding: Set by user.
	-+ * - decoding: unused
	-+ */
	-+ int trellis;
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int min_prediction_order;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int max_prediction_order;
	-+
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int64_t timecode_frame_start;
	-+#endif
	-+
	-+#if FF_API_RTP_CALLBACK
	-+ /**
	-+ * @deprecated unused
	-+ */
	-+ /* The RTP callback: This function is called */
	-+ /* every time the encoder has a packet to send. */
	-+ /* It depends on the encoder if the data starts */
	-+ /* with a Start Code (it should). H.263 does. */
	-+ /* mb_nb contains the number of macroblocks */
	-+ /* encoded in the RTP payload. */
	-+ attribute_deprecated
	-+ void (rtp_callback)(struct AVCodecContext avctx, void *data, int size, int mb_nb);
	-+#endif
	-+
	-+#if FF_API_PRIVATE_OPT
	-+ /** @deprecated use encoder private options instead */
	-+ attribute_deprecated
	-+ int rtp_payload_size; /* The size of the RTP payload: the coder will */
	-+ /* do its best to deliver a chunk with size */
	-+ /* below rtp_payload_size, the chunk will start */
	-+ /* with a start code on some codecs like H.263. */
	-+ /* This doesn't take account of any particular */
	-+ /* headers inside the transmitted RTP payload. */
	-+#endif
	-+
	-+#if FF_API_STAT_BITS
	-+ /* statistics, used for 2-pass encoding */
	-+ attribute_deprecated
	-+ int mv_bits;
	-+ attribute_deprecated
	-+ int header_bits;
	-+ attribute_deprecated
	-+ int i_tex_bits;
	-+ attribute_deprecated
	-+ int p_tex_bits;
	-+ attribute_deprecated
	-+ int i_count;
	-+ attribute_deprecated
	-+ int p_count;
	-+ attribute_deprecated
	-+ int skip_count;
	-+ attribute_deprecated
	-+ int misc_bits;
	-+
	-+ /** @deprecated this field is unused */
	-+ attribute_deprecated
	-+ int frame_bits;
	-+#endif
	-+
	-+ /**
	-+ * 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
	-+#if FF_API_DEBUG_MV
	-+/**
	-+ * @deprecated this option does nothing
	-+ */
	-+#define FF_DEBUG_MV 32
	-+#endif
	-+#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
	-+#if FF_API_DEBUG_MV
	-+#define FF_DEBUG_VIS_QP 0x00002000
	-+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
	-+#endif
	-+#define FF_DEBUG_BUFFERS 0x00008000
	-+#define FF_DEBUG_THREADS 0x00010000
	-+#define FF_DEBUG_GREEN_MD 0x00800000
	-+#define FF_DEBUG_NOMC 0x01000000
	-+
	-+#if FF_API_DEBUG_MV
	-+ /**
	-+ * debug
	-+ * - encoding: Set by user.
	-+ * - decoding: Set by user.
	-+ */
	-+ 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
	-+
	-+ /**
	-+ * Error recognition; may misdetect some more or less valid parts as errors.
	-+ * - encoding: unused
	-+ * - 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: unused
	-+ * - 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
	-+ * is. e.g. for VA API, this is a struct vaapi_context.
	-+ * - 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;
	-+
	-+#if FF_API_LOWRES
	-+ /**
	-+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
	-+ * - encoding: unused
	-+ * - decoding: Set by user.
	-+ */
	-+ int lowres;
	-+#endif
	-+
	-+#if FF_API_CODED_FRAME
	-+ /**
	-+ * the picture in the bitstream
	-+ * - encoding: Set by libavcodec.
	-+ * - decoding: unused
	-+ *
	-+ * @deprecated use the quality factor packet side data instead
	-+ */
	-+ attribute_deprecated AVFrame *coded_frame;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+ /**
	-+ * 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.
	-+ */
	-+ int thread_safe_callbacks;
	-+
	-+ /**
	-+ * 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_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
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_VBV_DELAY
	-+ /**
	-+ * VBV delay coded in the last frame (in periods of a 27 MHz clock).
	-+ * Used for compliant TS muxing.
	-+ * - encoding: Set by libavcodec.
	-+ * - decoding: unused.
	-+ * @deprecated this value is now exported as a part of
	-+ * AV_PKT_DATA_CPB_PROPERTIES packet side data
	-+ */
	-+ attribute_deprecated
	-+ uint64_t vbv_delay;
	-+#endif
	-+
	-+#if FF_API_SIDEDATA_ONLY_PKT
	-+ /**
	-+ * Encoding only and set by default. Allow encoders to output packets
	-+ * that do not contain any encoded data, only side data.
	-+ *
	-+ * Some encoders need to output such packets, e.g. to update some stream
	-+ * parameters at the end of encoding.
	-+ *
	-+ * @deprecated this field disables the default behaviour and
	-+ * it is kept only for compatibility.
	-+ */
	-+ attribute_deprecated
	-+ int side_data_only_packets;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if !FF_API_LOWRES
	-+ /**
	-+ * low resolution decoding, 1-> 1/2 size, 2->1/4 size
	-+ * - encoding: unused
	-+ * - decoding: Set by user.
	-+ */
	-+ int lowres;
	-+#endif
	-+
	-+ /**
	-+ * 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
	-+ /**
	-+ * debug motion vectors
	-+ * - encoding: Set by user.
	-+ * - decoding: Set by user.
	-+ */
	-+ 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
	-+
	-+ /**
	-+ * 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;
	-+
	-+ /**
	-+ * Control the form of AVSubtitle.rects[N]->ass
	-+ * - decoding: set by user
	-+ * - encoding: unused
	-+ */
	-+ int sub_text_format;
	-+#define FF_SUB_TEXT_FMT_ASS 0
	-+#if FF_API_ASS_TIMING
	-+#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1
	-+#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;
	-+} AVCodecContext;
	-+
	-+#if FF_API_CODEC_GET_SET
	-+/**
	-+ * Accessors for some AVCodecContext fields. These used to be provided for ABI
	-+ * compatibility, and do not need to be used anymore.
	-+ */
	-+attribute_deprecated
	-+AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx);
	-+attribute_deprecated
	-+void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val);
	-+
	-+attribute_deprecated
	-+const AVCodecDescriptor av_codec_get_codec_descriptor(const AVCodecContext avctx);
	-+attribute_deprecated
	-+void av_codec_set_codec_descriptor(AVCodecContext avctx, const AVCodecDescriptor desc);
	-+
	-+attribute_deprecated
	-+unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
	-+
	-+#if FF_API_LOWRES
	-+attribute_deprecated
	-+int av_codec_get_lowres(const AVCodecContext *avctx);
	-+attribute_deprecated
	-+void av_codec_set_lowres(AVCodecContext *avctx, int val);
	-+#endif
	-+
	-+attribute_deprecated
	-+int av_codec_get_seek_preroll(const AVCodecContext *avctx);
	-+attribute_deprecated
	-+void av_codec_set_seek_preroll(AVCodecContext *avctx, int val);
	-+
	-+attribute_deprecated
	-+uint16_t av_codec_get_chroma_intra_matrix(const AVCodecContext avctx);
	-+attribute_deprecated
	-+void av_codec_set_chroma_intra_matrix(AVCodecContext avctx, uint16_t val);
	-+#endif
	-+
	-+/**
	-+ * AVProfile.
	-+ */
	-+typedef struct AVProfile {
	-+ int profile;
	-+ const char *name; ///< short name for the profile
	-+} AVProfile;
	-+
	-+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.
	-+ */
	-+ 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 {
	-+ /**
	-+ * A hardware pixel format which the codec can use.
	-+ */
	-+ 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;
	-+
	-+typedef struct AVCodecDefault AVCodecDefault;
	-+
	-+struct AVSubtitle;
	-+
	-+/**
	-+ * 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;
	-+ 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
	-+ uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
	-+ 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.
	-+ *****************************************************************
	-+ */
	-+ int priv_data_size;
	-+ struct AVCodec *next;
	-+ /**
	-+ * @name Frame-level threading support functions
	-+ * @{
	-+ */
	-+ /**
	-+ * If defined, called on thread contexts when they are created.
	-+ * If the codec allocates writable tables in init(), re-allocate them here.
	-+ * priv_data will be set to a copy of the original.
	-+ */
	-+ int (init_thread_copy)(AVCodecContext );
	-+ /**
	-+ * 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)(AVCodecContext dst, const AVCodecContext *src);
	-+ /** @} */
	-+
	-+ /**
	-+ * Private codec-specific defaults.
	-+ */
	-+ const AVCodecDefault *defaults;
	-+
	-+ /**
	-+ * Initialize codec static data, called from avcodec_register().
	-+ *
	-+ * 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)(AVCodecContext );
	-+ int (encode_sub)(AVCodecContext , uint8_t *buf, int buf_size,
	-+ const struct AVSubtitle *sub);
	-+ /**
	-+ * Encode data to an AVPacket.
	-+ *
	-+ * @param avctx codec context
	-+ * @param avpkt output AVPacket (may contain a user-provided buffer)
	-+ * @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)(AVCodecContext avctx, AVPacket avpkt, const AVFrame frame,
	-+ int *got_packet_ptr);
	-+ int (decode)(AVCodecContext , void outdata, int outdata_size, AVPacket *avpkt);
	-+ int (close)(AVCodecContext );
	-+ /**
	-+ * Encode API with decoupled packet/frame dataflow. The API is the
	-+ * same as the avcodec_ prefixed APIs (avcodec_send_frame() etc.), except
	-+ * that:
	-+ * - never called if the codec is closed or the wrong type,
	-+ * - if AV_CODEC_CAP_DELAY is not set, drain frames are never sent,
	-+ * - only one drain frame is ever passed down,
	-+ */
	-+ int (send_frame)(AVCodecContext avctx, const AVFrame *frame);
	-+ int (receive_packet)(AVCodecContext avctx, 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)(AVCodecContext avctx, AVFrame *frame);
	-+ /**
	-+ * Flush buffers.
	-+ * Will be called when seeking
	-+ */
	-+ void (flush)(AVCodecContext );
	-+ /**
	-+ * Internal codec capabilities.
	-+ * See FF_CODEC_CAP_* in internal.h
	-+ */
	-+ int caps_internal;
	-+
	-+ /**
	-+ * 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 **hw_configs;
	-+} AVCodec;
	-+
	-+#if FF_API_CODEC_GET_SET
	-+attribute_deprecated
	-+int av_codec_get_max_lowres(const AVCodec *codec);
	-+#endif
	-+
	-+struct MpegEncContext;
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * @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)
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#if FF_API_AVPICTURE
	-+/**
	-+ * @defgroup lavc_picture AVPicture
	-+ *
	-+ * Functions for working with AVPicture
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * Picture data structure.
	-+ *
	-+ * Up to four components can be stored into it, the last component is
	-+ * alpha.
	-+ * @deprecated use AVFrame or imgutils functions instead
	-+ */
	-+typedef struct AVPicture {
	-+ attribute_deprecated
	-+ uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes
	-+ attribute_deprecated
	-+ int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line
	-+} AVPicture;
	-+
	-+/**
	-+ * @}
	-+ */
	-+#endif
	-+
	-+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
	-+
	-+#if FF_API_AVPICTURE
	-+ /**
	-+ * @deprecated unused
	-+ */
	-+ attribute_deprecated
	-+ AVPicture pict;
	-+#endif
	-+ /**
	-+ * 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;
	-+
	-+/**
	-+ * 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;
	-+
	-+/**
	-+ * 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);
	-+
	-+#if FF_API_NEXT
	-+/**
	-+ * If c is NULL, returns the first registered codec,
	-+ * if c is non-NULL, returns the next registered codec after c,
	-+ * or NULL if c is the last one.
	-+ */
	-+attribute_deprecated
	-+AVCodec av_codec_next(const AVCodec c);
	-+#endif
	-+
	-+/**
	-+ * 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);
	-+
	-+#if FF_API_NEXT
	-+/**
	-+ * Register the codec codec and initialize libavcodec.
	-+ *
	-+ * @warning either this function or avcodec_register_all() must be called
	-+ * before any other libavcodec functions.
	-+ *
	-+ * @see avcodec_register_all()
	-+ */
	-+attribute_deprecated
	-+void avcodec_register(AVCodec *codec);
	-+
	-+/**
	-+ * Register all the codecs, parsers and bitstream filters which were enabled at
	-+ * configuration time. If you do not call this function you can select exactly
	-+ * which formats you want to support, by using the individual registration
	-+ * functions.
	-+ *
	-+ * @see avcodec_register
	-+ * @see av_register_codec_parser
	-+ * @see av_register_bitstream_filter
	-+ */
	-+attribute_deprecated
	-+void avcodec_register_all(void);
	-+#endif
	-+
	-+/**
	-+ * 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);
	-+
	-+#if FF_API_GET_CONTEXT_DEFAULTS
	-+/**
	-+ * @deprecated This function should not be used, as closing and opening a codec
	-+ * context multiple time is not supported. A new codec context should be
	-+ * allocated for each new use.
	-+ */
	-+int avcodec_get_context_defaults3(AVCodecContext s, const AVCodec codec);
	-+#endif
	-+
	-+/**
	-+ * 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_COPY_CONTEXT
	-+/**
	-+ * Get the AVClass for AVFrame. It can be used in combination with
	-+ * AV_OPT_SEARCH_FAKE_OBJ for examining options.
	-+ *
	-+ * @see av_opt_find().
	-+ */
	-+const AVClass *avcodec_get_frame_class(void);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * Copy the settings of the source AVCodecContext into the destination
	-+ * AVCodecContext. The resulting destination codec context will be
	-+ * unopened, i.e. you are required to call avcodec_open2() before you
	-+ * can use this AVCodecContext to decode/encode video/audio data.
	-+ *
	-+ * @param dest target codec context, should be initialized with
	-+ * avcodec_alloc_context3(NULL), but otherwise uninitialized
	-+ * @param src source codec context
	-+ * @return AVERROR() on error (e.g. memory allocation error), 0 on success
	-+ *
	-+ * @deprecated The semantics of this function are ill-defined and it should not
	-+ * be used. If you need to transfer the stream parameters from one codec context
	-+ * to another, use an intermediate AVCodecParameters instance and the
	-+ * avcodec_parameters_from_context() / avcodec_parameters_to_context()
	-+ * functions.
	-+ */
	-+attribute_deprecated
	-+int avcodec_copy_context(AVCodecContext dest, const AVCodecContext src);
	-+#endif
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * 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
	-+ * avcodec_register_all();
	-+ * 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_packet
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * 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
	-+ */
	-+void av_init_packet(AVPacket *pkt);
	-+
	-+/**
	-+ * 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,
	-+ * buf and destruct 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);
	-+
	-+#if FF_API_AVPACKET_OLD_API
	-+/**
	-+ * @warning This is a hack - the packet memory allocation stuff is broken. The
	-+ * packet is allocated if it was not really allocated.
	-+ *
	-+ * @deprecated Use av_packet_ref or av_packet_make_refcounted
	-+ */
	-+attribute_deprecated
	-+int av_dup_packet(AVPacket *pkt);
	-+/**
	-+ * Copy packet, including contents
	-+ *
	-+ * @return 0 on success, negative AVERROR on fail
	-+ *
	-+ * @deprecated Use av_packet_ref
	-+ */
	-+attribute_deprecated
	-+int av_copy_packet(AVPacket dst, const AVPacket src);
	-+
	-+/**
	-+ * Copy packet side data
	-+ *
	-+ * @return 0 on success, negative AVERROR on fail
	-+ *
	-+ * @deprecated Use av_packet_copy_props
	-+ */
	-+attribute_deprecated
	-+int av_copy_packet_side_data(AVPacket dst, const AVPacket src);
	-+
	-+/**
	-+ * Free a packet.
	-+ *
	-+ * @deprecated Use av_packet_unref
	-+ *
	-+ * @param pkt packet to free
	-+ */
	-+attribute_deprecated
	-+void av_free_packet(AVPacket *pkt);
	-+#endif
	-+/**
	-+ * 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,
	-+ int 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,
	-+ int size);
	-+
	-+/**
	-+ * Get side information from packet.
	-+ *
	-+ * @param pkt packet
	-+ * @param type desired side information type
	-+ * @param size pointer for side information size to store (optional)
	-+ * @return pointer to data if present or NULL otherwise
	-+ */
	-+uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
	-+ int *size);
	-+
	-+#if FF_API_MERGE_SD_API
	-+attribute_deprecated
	-+int av_packet_merge_side_data(AVPacket *pkt);
	-+
	-+attribute_deprecated
	-+int av_packet_split_side_data(AVPacket *pkt);
	-+#endif
	-+
	-+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, int *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, int 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
	-+ * @param src Source packet
	-+ *
	-+ * @return 0 on success, a negative AVERROR on error.
	-+ */
	-+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);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+/**
	-+ * @addtogroup lavc_decoding
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * 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.
	-+ */
	-+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.
	-+ */
	-+AVCodec avcodec_find_decoder_by_name(const char name);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * 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 the audio frame of size avpkt->size from avpkt->data into frame.
	-+ *
	-+ * Some decoders may support multiple frames in a single AVPacket. Such
	-+ * decoders would then just decode the first frame and the return value would be
	-+ * less than the packet size. In this case, avcodec_decode_audio4 has to be
	-+ * called again with an AVPacket containing the remaining data in order to
	-+ * decode the second frame, etc... Even if no frames are returned, the packet
	-+ * needs to be fed to the decoder with remaining data until it is completely
	-+ * consumed or an error occurs.
	-+ *
	-+ * 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 samples. It is safe to flush even those decoders that are not
	-+ * marked with AV_CODEC_CAP_DELAY, then no samples will be returned.
	-+ *
	-+ * @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 the codec context
	-+ * @param[out] frame The AVFrame in which to store decoded audio samples.
	-+ * The decoder will allocate a buffer for the decoded frame by
	-+ * calling the AVCodecContext.get_buffer2() callback.
	-+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
	-+ * reference counted and the returned reference belongs to the
	-+ * caller. The caller must release the frame using av_frame_unref()
	-+ * when the frame is no longer needed. The caller may safely write
	-+ * to the frame if av_frame_is_writable() returns 1.
	-+ * When AVCodecContext.refcounted_frames is set to 0, the returned
	-+ * reference belongs to the decoder and is valid only until the
	-+ * next call to this function or until closing or flushing the
	-+ * decoder. The caller may not write to it.
	-+ * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
	-+ * non-zero. Note that this field being set to zero
	-+ * does not mean that an error has occurred. For
	-+ * decoders with AV_CODEC_CAP_DELAY set, no given decode
	-+ * call is guaranteed to produce a frame.
	-+ * @param[in] avpkt The input AVPacket containing the input buffer.
	-+ * At least avpkt->data and avpkt->size should be set. Some
	-+ * decoders might also require additional fields to be set.
	-+ * @return A negative error code is returned if an error occurred during
	-+ * decoding, otherwise the number of bytes consumed from the input
	-+ * AVPacket is returned.
	-+ *
	-+* @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
	-+ */
	-+attribute_deprecated
	-+int avcodec_decode_audio4(AVCodecContext avctx, AVFrame frame,
	-+ int got_frame_ptr, const AVPacket avpkt);
	-+
	-+/**
	-+ * Decode the video frame of size avpkt->size from avpkt->data into picture.
	-+ * Some decoders may support multiple frames in a single AVPacket, such
	-+ * decoders would then just decode the first frame.
	-+ *
	-+ * @warning The input buffer 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.
	-+ *
	-+ * @warning The end of the input buffer buf should be set to 0 to ensure that
	-+ * no overreading happens for damaged MPEG streams.
	-+ *
	-+ * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay
	-+ * between input and output, these need to be fed with avpkt->data=NULL,
	-+ * avpkt->size=0 at the end to return the remaining frames.
	-+ *
	-+ * @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] picture The AVFrame in which the decoded video frame will be stored.
	-+ * Use av_frame_alloc() to get an AVFrame. The codec will
	-+ * allocate memory for the actual bitmap by calling the
	-+ * AVCodecContext.get_buffer2() callback.
	-+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
	-+ * reference counted and the returned reference belongs to the
	-+ * caller. The caller must release the frame using av_frame_unref()
	-+ * when the frame is no longer needed. The caller may safely write
	-+ * to the frame if av_frame_is_writable() returns 1.
	-+ * When AVCodecContext.refcounted_frames is set to 0, the returned
	-+ * reference belongs to the decoder and is valid only until the
	-+ * next call to this function or until closing or flushing the
	-+ * decoder. The caller may not write to it.
	-+ *
	-+ * @param[in] avpkt The input AVPacket containing the input buffer.
	-+ * You can create such packet with av_init_packet() and by then setting
	-+ * data and size, some decoders might in addition need other fields like
	-+ * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
	-+ * fields possible.
	-+ * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero.
	-+ * @return On error a negative value is returned, otherwise the number of bytes
	-+ * used or zero if no frame could be decompressed.
	-+ *
	-+ * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
	-+ */
	-+attribute_deprecated
	-+int avcodec_decode_video2(AVCodecContext avctx, AVFrame picture,
	-+ int *got_picture_ptr,
	-+ const AVPacket *avpkt);
	-+
	-+/**
	-+ * 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 expect 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.
	-+ *
	-+ * @warning Do not mix this API with the legacy API (like avcodec_decode_video2())
	-+ * on the same AVCodecContext. It will return unexpected results now
	-+ * or in future libavcodec versions.
	-+ *
	-+ * @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
	-+ * 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, refcounted_frames not set, it is a
	-+ * decoder, or requires flush
	-+ * AVERROR(ENOMEM): failed to add packet to internal queue, or similar
	-+ * other errors: legitimate decoding 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_frame_unref(frame) 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 an encoder
	-+ * other errors: legitimate decoding 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;
	-+ 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;
	-+
	-+#if FF_API_CONVERGENCE_DURATION
	-+ /**
	-+ * @deprecated unused
	-+ */
	-+ attribute_deprecated
	-+ int64_t convergence_duration;
	-+#endif
	-+
	-+ // 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[5]; /* 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);
	-+ struct AVCodecParser *next;
	-+} 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);
	-+
	-+attribute_deprecated
	-+AVCodecParser av_parser_next(const AVCodecParser c);
	-+
	-+attribute_deprecated
	-+void av_register_codec_parser(AVCodecParser *parser);
	-+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);
	-+
	-+/**
	-+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
	-+ * @deprecated use AVBitStreamFilter
	-+ */
	-+int av_parser_change(AVCodecParserContext *s,
	-+ AVCodecContext *avctx,
	-+ uint8_t *poutbuf, int poutbuf_size,
	-+ const uint8_t *buf, int buf_size, int keyframe);
	-+void av_parser_close(AVCodecParserContext *s);
	-+
	-+/**
	-+ * @}
	-+ * @}
	-+ */
	-+
	-+/**
	-+ * @addtogroup lavc_encoding
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * 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.
	-+ */
	-+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.
	-+ */
	-+AVCodec avcodec_find_encoder_by_name(const char name);
	-+
	-+/**
	-+ * Encode a frame of audio.
	-+ *
	-+ * Takes input samples from frame and writes the next output packet, if
	-+ * available, to avpkt. The output packet does not necessarily contain data for
	-+ * the most recent frame, as encoders can delay, split, and combine input frames
	-+ * internally as needed.
	-+ *
	-+ * @param avctx codec context
	-+ * @param avpkt output AVPacket.
	-+ * The user can supply an output buffer by setting
	-+ * avpkt->data and avpkt->size prior to calling the
	-+ * function, but if the size of the user-provided data is not
	-+ * large enough, encoding will fail. If avpkt->data and
	-+ * avpkt->size are set, avpkt->destruct must also be set. All
	-+ * other AVPacket fields will be reset by the encoder using
	-+ * av_init_packet(). If avpkt->data is NULL, the encoder will
	-+ * allocate it. The encoder will set avpkt->size to the size
	-+ * of the output packet.
	-+ *
	-+ * If this function fails or produces no output, avpkt will be
	-+ * freed using av_packet_unref().
	-+ * @param[in] frame AVFrame containing the raw audio data to be encoded.
	-+ * May be NULL when flushing an encoder that has the
	-+ * AV_CODEC_CAP_DELAY capability set.
	-+ * 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.
	-+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
	-+ * output packet is non-empty, and to 0 if it is
	-+ * empty. If the function returns an error, the
	-+ * packet can be assumed to be invalid, and the
	-+ * value of got_packet_ptr is undefined and should
	-+ * not be used.
	-+ * @return 0 on success, negative error code on failure
	-+ *
	-+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
	-+ */
	-+attribute_deprecated
	-+int avcodec_encode_audio2(AVCodecContext avctx, AVPacket avpkt,
	-+ const AVFrame frame, int got_packet_ptr);
	-+
	-+/**
	-+ * Encode a frame of video.
	-+ *
	-+ * Takes input raw video data from frame and writes the next output packet, if
	-+ * available, to avpkt. The output packet does not necessarily contain data for
	-+ * the most recent frame, as encoders can delay and reorder input frames
	-+ * internally as needed.
	-+ *
	-+ * @param avctx codec context
	-+ * @param avpkt output AVPacket.
	-+ * The user can supply an output buffer by setting
	-+ * avpkt->data and avpkt->size prior to calling the
	-+ * function, but if the size of the user-provided data is not
	-+ * large enough, encoding will fail. All other AVPacket fields
	-+ * will be reset by the encoder using av_init_packet(). If
	-+ * avpkt->data is NULL, the encoder will allocate it.
	-+ * The encoder will set avpkt->size to the size of the
	-+ * output packet. The returned data (if any) belongs to the
	-+ * caller, he is responsible for freeing it.
	-+ *
	-+ * If this function fails or produces no output, avpkt will be
	-+ * freed using av_packet_unref().
	-+ * @param[in] frame AVFrame containing the raw video data to be encoded.
	-+ * May be NULL when flushing an encoder that has the
	-+ * AV_CODEC_CAP_DELAY capability set.
	-+ * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the
	-+ * output packet is non-empty, and to 0 if it is
	-+ * empty. If the function returns an error, the
	-+ * packet can be assumed to be invalid, and the
	-+ * value of got_packet_ptr is undefined and should
	-+ * not be used.
	-+ * @return 0 on success, negative error code on failure
	-+ *
	-+ * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
	-+ */
	-+attribute_deprecated
	-+int avcodec_encode_video2(AVCodecContext avctx, AVPacket avpkt,
	-+ const AVFrame frame, int got_packet_ptr);
	-+
	-+int avcodec_encode_subtitle(AVCodecContext avctx, uint8_t buf, int buf_size,
	-+ const AVSubtitle *sub);
	-+
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#if FF_API_AVPICTURE
	-+/**
	-+ * @addtogroup lavc_picture
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * @deprecated unused
	-+ */
	-+attribute_deprecated
	-+int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
	-+
	-+/**
	-+ * @deprecated unused
	-+ */
	-+attribute_deprecated
	-+void avpicture_free(AVPicture *picture);
	-+
	-+/**
	-+ * @deprecated use av_image_fill_arrays() instead.
	-+ */
	-+attribute_deprecated
	-+int avpicture_fill(AVPicture picture, const uint8_t ptr,
	-+ enum AVPixelFormat pix_fmt, int width, int height);
	-+
	-+/**
	-+ * @deprecated use av_image_copy_to_buffer() instead.
	-+ */
	-+attribute_deprecated
	-+int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
	-+ int width, int height,
	-+ unsigned char *dest, int dest_size);
	-+
	-+/**
	-+ * @deprecated use av_image_get_buffer_size() instead.
	-+ */
	-+attribute_deprecated
	-+int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
	-+
	-+/**
	-+ * @deprecated av_image_copy() instead.
	-+ */
	-+attribute_deprecated
	-+void av_picture_copy(AVPicture dst, const AVPicture src,
	-+ enum AVPixelFormat pix_fmt, int width, int height);
	-+
	-+/**
	-+ * @deprecated unused
	-+ */
	-+attribute_deprecated
	-+int av_picture_crop(AVPicture dst, const AVPicture src,
	-+ enum AVPixelFormat pix_fmt, int top_band, int left_band);
	-+
	-+/**
	-+ * @deprecated unused
	-+ */
	-+attribute_deprecated
	-+int av_picture_pad(AVPicture dst, const AVPicture src, int height, int width, enum AVPixelFormat pix_fmt,
	-+ int padtop, int padbottom, int padleft, int padright, int *color);
	-+
	-+/**
	-+ * @}
	-+ */
	-+#endif
	-+
	-+/**
	-+ * @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.
	-+ * @{
	-+ */
	-+
	-+#if FF_API_GETCHROMA
	-+/**
	-+ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
	-+ */
	-+
	-+attribute_deprecated
	-+void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int h_shift, int v_shift);
	-+#endif
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * @deprecated see av_get_pix_fmt_loss()
	-+ */
	-+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
	-+ int has_alpha);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * @deprecated see av_find_best_pix_fmt_of_2()
	-+ */
	-+enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
	-+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
	-+
	-+attribute_deprecated
	-+enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2,
	-+ enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
	-+
	-+enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext s, const enum AVPixelFormat fmt);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#if FF_API_TAG_STRING
	-+/**
	-+ * Put a string representing the codec tag codec_tag in buf.
	-+ *
	-+ * @param buf buffer to place codec tag in
	-+ * @param buf_size size in bytes of buf
	-+ * @param codec_tag codec tag to assign
	-+ * @return the length of the string that would have been generated if
	-+ * enough space had been available, excluding the trailing null
	-+ *
	-+ * @deprecated see av_fourcc_make_string() and av_fourcc2str().
	-+ */
	-+attribute_deprecated
	-+size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag);
	-+#endif
	-+
	-+void avcodec_string(char buf, int buf_size, AVCodecContext enc, int encode);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * 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);
	-+
	-+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 decoder state / flush internal buffers. Should be called
	-+ * e.g. when seeking or when switching to a different stream.
	-+ *
	-+ * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
	-+ * this invalidates the frames previously returned from the decoder. When
	-+ * refcounted frames are used, the decoder just releases any references it might
	-+ * keep internally, but the caller's reference remains valid.
	-+ */
	-+void avcodec_flush_buffers(AVCodecContext *avctx);
	-+
	-+/**
	-+ * 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 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);
	-+
	-+/**
	-+ * 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 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);
	-+
	-+/**
	-+ * 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);
	-+
	-+#if FF_API_OLD_BSF
	-+typedef struct AVBitStreamFilterContext {
	-+ void *priv_data;
	-+ const struct AVBitStreamFilter *filter;
	-+ AVCodecParserContext *parser;
	-+ struct AVBitStreamFilterContext *next;
	-+ /**
	-+ * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter().
	-+ * Not for access by library users.
	-+ */
	-+ char *args;
	-+} AVBitStreamFilterContext;
	-+#endif
	-+
	-+typedef struct AVBSFInternal AVBSFInternal;
	-+
	-+/**
	-+ * 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 libavcodec internal data. Must not be touched by the caller in any
	-+ * way.
	-+ */
	-+ AVBSFInternal *internal;
	-+
	-+ /**
	-+ * 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);
	-+} AVBitStreamFilter;
	-+
	-+#if FF_API_OLD_BSF
	-+/**
	-+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
	-+ * is deprecated. Use the new bitstream filtering API (using AVBSFContext).
	-+ */
	-+attribute_deprecated
	-+void av_register_bitstream_filter(AVBitStreamFilter *bsf);
	-+/**
	-+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
	-+ * is deprecated. Use av_bsf_get_by_name(), av_bsf_alloc(), and av_bsf_init()
	-+ * from the new bitstream filtering API (using AVBSFContext).
	-+ */
	-+attribute_deprecated
	-+AVBitStreamFilterContext av_bitstream_filter_init(const char name);
	-+/**
	-+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
	-+ * is deprecated. Use av_bsf_send_packet() and av_bsf_receive_packet() from the
	-+ * new bitstream filtering API (using AVBSFContext).
	-+ */
	-+attribute_deprecated
	-+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
	-+ AVCodecContext avctx, const char args,
	-+ uint8_t *poutbuf, int poutbuf_size,
	-+ const uint8_t *buf, int buf_size, int keyframe);
	-+/**
	-+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
	-+ * is deprecated. Use av_bsf_free() from the new bitstream filtering API (using
	-+ * AVBSFContext).
	-+ */
	-+attribute_deprecated
	-+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
	-+/**
	-+ * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext)
	-+ * is deprecated. Use av_bsf_iterate() from the new bitstream filtering API (using
	-+ * AVBSFContext).
	-+ */
	-+attribute_deprecated
	-+const AVBitStreamFilter av_bitstream_filter_next(const AVBitStreamFilter f);
	-+#endif
	-+
	-+/**
	-+ * @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);
	-+#if FF_API_NEXT
	-+attribute_deprecated
	-+const AVBitStreamFilter av_bsf_next(void *opaque);
	-+#endif
	-+
	-+/**
	-+ * 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.
	-+ * This parameter may be NULL, which signals the end of the stream (i.e. no more
	-+ * packets will be sent). That will cause the filter to output any packets it
	-+ * may have buffered internally.
	-+ *
	-+ * @return 0 on success, a negative AVERROR on error.
	-+ */
	-+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);
	-+
	-+/**
	-+ * 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);
	-+
	-+/* 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);
	-+
	-+/**
	-+ * 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);
	-+
	-+#if FF_API_USER_VISIBLE_AVHWACCEL
	-+/**
	-+ * Register the hardware accelerator hwaccel.
	-+ *
	-+ * @deprecated This function doesn't do anything.
	-+ */
	-+attribute_deprecated
	-+void av_register_hwaccel(AVHWAccel *hwaccel);
	-+
	-+/**
	-+ * If hwaccel is NULL, returns the first registered hardware accelerator,
	-+ * if hwaccel is non-NULL, returns the next registered hardware accelerator
	-+ * after hwaccel, or NULL if hwaccel is the last one.
	-+ *
	-+ * @deprecated AVHWaccel structures contain no user-serviceable parts, so
	-+ * this function should not be used.
	-+ */
	-+attribute_deprecated
	-+AVHWAccel av_hwaccel_next(const AVHWAccel hwaccel);
	-+#endif
	-+
	-+#if FF_API_LOCKMGR
	-+/**
	-+ * Lock operation used by lockmgr
	-+ *
	-+ * @deprecated Deprecated together with av_lockmgr_register().
	-+ */
	-+enum AVLockOp {
	-+ AV_LOCK_CREATE, ///< Create a mutex
	-+ AV_LOCK_OBTAIN, ///< Lock the mutex
	-+ AV_LOCK_RELEASE, ///< Unlock the mutex
	-+ AV_LOCK_DESTROY, ///< Free mutex resources
	-+};
	-+
	-+/**
	-+ * Register a user provided lock manager supporting the operations
	-+ * specified by AVLockOp. The "mutex" argument to the function points
	-+ * to a (void *) where the lockmgr should store/get a pointer to a user
	-+ * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the
	-+ * value left by the last call for all other ops. If the lock manager is
	-+ * unable to perform the op then it should leave the mutex in the same
	-+ * state as when it was called and return a non-zero value. However,
	-+ * when called with AV_LOCK_DESTROY the mutex will always be assumed to
	-+ * have been successfully destroyed. If av_lockmgr_register succeeds
	-+ * it will return a non-negative value, if it fails it will return a
	-+ * negative value and destroy all mutex and unregister all callbacks.
	-+ * av_lockmgr_register is not thread-safe, it must be called from a
	-+ * single thread before any calls which make use of locking are used.
	-+ *
	-+ * @param cb User defined callback. av_lockmgr_register invokes calls
	-+ * to this callback and the previously registered callback.
	-+ * The callback will be used to create more than one mutex
	-+ * each of which must be backed by its own underlying locking
	-+ * mechanism (i.e. do not use a single static object to
	-+ * implement your lock manager). If cb is set to NULL the
	-+ * lockmgr will be unregistered.
	-+ *
	-+ * @deprecated This function does nothing, and always returns 0. Be sure to
	-+ * build with thread support to get basic thread safety.
	-+ */
	-+attribute_deprecated
	-+int av_lockmgr_register(int (cb)(void *mutex, enum AVLockOp op));
	-+#endif
	-+
	-+/**
	-+ * 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 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);
	-+
	-+/**
	-+ * @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 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);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#endif /* AVCODEC_AVCODEC_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h
	-new file mode 100644
	-index 000000000000..0c0f9b8d8dae
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/avfft.h
	-@@ -0,0 +1,118 @@
	-+/*
	-+ * 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h
	-new file mode 100644
	-index 000000000000..2cf7da5889ab
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vaapi.h
	-@@ -0,0 +1,86 @@
	-+/*
	-+ * Video Acceleration API (shared data between FFmpeg and the video player)
	-+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
	-+ *
	-+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
	-+ *
	-+ * 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_VAAPI_H
	-+#define AVCODEC_VAAPI_H
	-+
	-+/**
	-+ * @file
	-+ * @ingroup lavc_codec_hwaccel_vaapi
	-+ * Public libavcodec VA API header.
	-+ */
	-+
	-+#include <stdint.h>
	-+#include "libavutil/attributes.h"
	-+#include "version.h"
	-+
	-+#if FF_API_STRUCT_VAAPI_CONTEXT
	-+
	-+/**
	-+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
	-+ * @ingroup lavc_codec_hwaccel
	-+ * @{
	-+ */
	-+
	-+/**
	-+ * This structure is used to share data between the FFmpeg library and
	-+ * the client video application.
	-+ * This shall be zero-allocated and available as
	-+ * AVCodecContext.hwaccel_context. All user members can be set once
	-+ * during initialization or through each AVCodecContext.get_buffer()
	-+ * function call. In any case, they must be valid prior to calling
	-+ * decoding functions.
	-+ *
	-+ * Deprecated: use AVCodecContext.hw_frames_ctx instead.
	-+ */
	-+struct attribute_deprecated vaapi_context {
	-+ /**
	-+ * Window system dependent data
	-+ *
	-+ * - encoding: unused
	-+ * - decoding: Set by user
	-+ */
	-+ void *display;
	-+
	-+ /**
	-+ * Configuration ID
	-+ *
	-+ * - encoding: unused
	-+ * - decoding: Set by user
	-+ */
	-+ uint32_t config_id;
	-+
	-+ /**
	-+ * Context ID (video decode pipeline)
	-+ *
	-+ * - encoding: unused
	-+ * - decoding: Set by user
	-+ */
	-+ uint32_t context_id;
	-+};
	-+
	-+/* @} */
	-+
	-+#endif /* FF_API_STRUCT_VAAPI_CONTEXT */
	-+
	-+#endif /* AVCODEC_VAAPI_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h
	-new file mode 100644
	-index 000000000000..4d9994336911
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/vdpau.h
	-@@ -0,0 +1,176 @@
	-+/*
	-+ * 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"
	-+#include "version.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);
	-+
	-+#if FF_API_VDPAU_PROFILE
	-+/**
	-+ * Get a decoder profile that should be used for initializing a VDPAU decoder.
	-+ * Should be called from the AVCodecContext.get_format() callback.
	-+ *
	-+ * @deprecated Use av_vdpau_bind_context() instead.
	-+ *
	-+ * @param avctx the codec context being used for decoding the stream
	-+ * @param profile a pointer into which the result will be written on success.
	-+ * The contents of profile are undefined if this function returns
	-+ * an error.
	-+ *
	-+ * @return 0 on success (non-negative), a negative AVERROR on failure.
	-+ */
	-+attribute_deprecated
	-+int av_vdpau_get_profile(AVCodecContext avctx, VdpDecoderProfile profile);
	-+#endif
	-+
	-+/* @}*/
	-+
	-+#endif /* AVCODEC_VDPAU_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h
	-new file mode 100644
	-index 000000000000..6895f1a461e3
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavcodec/version.h
	-@@ -0,0 +1,137 @@
	-+/*
	-+ * 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 58
	-+#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.
	-+ */
	-+
	-+#ifndef FF_API_LOWRES
	-+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_DEBUG_MV
	-+#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
	-+#endif
	-+#ifndef FF_API_AVCTX_TIMEBASE
	-+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_CODED_FRAME
	-+#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_SIDEDATA_ONLY_PKT
	-+#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_VDPAU_PROFILE
	-+#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_CONVERGENCE_DURATION
	-+#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_AVPICTURE
	-+#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_AVPACKET_OLD_API
	-+#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_RTP_CALLBACK
	-+#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_VBV_DELAY
	-+#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_CODER_TYPE
	-+#define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_STAT_BITS
	-+#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_PRIVATE_OPT
	-+#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_ASS_TIMING
	-+#define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_OLD_BSF
	-+#define FF_API_OLD_BSF (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_COPY_CONTEXT
	-+#define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_GET_CONTEXT_DEFAULTS
	-+#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_NVENC_OLD_NAME
	-+#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_STRUCT_VAAPI_CONTEXT
	-+#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_MERGE_SD_API
	-+#define FF_API_MERGE_SD_API (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_TAG_STRING
	-+#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_GETCHROMA
	-+#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_CODEC_GET_SET
	-+#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_USER_VISIBLE_AVHWACCEL
	-+#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_LOCKMGR
	-+#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+#ifndef FF_API_NEXT
	-+#define FF_API_NEXT (LIBAVCODEC_VERSION_MAJOR < 59)
	-+#endif
	-+
	-+
	-+#endif /* AVCODEC_VERSION_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h
	-new file mode 100644
	-index 000000000000..ced108aa2c75
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/attributes.h
	-@@ -0,0 +1,167 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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
	-+
	-+#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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h
	-new file mode 100644
	-index 000000000000..c289fbb551c1
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h
	-new file mode 100644
	-index 000000000000..4d633156d14d
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avutil.h
	-@@ -0,0 +1,365 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h
	-new file mode 100644
	-index 000000000000..73b6bd0b148e
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/buffer.h
	-@@ -0,0 +1,291 @@
	-+/*
	-+ * 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 <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.
	-+ */
	-+ int 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(int size);
	-+
	-+/**
	-+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
	-+ * to zero.
	-+ */
	-+AVBufferRef *av_buffer_allocz(int 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, int 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(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, int size);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+/**
	-+ * @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(int size, AVBufferRef (*alloc)(int 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.
	-+ * @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.
	-+ * @return newly created buffer pool on success, NULL on error.
	-+ */
	-+AVBufferPool av_buffer_pool_init2(int size, void opaque,
	-+ AVBufferRef* (alloc)(void opaque, int 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);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#endif /* AVUTIL_BUFFER_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h
	-new file mode 100644
	-index 000000000000..50bb8f03c586
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/channel_layout.h
	-@@ -0,0 +1,232 @@
	-+/*
	-+ * Copyright (c) 2006 Michael Niedermayer <michaelni@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
	-+
	-+/** 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)
	-+
	-+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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h
	-new file mode 100644
	-index 000000000000..0fffa67714e8
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/common.h
	-@@ -0,0 +1,560 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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"
	-+#include "libavutil/avconfig.h"
	-+
	-+#if AV_HAVE_BIGENDIAN
	-+# define AV_NE(be, le) (be)
	-+#else
	-+# define AV_NE(be, le) (le)
	-+#endif
	-+
	-+//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)))
	-+
	-+/**
	-+ * 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]))
	-+
	-+/* misc math functions */
	-+
	-+#ifdef HAVE_AV_CONFIG_H
	-+# include "config.h"
	-+# include "intmath.h"
	-+#endif
	-+
	-+/* Pull in unguarded fallback defines at the end of this file. */
	-+#include "common.h"
	-+
	-+#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 & ((1 << 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));
	-+}
	-+
	-+/**
	-+ * Clip a float 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 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
	-+ if (a < amin) return amin;
	-+ else if (a > amax) return amax;
	-+ else return a;
	-+}
	-+
	-+/**
	-+ * Clip a double 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 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
	-+ if (a < amin) return amin;
	-+ else if (a > amax) return amax;
	-+ else return a;
	-+}
	-+
	-+/** 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 - 1) << 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;
	-+}
	-+
	-+#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))
	-+
	-+/**
	-+ * 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++.
	-+ * @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) {\
	-+ 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 */
	-+
	-+/*
	-+ * The following definitions are outside the multiple inclusion guard
	-+ * to ensure they are immediately available in intmath.h.
	-+ */
	-+
	-+#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_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
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h
	-new file mode 100644
	-index 000000000000..8bb9eb606bf2
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/cpu.h
	-@@ -0,0 +1,130 @@
	-+/*
	-+ * 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>
	-+
	-+#include "attributes.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_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)
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * Set a mask on flags returned by av_get_cpu_flags().
	-+ * This function is mainly useful for testing.
	-+ * Please use av_force_cpu_flags() and av_get_cpu_flags() instead which are more flexible
	-+ */
	-+attribute_deprecated void av_set_cpu_flags_mask(int mask);
	-+
	-+/**
	-+ * Parse CPU flags from a string.
	-+ *
	-+ * The returned flags contain the specified flags as well as related unspecified flags.
	-+ *
	-+ * This function exists only for compatibility with libav.
	-+ * Please use av_parse_cpu_caps() when possible.
	-+ * @return a combination of AV_CPU_* flags, negative on error.
	-+ */
	-+attribute_deprecated
	-+int av_parse_cpu_flags(const char *s);
	-+
	-+/**
	-+ * 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);
	-+
	-+/**
	-+ * 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h
	-new file mode 100644
	-index 000000000000..118f1f00ed20
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/dict.h
	-@@ -0,0 +1,200 @@
	-+/*
	-+ * 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>
	-+
	-+#include "version.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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h
	-new file mode 100644
	-index 000000000000..71df4da353b9
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/error.h
	-@@ -0,0 +1,126 @@
	-+/*
	-+ * 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>
	-+
	-+/**
	-+ * @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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h
	-new file mode 100644
	-index 000000000000..9d57d6ce66ff
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/frame.h
	-@@ -0,0 +1,893 @@
	-+/*
	-+ * 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,
	-+
	-+#if FF_API_FRAME_QP
	-+ /**
	-+ * Implementation-specific description of the format of AV_FRAME_QP_TABLE_DATA.
	-+ * The contents of this side data are undocumented and internal; use
	-+ * av_frame_set_qp_table() and av_frame_get_qp_table() to access this in a
	-+ * meaningful way instead.
	-+ */
	-+ AV_FRAME_DATA_QP_TABLE_PROPERTIES,
	-+
	-+ /**
	-+ * Raw QP table data. Its format is described by
	-+ * AV_FRAME_DATA_QP_TABLE_PROPERTIES. Use av_frame_set_qp_table() and
	-+ * av_frame_get_qp_table() to access this instead.
	-+ */
	-+ AV_FRAME_DATA_QP_TABLE_DATA,
	-+#endif
	-+};
	-+
	-+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;
	-+ int size;
	-+ AVDictionary *metadata;
	-+ AVBufferRef *buf;
	-+} AVFrameSideData;
	-+
	-+/**
	-+ * 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
	-+ *
	-+ * 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: Except for hwaccel formats, pointers not needed by the format
	-+ * MUST be set to NULL.
	-+ */
	-+ uint8_t *data[AV_NUM_DATA_POINTERS];
	-+
	-+ /**
	-+ * For video, size in bytes of each picture line.
	-+ * For audio, size in bytes of each plane.
	-+ *
	-+ * 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.
	-+ */
	-+ 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;
	-+
	-+#if FF_API_PKT_PTS
	-+ /**
	-+ * PTS copied from the AVPacket that was decoded to produce this frame.
	-+ * @deprecated use the pts field instead
	-+ */
	-+ attribute_deprecated
	-+ int64_t pkt_pts;
	-+#endif
	-+
	-+ /**
	-+ * 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;
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_ERROR_FRAME
	-+ /**
	-+ * @deprecated unused
	-+ */
	-+ attribute_deprecated
	-+ uint64_t error[AV_NUM_DATA_POINTERS];
	-+#endif
	-+
	-+ /**
	-+ * 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
	-+ * @deprecated in favor of pkt_pts
	-+ */
	-+ 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. If all elements of
	-+ * this array are NULL, then this frame is not reference counted. 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
	-+
	-+ /**
	-+ * 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;
	-+
	-+#if FF_API_FRAME_QP
	-+ /**
	-+ * QP table
	-+ */
	-+ attribute_deprecated
	-+ int8_t *qscale_table;
	-+ /**
	-+ * QP store stride
	-+ */
	-+ attribute_deprecated
	-+ int qstride;
	-+
	-+ attribute_deprecated
	-+ int qscale_type;
	-+
	-+ attribute_deprecated
	-+ AVBufferRef *qp_table_buf;
	-+#endif
	-+ /**
	-+ * 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_FRAME_GET_SET
	-+/**
	-+ * Accessors for some AVFrame fields. These used to be provided for ABI
	-+ * compatibility, and do not need to be used anymore.
	-+ */
	-+attribute_deprecated
	-+int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
	-+attribute_deprecated
	-+int64_t av_frame_get_pkt_duration (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
	-+attribute_deprecated
	-+int64_t av_frame_get_pkt_pos (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
	-+attribute_deprecated
	-+int64_t av_frame_get_channel_layout (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
	-+attribute_deprecated
	-+int av_frame_get_channels (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_channels (AVFrame *frame, int val);
	-+attribute_deprecated
	-+int av_frame_get_sample_rate (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_sample_rate (AVFrame *frame, int val);
	-+attribute_deprecated
	-+AVDictionary av_frame_get_metadata (const AVFrame frame);
	-+attribute_deprecated
	-+void av_frame_set_metadata (AVFrame frame, AVDictionary val);
	-+attribute_deprecated
	-+int av_frame_get_decode_error_flags (const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_decode_error_flags (AVFrame *frame, int val);
	-+attribute_deprecated
	-+int av_frame_get_pkt_size(const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_pkt_size(AVFrame *frame, int val);
	-+#if FF_API_FRAME_QP
	-+attribute_deprecated
	-+int8_t av_frame_get_qp_table(AVFrame f, int stride, int type);
	-+attribute_deprecated
	-+int av_frame_set_qp_table(AVFrame f, AVBufferRef buf, int stride, int type);
	-+#endif
	-+attribute_deprecated
	-+enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
	-+attribute_deprecated
	-+enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
	-+attribute_deprecated
	-+void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
	-+#endif
	-+
	-+/**
	-+ * Get the name of a colorspace.
	-+ * @return a static string identifying the colorspace; can be NULL.
	-+ */
	-+const char *av_get_colorspace_name(enum AVColorSpace val);
	-+
	-+/**
	-+ * 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,
	-+ int 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);
	-+
	-+/**
	-+ * If side data of the supplied type exists in the frame, free it and remove it
	-+ * from the frame.
	-+ */
	-+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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h
	-new file mode 100644
	-index 000000000000..f5a4b6238774
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/hwcontext.h
	-@@ -0,0 +1,584 @@
	-+/*
	-+ * 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,
	-+};
	-+
	-+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);
	-+
	-+
	-+/**
	-+ * 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h
	-new file mode 100644
	-index 000000000000..fe3d7ec4a5b6
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/intfloat.h
	-@@ -0,0 +1,77 @@
	-+/*
	-+ * 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h
	-new file mode 100644
	-index 000000000000..d9554e609d40
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/log.h
	-@@ -0,0 +1,362 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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"
	-+#include "version.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;
	-+
	-+ /**
	-+ * Return next AVOptions-enabled child or NULL
	-+ */
	-+ void* (child_next)(void obj, void *prev);
	-+
	-+ /**
	-+ * Return an AVClass corresponding to the next potential
	-+ * AVOptions-enabled child.
	-+ *
	-+ * The difference between child_next and this is that
	-+ * child_next iterates over _already existing_ objects, while
	-+ * child_class_next iterates over _all possible_ children.
	-+ */
	-+ const struct AVClass* (child_class_next)(const struct AVClass prev);
	-+
	-+ /**
	-+ * 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);
	-+} 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 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h
	-new file mode 100644
	-index 000000000000..2007ee561987
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/macros.h
	-@@ -0,0 +1,50 @@
	-+/*
	-+ * 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
	-+
	-+/**
	-+ * @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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h
	-new file mode 100644
	-index 000000000000..54901800ba6a
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mathematics.h
	-@@ -0,0 +1,242 @@
	-+/*
	-+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni@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.
	-+ *
	-+ * @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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h
	-new file mode 100644
	-index 000000000000..7e0b12a8a782
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/mem.h
	-@@ -0,0 +1,700 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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 "error.h"
	-+#include "avutil.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.
	-+ *
	-+ * @{
	-+ *
	-+ * @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
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+/**
	-+ * @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-g_t_0040code_007bmalloc_007d-function-attribute-3251">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-g_t_0040code_007balloc_005fsize_007d-function-attribute-3220">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()
	-+ */
	-+av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size);
	-+
	-+/**
	-+ * Non-inlined equivalent of av_mallocz_array().
	-+ *
	-+ * Created for symmetry with the calloc() C function.
	-+ */
	-+void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
	-+
	-+/**
	-+ * 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.
	-+ */
	-+av_alloc_size(2, 3) 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, &current_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 current size of buffer `ptr`. `*size` is
	-+ * changed to `min_size` in case of success or 0 in
	-+ * case of failure
	-+ * @param[in] min_size New 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, &current_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 current size of buffer `ptr`. `size` is
	-+ * changed to `min_size` in case of success or 0 in
	-+ * case of failure
	-+ * @param[in] min_size New 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 current size of buffer `ptr`. `size` is
	-+ * changed to `min_size` in case of success or 0 in
	-+ * case of failure
	-+ * @param[in] min_size New 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
	-+ */
	-+static inline int av_size_mult(size_t a, size_t b, size_t *r)
	-+{
	-+ size_t t = a * b;
	-+ /* Hack inspired from glibc: don't try the division if nelem and elsize
	-+ * are both less than sqrt(SIZE_MAX). */
	-+ if ((a \| b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
	-+ return AVERROR(EINVAL);
	-+ *r = t;
	-+ return 0;
	-+}
	-+
	-+/**
	-+ * 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h
	-new file mode 100644
	-index 000000000000..e184a56672dc
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/pixfmt.h
	-@@ -0,0 +1,529 @@
	-+/*
	-+ * copyright (c) 2006 Michael Niedermayer <michaelni@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.
	-+ *
	-+ * @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
	-+
	-+#if FF_API_VAAPI
	-+ /** @name Deprecated pixel formats */
	-+ /*@{/
	-+ AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
	-+ AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
	-+ AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID
	-+ /*@}/
	-+ AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD,
	-+#else
	-+ /**
	-+ * Hardware acceleration through VA-API, data[3] contains a
	-+ * VASurfaceID.
	-+ */
	-+ AV_PIX_FMT_VAAPI,
	-+#endif
	-+
	-+ 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_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_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_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_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)
	-+
	-+/**
	-+ * Chromaticity coordinates of the source primaries.
	-+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
	-+ */
	-+enum AVColorPrimaries {
	-+ AVCOL_PRI_RESERVED0 = 0,
	-+ AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 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, ///< functionally identical to above
	-+ 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_JEDEC_P22 = 22, ///< JEDEC P22 phosphors
	-+ AVCOL_PRI_NB ///< Not part of ABI
	-+};
	-+
	-+/**
	-+ * Color Transfer Characteristic.
	-+ * These values match the ones defined by ISO/IEC 23001-8_2013 § 7.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 23001-8_2013 § 7.3.
	-+ */
	-+enum AVColorSpace {
	-+ AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
	-+ AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
	-+ AVCOL_SPC_UNSPECIFIED = 2,
	-+ AVCOL_SPC_RESERVED = 3,
	-+ 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
	-+ AVCOL_SPC_SMPTE240M = 7, ///< functionally identical to above
	-+ 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
	-+};
	-+
	-+/**
	-+ * MPEG vs JPEG YUV range.
	-+ */
	-+enum AVColorRange {
	-+ AVCOL_RANGE_UNSPECIFIED = 0,
	-+ AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
	-+ AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges
	-+ 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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h
	-new file mode 100644
	-index 000000000000..5c6b67b4e9f8
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/rational.h
	-@@ -0,0 +1,214 @@
	-+/*
	-+ * rational numbers
	-+ * Copyright (c) 2003 Michael Niedermayer <michaelni@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@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);
	-+
	-+/**
	-+ * @}
	-+ */
	-+
	-+#endif /* AVUTIL_RATIONAL_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h
	-new file mode 100644
	-index 000000000000..8cd43ae8568a
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/samplefmt.h
	-@@ -0,0 +1,272 @@
	-+/*
	-+ * 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 >=0 on success or a negative error code on failure
	-+ * @todo return minimum size in bytes required for the buffer in case
	-+ * of success at the next bump
	-+ */
	-+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 dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h
	-new file mode 100644
	-index 000000000000..3a63e6355f84
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/version.h
	-@@ -0,0 +1,139 @@
	-+/*
	-+ * 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 56
	-+#define LIBAVUTIL_VERSION_MINOR 14
	-+#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.
	-+ *
	-+ * @{
	-+ */
	-+
	-+#ifndef FF_API_VAAPI
	-+#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_FRAME_QP
	-+#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_PLUS1_MINUS1
	-+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_ERROR_FRAME
	-+#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_PKT_PTS
	-+#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_CRYPTO_SIZE_T
	-+#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_FRAME_GET_SET
	-+#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+#ifndef FF_API_PSEUDOPAL
	-+#define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57)
	-+#endif
	-+
	-+
	-+/**
	-+ * @}
	-+ * @}
	-+ */
	-+
	-+#endif /* AVUTIL_VERSION_H */
	-diff --git dom/media/platforms/ffmpeg/ffmpeg58/moz.build dom/media/platforms/ffmpeg/ffmpeg58/moz.build
	-new file mode 100644
	-index 000000000000..c757ed6fad04
	---- /dev/null
	-+++ dom/media/platforms/ffmpeg/ffmpeg58/moz.build
	-@@ -0,0 +1,25 @@
	-+# -- 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 += [
	-+ '..',
	-+ 'include',
	-+]
	-+
	-+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
	-+ CXXFLAGS += [ '-Wno-deprecated-declarations' ]
	-+if CONFIG['CC_TYPE'] == 'clang':
	-+ CXXFLAGS += [
	-+ '-Wno-unknown-attributes',
	-+ ]
	-+
	-+FINAL_LIBRARY = 'xul'
	-diff --git dom/media/platforms/ffmpeg/moz.build dom/media/platforms/ffmpeg/moz.build
	-index 604e445aa4d9..af96fb521e3d 100644
	---- dom/media/platforms/ffmpeg/moz.build
	-+++ dom/media/platforms/ffmpeg/moz.build
	-@@ -13,6 +13,7 @@ DIRS += [
	- 'libav54',
	- 'libav55',
	- 'ffmpeg57',
	-+ 'ffmpeg58',
	- ]
	-
	- UNIFIED_SOURCES += [
	Index: www/firefox/files/patch-bug1438678
	===================================================================
	--- www/firefox/files/patch-bug1438678
	+++ /dev/null
	@@ -1,1000 +0,0 @@
	-commit 68124009fc5a
	-Author: Nicholas Nethercote <nnethercote@mozilla.com>
	-Date: Fri Feb 16 17:54:16 2018 +1100
	-
	- Bug 1438678 - Pass early prefs via shared memory instead of the command line. r=bobowen,jld,glandium.
	-
	- This patch replaces the large -intPrefs/-boolPrefs/-stringPrefs flags with
	- a short-lived, anonymous, shared memory segment that is used to pass the early
	- prefs.
	-
	- Removing the bloat from the command line is nice, but more important is the
	- fact that this will let us pass more prefs at content process start-up, which
	- will allow us to remove the early/late prefs split (bug 1436911).
	-
	- Although this mechanism is only used for prefs, it's conceivable that it could
	- be used for other data that must be received very early by children, and for
	- which the command line isn't ideal.
	-
	- Notable details:
	-
	- - Much of the patch deals with the various platform-specific ways of passing
	- handles/fds to children.
	-
	- - Linux and Mac: we use a fixed fd (8) in combination with the new
	- GeckoChildProcessHost::AddFdToRemap() function (which ensures the child
	- won't close the fd).
	-
	- - Android: like Linux and Mac, but the handles get passed via "parcels" and
	- we use the new SetPrefsFd() function instead of the fixed fd.
	-
	- - Windows: there is no need to duplicate the handle because Windows handles
	- are system-wide. But we do use the new
	- GeckoChildProcessHost::AddHandleToShare() function to add it to the list of
	- inheritable handles. We also ensure that list is processed on all paths
	- (MOZ_SANDBOX with sandbox, MOZ_SANDBOX without sandbox, non-MOZ_SANDBOX) so
	- that the handles are marked as inheritable. The handle is passed via the
	- -prefsHandle flag.
	-
	- The -prefsLen flag is used on all platforms to indicate the size of the
	- shared memory segment.
	-
	- - The patch also moves the serialization/deserialization of the prefs in/out of
	- the shared memory into libpref, which is a better spot for it. (This means
	- Preferences::MustSendToContentProcesses() can be removed.)
	-
	- MozReview-Commit-ID: 8fREEBiYFvc
	-
	- --HG--
	- extra : rebase_source : 7e4c8ebdbcd7d74d6bd2ab3c9e75a6a17dbd8dfe
	----
	- dom/ipc/ContentParent.cpp \| 91 +++++++-------
	- dom/ipc/ContentProcess.cpp \| 121 ++++++++++---------
	- dom/ipc/ContentProcess.h \| 5 +
	- ipc/chromium/src/base/process_util_win.cc \| 4 +
	- ipc/glue/GeckoChildProcessHost.cpp \| 36 +++---
	- ipc/glue/GeckoChildProcessHost.h \| 10 ++
	- .../org/mozilla/gecko/process/IChildProcess.aidl \| 3 +-
	- .../main/java/org/mozilla/gecko/GeckoThread.java \| 13 +-
	- .../org/mozilla/gecko/mozglue/GeckoLoader.java \| 2 +-
	- .../mozilla/gecko/process/GeckoProcessManager.java \| 19 +--
	- .../gecko/process/GeckoServiceChildProcess.java \| 4 +-
	- modules/libpref/Preferences.cpp \| 134 +++++++++++++++++++--
	- modules/libpref/Preferences.h \| 17 +--
	- mozglue/android/APKOpen.cpp \| 4 +-
	- toolkit/xre/Bootstrap.cpp \| 4 +-
	- toolkit/xre/Bootstrap.h \| 2 +-
	- toolkit/xre/nsEmbedFunctions.cpp \| 3 +-
	- widget/android/GeneratedJNIWrappers.cpp \| 4 +-
	- widget/android/GeneratedJNIWrappers.h \| 5 +-
	- xpcom/build/nsXULAppAPI.h \| 2 +-
	- 20 files changed, 318 insertions(+), 165 deletions(-)
	-
	-diff --git dom/ipc/ContentParent.cpp dom/ipc/ContentParent.cpp
	-index e27f3eedc1b1..60be7005354b 100644
	---- dom/ipc/ContentParent.cpp
	-+++ dom/ipc/ContentParent.cpp
	-@@ -7,6 +7,7 @@
	- #include "mozilla/DebugOnly.h"
	-
	- #include "base/basictypes.h"
	-+#include "base/shared_memory.h"
	-
	- #include "ContentParent.h"
	- #include "TabParent.h"
	-@@ -1998,61 +1999,56 @@ ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PR
	- extraArgs.push_back(idStr);
	- extraArgs.push_back(IsForBrowser() ? "-isForBrowser" : "-notForBrowser");
	-
	-- nsAutoCStringN<1024> boolPrefs;
	-- nsAutoCStringN<1024> intPrefs;
	-- nsAutoCStringN<1024> stringPrefs;
	-+ // Prefs information is passed via anonymous shared memory to avoid bloating
	-+ // the command line.
	-
	-- size_t prefsLen;
	-- ContentPrefs::GetEarlyPrefs(&prefsLen);
	-+ // Serialize the early prefs.
	-+ nsAutoCStringN<1024> prefs;
	-+ Preferences::SerializeEarlyPreferences(prefs);
	-
	-- for (unsigned int i = 0; i < prefsLen; i++) {
	-- const char* prefName = ContentPrefs::GetEarlyPref(i);
	-- MOZ_ASSERT(i == 0 \|\| strcmp(prefName, ContentPrefs::GetEarlyPref(i - 1)) > 0,
	-- "Content process preferences should be sorted alphabetically.");
	--
	-- if (!Preferences::MustSendToContentProcesses(prefName)) {
	-- continue;
	-- }
	--
	-- switch (Preferences::GetType(prefName)) {
	-- case nsIPrefBranch::PREF_INT:
	-- intPrefs.Append(nsPrintfCString("%u:%d\|", i, Preferences::GetInt(prefName)));
	-- break;
	-- case nsIPrefBranch::PREF_BOOL:
	-- boolPrefs.Append(nsPrintfCString("%u:%d\|", i, Preferences::GetBool(prefName)));
	-- break;
	-- case nsIPrefBranch::PREF_STRING: {
	-- nsAutoCString value;
	-- Preferences::GetCString(prefName, value);
	-- stringPrefs.Append(nsPrintfCString("%u:%d;%s\|", i, value.Length(), value.get()));
	-- }
	-- break;
	-- case nsIPrefBranch::PREF_INVALID:
	-- break;
	-- default:
	-- printf("preference type: %x\n", Preferences::GetType(prefName));
	-- MOZ_CRASH();
	-- }
	-+ // Set up the shared memory.
	-+ base::SharedMemory shm;
	-+ if (!shm.Create("", /* read_only / false, / open_existing */ false,
	-+ prefs.Length())) {
	-+ NS_ERROR("failed to create shared memory in the parent");
	-+ MarkAsDead();
	-+ return false;
	-+ }
	-+ if (!shm.Map(prefs.Length())) {
	-+ NS_ERROR("failed to map shared memory in the parent");
	-+ MarkAsDead();
	-+ return false;
	- }
	-
	-- nsCString schedulerPrefs = Scheduler::GetPrefs();
	-+ // Copy the serialized prefs into the shared memory.
	-+ memcpy(static_cast<char*>(shm.memory()), prefs.get(), prefs.Length());
	-
	-- // Only do these ones if they're non-empty.
	-- if (!intPrefs.IsEmpty()) {
	-- extraArgs.push_back("-intPrefs");
	-- extraArgs.push_back(intPrefs.get());
	-- }
	-- if (!boolPrefs.IsEmpty()) {
	-- extraArgs.push_back("-boolPrefs");
	-- extraArgs.push_back(boolPrefs.get());
	-- }
	-- if (!stringPrefs.IsEmpty()) {
	-- extraArgs.push_back("-stringPrefs");
	-- extraArgs.push_back(stringPrefs.get());
	-- }
	-+#if defined(XP_WIN)
	-+ // Record the handle as to-be-shared, and pass it via a command flag. This
	-+ // works because Windows handles are system-wide.
	-+ HANDLE prefsHandle = shm.handle();
	-+ mSubprocess->AddHandleToShare(prefsHandle);
	-+ extraArgs.push_back("-prefsHandle");
	-+ extraArgs.push_back(
	-+ nsPrintfCString("%zu", reinterpret_cast<uintptr_t>(prefsHandle)).get());
	-+#else
	-+ // In contrast, Unix fds are per-process. So remap the fd to a fixed one that
	-+ // will be used in the child.
	-+ // XXX: bug 1440207 is about improving how fixed fds are used.
	-+ //
	-+ // Note: on Android, AddFdToRemap() sets up the fd to be passed via a Parcel,
	-+ // and the fixed fd isn't used. However, we still need to mark it for
	-+ // remapping so it doesn't get closed in the child.
	-+ mSubprocess->AddFdToRemap(shm.handle().fd, kPrefsFileDescriptor);
	-+#endif
	-+
	-+ // Pass the length via a command flag.
	-+ extraArgs.push_back("-prefsLen");
	-+ extraArgs.push_back(nsPrintfCString("%zu", uintptr_t(prefs.Length())).get());
	-
	- // Scheduler prefs need to be handled differently because the scheduler needs
	- // to start up in the content process before the normal preferences service.
	-+ nsCString schedulerPrefs = Scheduler::GetPrefs();
	- extraArgs.push_back("-schedulerPrefs");
	- extraArgs.push_back(schedulerPrefs.get());
	-
	-@@ -2061,6 +2057,7 @@ ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PR
	- }
	-
	- if (!mSubprocess->LaunchAndWaitForProcessHandle(extraArgs)) {
	-+ NS_ERROR("failed to launch child in the parent");
	- MarkAsDead();
	- return false;
	- }
	-diff --git dom/ipc/ContentProcess.cpp dom/ipc/ContentProcess.cpp
	-index e3c1f16910c6..2441c8cb9224 100644
	---- dom/ipc/ContentProcess.cpp
	-+++ dom/ipc/ContentProcess.cpp
	-@@ -8,6 +8,8 @@
	-
	- #include "ContentProcess.h"
	- #include "ContentPrefs.h"
	-+#include "base/shared_memory.h"
	-+#include "mozilla/Preferences.h"
	- #include "mozilla/Scheduler.h"
	-
	- #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
	-@@ -15,7 +17,6 @@
	- #endif
	-
	- #if (defined(XP_WIN) \|\| defined(XP_MACOSX)) && defined(MOZ_CONTENT_SANDBOX)
	--#include "mozilla/Preferences.h"
	- #include "mozilla/SandboxSettings.h"
	- #include "nsAppDirectoryServiceDefs.h"
	- #include "nsDirectoryService.h"
	-@@ -81,6 +82,16 @@ SetUpSandboxEnvironment()
	- }
	- #endif
	-
	-+#ifdef ANDROID
	-+static int gPrefsFd = -1;
	-+
	-+void
	-+SetPrefsFd(int aFd)
	-+{
	-+ gPrefsFd = aFd;
	-+}
	-+#endif
	-+
	- bool
	- ContentProcess::Init(int aArgc, char* aArgv[])
	- {
	-@@ -88,9 +99,10 @@ ContentProcess::Init(int aArgc, char* aArgv[])
	- bool foundAppdir = false;
	- bool foundChildID = false;
	- bool foundIsForBrowser = false;
	-- bool foundIntPrefs = false;
	-- bool foundBoolPrefs = false;
	-- bool foundStringPrefs = false;
	-+#ifdef XP_WIN
	-+ bool foundPrefsHandle = false;
	-+#endif
	-+ bool foundPrefsLen = false;
	- bool foundSchedulerPrefs = false;
	-
	- uint64_t childID;
	-@@ -103,7 +115,8 @@ ContentProcess::Init(int aArgc, char* aArgv[])
	- #endif
	-
	- char* schedulerPrefs = nullptr;
	-- InfallibleTArray<Pref> prefsArray;
	-+ base::SharedMemoryHandle prefsHandle = base::SharedMemory::NULLHandle();
	-+ size_t prefsLen = 0;
	- for (int idx = aArgc; idx > 0; idx--) {
	- if (!aArgv[idx]) {
	- continue;
	-@@ -134,54 +147,24 @@ ContentProcess::Init(int aArgc, char* aArgv[])
	- }
	- isForBrowser = strcmp(aArgv[idx], "-notForBrowser");
	- foundIsForBrowser = true;
	-- } else if (!strcmp(aArgv[idx], "-intPrefs")) {
	-- char* str = aArgv[idx + 1];
	-- while (*str) {
	-- int32_t index = strtol(str, &str, 10);
	-- MOZ_ASSERT(str[0] == ':');
	-- str++;
	-- MaybePrefValue value(PrefValue(static_cast<int32_t>(strtol(str, &str, 10))));
	-- MOZ_ASSERT(str[0] == '\|');
	-- str++;
	-- // XXX: we assume these values as default values, which may not be
	-- // true. We also assume they are unlocked. Fortunately, these prefs
	-- // get reset properly by the first IPC message.
	-- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false, value, MaybePrefValue());
	-- prefsArray.AppendElement(pref);
	-- }
	-- foundIntPrefs = true;
	-- } else if (!strcmp(aArgv[idx], "-boolPrefs")) {
	-+#ifdef XP_WIN
	-+ } else if (!strcmp(aArgv[idx], "-prefsHandle")) {
	- char* str = aArgv[idx + 1];
	-- while (*str) {
	-- int32_t index = strtol(str, &str, 10);
	-- MOZ_ASSERT(str[0] == ':');
	-- str++;
	-- MaybePrefValue value(PrefValue(!!strtol(str, &str, 10)));
	-- MOZ_ASSERT(str[0] == '\|');
	-- str++;
	-- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false, value, MaybePrefValue());
	-- prefsArray.AppendElement(pref);
	-- }
	-- foundBoolPrefs = true;
	-- } else if (!strcmp(aArgv[idx], "-stringPrefs")) {
	-+ MOZ_ASSERT(str[0] != '\0');
	-+ // ContentParent uses %zu to print a word-sized unsigned integer. So even
	-+ // though strtoull() returns a long long int, it will fit in a uintptr_t.
	-+ prefsHandle = reinterpret_cast<HANDLE>(strtoull(str, &str, 10));
	-+ MOZ_ASSERT(str[0] == '\0');
	-+ foundPrefsHandle = true;
	-+#endif
	-+ } else if (!strcmp(aArgv[idx], "-prefsLen")) {
	- char* str = aArgv[idx + 1];
	-- while (*str) {
	-- int32_t index = strtol(str, &str, 10);
	-- MOZ_ASSERT(str[0] == ':');
	-- str++;
	-- int32_t length = strtol(str, &str, 10);
	-- MOZ_ASSERT(str[0] == ';');
	-- str++;
	-- MaybePrefValue value(PrefValue(nsCString(str, length)));
	-- Pref pref(nsCString(ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false, value, MaybePrefValue());
	-- prefsArray.AppendElement(pref);
	-- str += length + 1;
	-- MOZ_ASSERT(*(str - 1) == '\|');
	-- }
	-- foundStringPrefs = true;
	-+ MOZ_ASSERT(str[0] != '\0');
	-+ // ContentParent uses %zu to print a word-sized unsigned integer. So even
	-+ // though strtoull() returns a long long int, it will fit in a uintptr_t.
	-+ prefsLen = strtoull(str, &str, 10);
	-+ MOZ_ASSERT(str[0] == '\0');
	-+ foundPrefsLen = true;
	- } else if (!strcmp(aArgv[idx], "-schedulerPrefs")) {
	- schedulerPrefs = aArgv[idx + 1];
	- foundSchedulerPrefs = true;
	-@@ -209,21 +192,43 @@ ContentProcess::Init(int aArgc, char* aArgv[])
	- bool allFound = foundAppdir
	- && foundChildID
	- && foundIsForBrowser
	-- && foundIntPrefs
	-- && foundBoolPrefs
	-- && foundStringPrefs
	-- && foundSchedulerPrefs;
	--
	-+ && foundPrefsLen
	-+ && foundSchedulerPrefs
	-+#ifdef XP_WIN
	-+ && foundPrefsHandle
	-+#endif
	- #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
	-- allFound &= foundProfile;
	-+ && foundProfile
	- #endif
	-+ && true;
	-
	- if (allFound) {
	- break;
	- }
	- }
	-
	-- Preferences::SetEarlyPreferences(&prefsArray);
	-+#ifdef ANDROID
	-+ // Android is different; get the FD via gPrefsFd instead of a fixed fd.
	-+ MOZ_RELEASE_ASSERT(gPrefsFd != -1);
	-+ prefsHandle = base::FileDescriptor(gPrefsFd, /* auto_close */ true);
	-+#elif XP_UNIX
	-+ prefsHandle = base::FileDescriptor(kPrefsFileDescriptor,
	-+ /* auto_close */ true);
	-+#endif
	-+
	-+ // Set up early prefs from the shared memory.
	-+ base::SharedMemory shm;
	-+ if (!shm.SetHandle(prefsHandle, /* read_only */ true)) {
	-+ NS_ERROR("failed to open shared memory in the child");
	-+ return false;
	-+ }
	-+ if (!shm.Map(prefsLen)) {
	-+ NS_ERROR("failed to map shared memory in the child");
	-+ return false;
	-+ }
	-+ Preferences::DeserializeEarlyPreferences(static_cast<char*>(shm.memory()),
	-+ prefsLen);
	-+
	- Scheduler::SetPrefs(schedulerPrefs);
	- mContent.Init(IOThreadChild::message_loop(),
	- ParentPid(),
	-diff --git dom/ipc/ContentProcess.h dom/ipc/ContentProcess.h
	-index a3854c761e10..6582c94da496 100644
	---- dom/ipc/ContentProcess.h
	-+++ dom/ipc/ContentProcess.h
	-@@ -49,6 +49,11 @@ private:
	- DISALLOW_EVIL_CONSTRUCTORS(ContentProcess);
	- };
	-
	-+#ifdef ANDROID
	-+// Android doesn't use -prefsHandle, it gets that FD another way.
	-+void SetPrefsFd(int aFd);
	-+#endif
	-+
	- } // namespace dom
	- } // namespace mozilla
	-
	-diff --git ipc/chromium/src/base/process_util_win.cc ipc/chromium/src/base/process_util_win.cc
	-index 3ed54cd744ac..46667985cd71 100644
	---- ipc/chromium/src/base/process_util_win.cc
	-+++ ipc/chromium/src/base/process_util_win.cc
	-@@ -354,6 +354,10 @@ bool LaunchApp(const std::wstring& cmdline,
	- LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
	- std::vector<HANDLE> handlesToInherit;
	- for (HANDLE h : options.handles_to_inherit) {
	-+ if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) == 0) {
	-+ MOZ_DIAGNOSTIC_ASSERT(false, "SetHandleInformation failed");
	-+ return false;
	-+ }
	- handlesToInherit.push_back(h);
	- }
	-
	-diff --git ipc/glue/GeckoChildProcessHost.cpp ipc/glue/GeckoChildProcessHost.cpp
	-index d18ed9edd4ca..3be1c51d10bb 100644
	---- ipc/glue/GeckoChildProcessHost.cpp
	-+++ ipc/glue/GeckoChildProcessHost.cpp
	-@@ -1030,9 +1030,6 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
	-
	- if (!CrashReporter::IsDummy()) {
	- PROsfd h = PR_FileDesc2NativeHandle(crashAnnotationWritePipe);
	--# if defined(MOZ_SANDBOX)
	-- mSandboxBroker.AddHandleToShare(reinterpret_cast<HANDLE>(h));
	--# endif // defined(MOZ_SANDBOX)
	- mLaunchOptions->handles_to_inherit.push_back(reinterpret_cast<HANDLE>(h));
	- std::string hStr = std::to_string(h);
	- cmdLine.AppendLooseValue(UTF8ToWide(hStr));
	-@@ -1043,6 +1040,11 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
	-
	- # if defined(MOZ_SANDBOX)
	- if (shouldSandboxCurrentProcess) {
	-+ // Mark the handles to inherit as inheritable.
	-+ for (HANDLE h : mLaunchOptions->handles_to_inherit) {
	-+ mSandboxBroker.AddHandleToShare(h);
	-+ }
	-+
	- if (mSandboxBroker.LaunchApp(cmdLine.program().c_str(),
	- cmdLine.command_line_string().c_str(),
	- mLaunchOptions->env_map,
	-@@ -1180,7 +1182,7 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type,
	- const base::file_handle_mapping_vector& fds_to_remap,
	- ProcessHandle* process_handle)
	- {
	-- MOZ_ASSERT((fds_to_remap.size() > 0) && (fds_to_remap.size() <= 3));
	-+ MOZ_RELEASE_ASSERT((2 <= fds_to_remap.size()) && (fds_to_remap.size() <= 4));
	- JNIEnv* const env = mozilla::jni::GetEnvForThread();
	- MOZ_ASSERT(env);
	-
	-@@ -1189,21 +1191,25 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type,
	- for (int ix = 0; ix < argvSize; ix++) {
	- jargs->SetElement(ix, jni::StringParam(argv[ix].c_str(), env));
	- }
	-- base::file_handle_mapping_vector::const_iterator it = fds_to_remap.begin();
	-- int32_t ipcFd = it->first;
	-- it++;
	-- // If the Crash Reporter is disabled, there will not be a second file descriptor.
	-+
	-+ // XXX: this processing depends entirely on the internals of
	-+ // ContentParent::LaunchSubprocess()
	-+ // GeckoChildProcessHost::PerformAsyncLaunchInternal(), and the order in
	-+ // which they append to fds_to_remap. There must be a better way to do it.
	-+ // See bug 1440207.
	-+ int32_t prefsFd = fds_to_remap[0].first;
	-+ int32_t ipcFd = fds_to_remap[1].first;
	- int32_t crashFd = -1;
	- int32_t crashAnnotationFd = -1;
	-- if (it != fds_to_remap.end() && !CrashReporter::IsDummy()) {
	-- crashFd = it->first;
	-- it++;
	-+ if (fds_to_remap.size() == 3) {
	-+ crashAnnotationFd = fds_to_remap[2].first;
	- }
	-- if (it != fds_to_remap.end()) {
	-- crashAnnotationFd = it->first;
	-- it++;
	-+ if (fds_to_remap.size() == 4) {
	-+ crashFd = fds_to_remap[2].first;
	-+ crashAnnotationFd = fds_to_remap[3].first;
	- }
	-- int32_t handle = java::GeckoProcessManager::Start(type, jargs, ipcFd, crashFd, crashAnnotationFd);
	-+
	-+ int32_t handle = java::GeckoProcessManager::Start(type, jargs, prefsFd, ipcFd, crashFd, crashAnnotationFd);
	-
	- if (process_handle) {
	- *process_handle = handle;
	-diff --git ipc/glue/GeckoChildProcessHost.h ipc/glue/GeckoChildProcessHost.h
	-index 631c42066bc7..0345e221abcc 100644
	---- ipc/glue/GeckoChildProcessHost.h
	-+++ ipc/glue/GeckoChildProcessHost.h
	-@@ -103,6 +103,16 @@ public:
	- }
	- #endif
	-
	-+#ifdef XP_WIN
	-+ void AddHandleToShare(HANDLE aHandle) {
	-+ mLaunchOptions->handles_to_inherit.push_back(aHandle);
	-+ }
	-+#else
	-+ void AddFdToRemap(int aSrcFd, int aDstFd) {
	-+ mLaunchOptions->fds_to_remap.push_back(std::make_pair(aSrcFd, aDstFd));
	-+ }
	-+#endif
	-+
	- /**
	- * Must run on the IO thread. Cause the OS process to exit and
	- * ensure its OS resources are cleaned up.
	-diff --git mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl
	-index ba26ae1ba06b..a2535f44c72b 100644
	---- mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl
	-+++ mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/process/IChildProcess.aidl
	-@@ -12,6 +12,7 @@ import android.os.ParcelFileDescriptor;
	- interface IChildProcess {
	- int getPid();
	- boolean start(in IProcessManager procMan, in String[] args, in Bundle extras,
	-- in ParcelFileDescriptor ipcPfd, in ParcelFileDescriptor crashReporterPfd,
	-+ in ParcelFileDescriptor prefsPfd, in ParcelFileDescriptor ipcPfd,
	-+ in ParcelFileDescriptor crashReporterPfd,
	- in ParcelFileDescriptor crashAnnotationPfd);
	- }
	-diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
	-index dfabfd05daf0..8311920afeec 100644
	---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
	-+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
	-@@ -128,6 +128,7 @@ public class GeckoThread extends Thread {
	- public static final int FLAG_PRELOAD_CHILD = 2; // Preload child during main thread start.
	-
	- private static final String EXTRA_ARGS = "args";
	-+ private static final String EXTRA_PREFS_FD = "prefsFd";
	- private static final String EXTRA_IPC_FD = "ipcFd";
	- private static final String EXTRA_CRASH_FD = "crashFd";
	- private static final String EXTRA_CRASH_ANNOTATION_FD = "crashAnnotationFd";
	-@@ -149,7 +150,8 @@ public class GeckoThread extends Thread {
	-
	- private synchronized boolean init(final GeckoProfile profile, final String[] args,
	- final Bundle extras, final int flags,
	-- final int ipcFd, final int crashFd,
	-+ final int prefsFd, final int ipcFd,
	-+ final int crashFd,
	- final int crashAnnotationFd) {
	- ThreadUtils.assertOnUiThread();
	- uiThreadId = android.os.Process.myTid();
	-@@ -163,6 +165,7 @@ public class GeckoThread extends Thread {
	- mFlags = flags;
	-
	- mExtras = (extras != null) ? new Bundle(extras) : new Bundle(3);
	-+ mExtras.putInt(EXTRA_PREFS_FD, prefsFd);
	- mExtras.putInt(EXTRA_IPC_FD, ipcFd);
	- mExtras.putInt(EXTRA_CRASH_FD, crashFd);
	- mExtras.putInt(EXTRA_CRASH_ANNOTATION_FD, crashAnnotationFd);
	-@@ -174,15 +177,16 @@ public class GeckoThread extends Thread {
	-
	- public static boolean initMainProcess(final GeckoProfile profile, final String[] args,
	- final Bundle extras, final int flags) {
	-- return INSTANCE.init(profile, args, extras, flags,
	-+ return INSTANCE.init(profile, args, extras, flags, /* fd */ -1,
	- /* fd / -1, / fd / -1, / fd */ -1);
	- }
	-
	- public static boolean initChildProcess(final String[] args, final Bundle extras,
	-- final int ipcFd, final int crashFd,
	-+ final int prefsFd, final int ipcFd,
	-+ final int crashFd,
	- final int crashAnnotationFd) {
	- return INSTANCE.init(/* profile / null, args, extras, / flags */ 0,
	-- ipcFd, crashFd, crashAnnotationFd);
	-+ prefsFd, ipcFd, crashFd, crashAnnotationFd);
	- }
	-
	- private static boolean canUseProfile(final Context context, final GeckoProfile profile,
	-@@ -442,6 +446,7 @@ public class GeckoThread extends Thread {
	-
	- // And go.
	- GeckoLoader.nativeRun(args,
	-+ mExtras.getInt(EXTRA_PREFS_FD, -1),
	- mExtras.getInt(EXTRA_IPC_FD, -1),
	- mExtras.getInt(EXTRA_CRASH_FD, -1),
	- mExtras.getInt(EXTRA_CRASH_ANNOTATION_FD, -1));
	-diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
	-index b1830fd86945..ac128b651e7b 100644
	---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
	-+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
	-@@ -463,7 +463,7 @@ public final class GeckoLoader {
	- public static native boolean verifyCRCs(String apkName);
	-
	- // These methods are implemented in mozglue/android/APKOpen.cpp
	-- public static native void nativeRun(String[] args, int ipcFd, int crashFd, int crashAnnotationFd);
	-+ public static native void nativeRun(String[] args, int prefsFd, int ipcFd, int crashFd, int crashAnnotationFd);
	- private static native void loadGeckoLibsNative(String apkName);
	- private static native void loadSQLiteLibsNative(String apkName);
	- private static native void loadNSSLibsNative(String apkName);
	-diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
	-index b762e1c9a3eb..dba329ba8f92 100644
	---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
	-+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
	-@@ -169,14 +169,14 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
	-
	- @WrapForJNI
	- private static int start(final String type, final String[] args,
	-- final int ipcFd, final int crashFd,
	-- final int crashAnnotationFd) {
	-- return INSTANCE.start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ false);
	-+ final int prefsFd, final int ipcFd,
	-+ final int crashFd, final int crashAnnotationFd) {
	-+ return INSTANCE.start(type, args, prefsFd, ipcFd, crashFd, crashAnnotationFd, /* retry */ false);
	- }
	-
	-- private int start(final String type, final String[] args, final int ipcFd,
	-- final int crashFd, final int crashAnnotationFd,
	-- final boolean retry) {
	-+ private int start(final String type, final String[] args, final int prefsFd,
	-+ final int ipcFd, final int crashFd,
	-+ final int crashAnnotationFd, final boolean retry) {
	- final ChildConnection connection = getConnection(type);
	- final IChildProcess child = connection.bind();
	- if (child == null) {
	-@@ -184,10 +184,12 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
	- }
	-
	- final Bundle extras = GeckoThread.getActiveExtras();
	-+ final ParcelFileDescriptor prefsPfd;
	- final ParcelFileDescriptor ipcPfd;
	- final ParcelFileDescriptor crashPfd;
	- final ParcelFileDescriptor crashAnnotationPfd;
	- try {
	-+ prefsPfd = ParcelFileDescriptor.fromFd(prefsFd);
	- ipcPfd = ParcelFileDescriptor.fromFd(ipcFd);
	- crashPfd = (crashFd >= 0) ? ParcelFileDescriptor.fromFd(crashFd) : null;
	- crashAnnotationPfd = (crashAnnotationFd >= 0) ? ParcelFileDescriptor.fromFd(crashAnnotationFd) : null;
	-@@ -198,7 +200,8 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
	-
	- boolean started = false;
	- try {
	-- started = child.start(this, args, extras, ipcPfd, crashPfd, crashAnnotationPfd);
	-+ started = child.start(this, args, extras, prefsPfd, ipcPfd, crashPfd,
	-+ crashAnnotationPfd);
	- } catch (final RemoteException e) {
	- }
	-
	-@@ -209,7 +212,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
	- }
	- Log.w(LOGTAG, "Attempting to kill running child " + type);
	- connection.unbind();
	-- return start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ true);
	-+ return start(type, args, prefsFd, ipcFd, crashFd, crashAnnotationFd, /* retry */ true);
	- }
	-
	- try {
	-diff --git mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
	-index f1f6ce109fda..6dc19813fc10 100644
	---- mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
	-+++ mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
	-@@ -63,6 +63,7 @@ public class GeckoServiceChildProcess extends Service {
	- public boolean start(final IProcessManager procMan,
	- final String[] args,
	- final Bundle extras,
	-+ final ParcelFileDescriptor prefsPfd,
	- final ParcelFileDescriptor ipcPfd,
	- final ParcelFileDescriptor crashReporterPfd,
	- final ParcelFileDescriptor crashAnnotationPfd) {
	-@@ -74,6 +75,7 @@ public class GeckoServiceChildProcess extends Service {
	- sProcessManager = procMan;
	- }
	-
	-+ final int prefsFd = prefsPfd.detachFd();
	- final int ipcFd = ipcPfd.detachFd();
	- final int crashReporterFd = crashReporterPfd != null ?
	- crashReporterPfd.detachFd() : -1;
	-@@ -83,7 +85,7 @@ public class GeckoServiceChildProcess extends Service {
	- ThreadUtils.postToUiThread(new Runnable() {
	- @Override
	- public void run() {
	-- if (GeckoThread.initChildProcess(args, extras, ipcFd, crashReporterFd,
	-+ if (GeckoThread.initChildProcess(args, extras, prefsFd, ipcFd, crashReporterFd,
	- crashAnnotationFd)) {
	- GeckoThread.launch();
	- }
	-diff --git modules/libpref/Preferences.cpp modules/libpref/Preferences.cpp
	-index 330ed4a09b54..b884591c9271 100644
	---- modules/libpref/Preferences.cpp
	-+++ modules/libpref/Preferences.cpp
	-@@ -2920,7 +2920,7 @@ public:
	-
	- } // namespace
	-
	--// A list of prefs sent early from the parent, via the command line.
	-+// A list of prefs sent early from the parent, via shared memory.
	- static InfallibleTArray<dom::Pref>* gEarlyDomPrefs;
	-
	- /* static */ already_AddRefed<Preferences>
	-@@ -3081,11 +3081,130 @@ NS_IMPL_ISUPPORTS(Preferences,
	- nsISupportsWeakReference)
	-
	- /* static */ void
	--Preferences::SetEarlyPreferences(const nsTArray<dom::Pref>* aDomPrefs)
	-+Preferences::SerializeEarlyPreferences(nsCString& aStr)
	-+{
	-+ MOZ_RELEASE_ASSERT(InitStaticMembers());
	-+
	-+ nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs;
	-+ size_t numEarlyPrefs;
	-+ dom::ContentPrefs::GetEarlyPrefs(&numEarlyPrefs);
	-+
	-+ for (unsigned int i = 0; i < numEarlyPrefs; i++) {
	-+ const char* prefName = dom::ContentPrefs::GetEarlyPref(i);
	-+ MOZ_ASSERT_IF(i > 0,
	-+ strcmp(prefName, dom::ContentPrefs::GetEarlyPref(i - 1)) > 0);
	-+
	-+ Pref* pref = pref_HashTableLookup(prefName);
	-+ if (!pref \|\| !pref->MustSendToContentProcesses()) {
	-+ continue;
	-+ }
	-+
	-+ switch (pref->Type()) {
	-+ case PrefType::Bool:
	-+ boolPrefs.Append(
	-+ nsPrintfCString("%u:%d\|", i, Preferences::GetBool(prefName)));
	-+ break;
	-+ case PrefType::Int:
	-+ intPrefs.Append(
	-+ nsPrintfCString("%u:%d\|", i, Preferences::GetInt(prefName)));
	-+ break;
	-+ case PrefType::String: {
	-+ nsAutoCString value;
	-+ Preferences::GetCString(prefName, value);
	-+ stringPrefs.Append(
	-+ nsPrintfCString("%u:%d;%s\|", i, value.Length(), value.get()));
	-+ } break;
	-+ case PrefType::None:
	-+ break;
	-+ default:
	-+ printf_stderr("preference type: %d\n", int(pref->Type()));
	-+ MOZ_CRASH();
	-+ }
	-+ }
	-+
	-+ aStr.Truncate();
	-+ aStr.Append(boolPrefs);
	-+ aStr.Append('\n');
	-+ aStr.Append(intPrefs);
	-+ aStr.Append('\n');
	-+ aStr.Append(stringPrefs);
	-+ aStr.Append('\n');
	-+ aStr.Append('\0');
	-+}
	-+
	-+/* static */ void
	-+Preferences::DeserializeEarlyPreferences(char* aStr, size_t aStrLen)
	- {
	- MOZ_ASSERT(!XRE_IsParentProcess());
	-
	-- gEarlyDomPrefs = new InfallibleTArray<dom::Pref>(mozilla::Move(*aDomPrefs));
	-+ MOZ_ASSERT(!gEarlyDomPrefs);
	-+ gEarlyDomPrefs = new InfallibleTArray<dom::Pref>();
	-+
	-+ char* p = aStr;
	-+
	-+ // XXX: we assume these pref values are default values, which may not be
	-+ // true. We also assume they are unlocked. Fortunately, these prefs get reset
	-+ // properly by the first IPC message.
	-+
	-+ // Get the bool prefs.
	-+ while (*p != '\n') {
	-+ int32_t index = strtol(p, &p, 10);
	-+ MOZ_ASSERT(p[0] == ':');
	-+ p++;
	-+ int v = strtol(p, &p, 10);
	-+ MOZ_ASSERT(v == 0 \|\| v == 1);
	-+ dom::MaybePrefValue value(dom::PrefValue(!!v));
	-+ MOZ_ASSERT(p[0] == '\|');
	-+ p++;
	-+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-+ /* isLocked */ false,
	-+ value,
	-+ dom::MaybePrefValue());
	-+ gEarlyDomPrefs->AppendElement(pref);
	-+ }
	-+ p++;
	-+
	-+ // Get the int prefs.
	-+ while (*p != '\n') {
	-+ int32_t index = strtol(p, &p, 10);
	-+ MOZ_ASSERT(p[0] == ':');
	-+ p++;
	-+ dom::MaybePrefValue value(
	-+ dom::PrefValue(static_cast<int32_t>(strtol(p, &p, 10))));
	-+ MOZ_ASSERT(p[0] == '\|');
	-+ p++;
	-+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-+ /* isLocked */ false,
	-+ value,
	-+ dom::MaybePrefValue());
	-+ gEarlyDomPrefs->AppendElement(pref);
	-+ }
	-+ p++;
	-+
	-+ // Get the string prefs.
	-+ while (*p != '\n') {
	-+ int32_t index = strtol(p, &p, 10);
	-+ MOZ_ASSERT(p[0] == ':');
	-+ p++;
	-+ int32_t length = strtol(p, &p, 10);
	-+ MOZ_ASSERT(p[0] == ';');
	-+ p++;
	-+ dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length)));
	-+ dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-+ /* isLocked */ false,
	-+ value,
	-+ dom::MaybePrefValue());
	-+ gEarlyDomPrefs->AppendElement(pref);
	-+ p += length + 1;
	-+ MOZ_ASSERT(*(p - 1) == '\|');
	-+ }
	-+ p++;
	-+
	-+ MOZ_ASSERT(*p == '\0');
	-+
	-+ // We finished parsing on a '\0'. That should be the last char in the shared
	-+ // memory.
	-+ MOZ_ASSERT(aStr + aStrLen - 1 == p);
	-
	- #ifdef DEBUG
	- MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet);
	-@@ -4298,15 +4417,6 @@ Preferences::HasUserValue(const char* aPrefName)
	- return pref && pref->HasUserValue();
	- }
	-
	--/* static */ bool
	--Preferences::MustSendToContentProcesses(const char* aPrefName)
	--{
	-- NS_ENSURE_TRUE(InitStaticMembers(), false);
	--
	-- Pref* pref = pref_HashTableLookup(aPrefName);
	-- return pref && pref->MustSendToContentProcesses();
	--}
	--
	- /* static */ int32_t
	- Preferences::GetType(const char* aPrefName)
	- {
	-diff --git modules/libpref/Preferences.h modules/libpref/Preferences.h
	-index 1cb825ecbfe5..c149db62b525 100644
	---- modules/libpref/Preferences.h
	-+++ modules/libpref/Preferences.h
	-@@ -41,6 +41,11 @@ class PrefValue;
	-
	- struct PrefsSizes;
	-
	-+#ifdef XP_UNIX
	-+// XXX: bug 1440207 is about improving how fixed fds such as this are used.
	-+static const int kPrefsFileDescriptor = 8;
	-+#endif
	-+
	- // Keep this in sync with PrefType in parser/src/lib.rs.
	- enum class PrefValueKind : uint8_t
	- {
	-@@ -230,9 +235,6 @@ public:
	- // Whether the pref has a user value or not.
	- static bool HasUserValue(const char* aPref);
	-
	-- // Must the pref be sent to content processes when they start?
	-- static bool MustSendToContentProcesses(const char* aPref);
	--
	- // Adds/Removes the observer for the root pref branch. See nsIPrefBranch.idl
	- // for details.
	- static nsresult AddStrongObserver(nsIObserver* aObserver, const char* aPref);
	-@@ -328,11 +330,12 @@ public:
	-
	- // When a content process is created these methods are used to pass prefs in
	- // bulk from the parent process. "Early" preferences are ones that are needed
	-- // very early on in the content process's lifetime; they are passed via the
	-- // command line. "Late" preferences are the remainder, which are passed via
	-- // IPC message.
	-+ // very early on in the content process's lifetime; they are passed via a
	-+ // special shared memory segment. "Late" preferences are the remainder, which
	-+ // are passed via a standard IPC message.
	-+ static void SerializeEarlyPreferences(nsCString& aStr);
	-+ static void DeserializeEarlyPreferences(char* aStr, size_t aStrLen);
	- static void GetPreferences(InfallibleTArray<dom::Pref>* aSettings);
	-- static void SetEarlyPreferences(const nsTArray<dom::Pref>* aSettings);
	- static void SetLatePreferences(const nsTArray<dom::Pref>* aSettings);
	-
	- // When a single pref is changed in the parent process, these methods are
	-diff --git mozglue/android/APKOpen.cpp mozglue/android/APKOpen.cpp
	-index 5f1ef55b605e..b57192488725 100644
	---- mozglue/android/APKOpen.cpp
	-+++ mozglue/android/APKOpen.cpp
	-@@ -392,7 +392,7 @@ FreeArgv(char** argv, int argc)
	- }
	-
	- extern "C" APKOPEN_EXPORT void MOZ_JNICALL
	--Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv *jenv, jclass jc, jobjectArray jargs, int ipcFd, int crashFd, int crashAnnotationFd)
	-+Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv *jenv, jclass jc, jobjectArray jargs, int prefsFd, int ipcFd, int crashFd, int crashAnnotationFd)
	- {
	- int argc = 0;
	- char** argv = CreateArgvFromObjectArray(jenv, jargs, &argc);
	-@@ -407,7 +407,7 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv *jenv, jclass jc, jo
	- gBootstrap->GeckoStart(jenv, argv, argc, sAppData);
	- ElfLoader::Singleton.ExpectShutdown(true);
	- } else {
	-- gBootstrap->XRE_SetAndroidChildFds(jenv, ipcFd, crashFd, crashAnnotationFd);
	-+ gBootstrap->XRE_SetAndroidChildFds(jenv, prefsFd, ipcFd, crashFd, crashAnnotationFd);
	- gBootstrap->XRE_SetProcessType(argv[argc - 1]);
	-
	- XREChildData childData;
	-diff --git toolkit/xre/Bootstrap.cpp toolkit/xre/Bootstrap.cpp
	-index 5688519822a9..7e857969a4fb 100644
	---- toolkit/xre/Bootstrap.cpp
	-+++ toolkit/xre/Bootstrap.cpp
	-@@ -78,8 +78,8 @@ public:
	- ::GeckoStart(aEnv, argv, argc, aAppData);
	- }
	-
	-- virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd, int aCrashAnnotationFd) override {
	-- ::XRE_SetAndroidChildFds(aEnv, aIPCFd, aCrashFd, aCrashAnnotationFd);
	-+ virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd, int aCrashFd, int aCrashAnnotationFd) override {
	-+ ::XRE_SetAndroidChildFds(aEnv, aPrefsFd, aIPCFd, aCrashFd, aCrashAnnotationFd);
	- }
	- #endif
	-
	-diff --git toolkit/xre/Bootstrap.h toolkit/xre/Bootstrap.h
	-index 686d0a38e324..77adcef80e1f 100644
	---- toolkit/xre/Bootstrap.h
	-+++ toolkit/xre/Bootstrap.h
	-@@ -113,7 +113,7 @@ public:
	- #ifdef MOZ_WIDGET_ANDROID
	- virtual void GeckoStart(JNIEnv* aEnv, char** argv, int argc, const StaticXREAppData& aAppData) = 0;
	-
	-- virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aIPCFd, int aCrashFd, int aCrashAnnotationFd) = 0;
	-+ virtual void XRE_SetAndroidChildFds(JNIEnv* aEnv, int aPrefsFd, int aIPCFd, int aCrashFd, int aCrashAnnotationFd) = 0;
	- #endif
	-
	- #ifdef LIBFUZZER
	-diff --git toolkit/xre/nsEmbedFunctions.cpp toolkit/xre/nsEmbedFunctions.cpp
	-index 53bd2bc2eb47..83184e97ba92 100644
	---- toolkit/xre/nsEmbedFunctions.cpp
	-+++ toolkit/xre/nsEmbedFunctions.cpp
	-@@ -243,9 +243,10 @@ GeckoProcessType sChildProcessType = GeckoProcessType_Default;
	-
	- #if defined(MOZ_WIDGET_ANDROID)
	- void
	--XRE_SetAndroidChildFds (JNIEnv* env, int ipcFd, int crashFd, int crashAnnotationFd)
	-+XRE_SetAndroidChildFds (JNIEnv* env, int prefsFd, int ipcFd, int crashFd, int crashAnnotationFd)
	- {
	- mozilla::jni::SetGeckoThreadEnv(env);
	-+ mozilla::dom::SetPrefsFd(prefsFd);
	- IPC::Channel::SetClientChannelFd(ipcFd);
	- CrashReporter::SetNotificationPipeForChild(crashFd);
	- CrashReporter::SetCrashAnnotationPipeForChild(crashAnnotationFd);
	-diff --git widget/android/GeneratedJNIWrappers.cpp widget/android/GeneratedJNIWrappers.cpp
	-index e3f6af0cc575..4165df59f0e8 100644
	---- widget/android/GeneratedJNIWrappers.cpp
	-+++ widget/android/GeneratedJNIWrappers.cpp
	-@@ -2355,9 +2355,9 @@ constexpr char GeckoProcessManager::GetEditableParent_t::signature[];
	- constexpr char GeckoProcessManager::Start_t::name[];
	- constexpr char GeckoProcessManager::Start_t::signature[];
	-
	--auto GeckoProcessManager::Start(mozilla::jni::String::Param a0, mozilla::jni::ObjectArray::Param a1, int32_t a2, int32_t a3, int32_t a4) -> int32_t
	-+auto GeckoProcessManager::Start(mozilla::jni::String::Param a0, mozilla::jni::ObjectArray::Param a1, int32_t a2, int32_t a3, int32_t a4, int32_t a5) -> int32_t
	- {
	-- return mozilla::jni::Method<Start_t>::Call(GeckoProcessManager::Context(), nullptr, a0, a1, a2, a3, a4);
	-+ return mozilla::jni::Method<Start_t>::Call(GeckoProcessManager::Context(), nullptr, a0, a1, a2, a3, a4, a5);
	- }
	-
	- const char GeckoServiceChildProcess::name[] =
	-diff --git widget/android/GeneratedJNIWrappers.h widget/android/GeneratedJNIWrappers.h
	-index ece79ac94a71..228affa1e550 100644
	---- widget/android/GeneratedJNIWrappers.h
	-+++ widget/android/GeneratedJNIWrappers.h
	-@@ -6696,10 +6696,11 @@ public:
	- mozilla::jni::ObjectArray::Param,
	- int32_t,
	- int32_t,
	-+ int32_t,
	- int32_t> Args;
	- static constexpr char name[] = "start";
	- static constexpr char signature[] =
	-- "(Ljava/lang/String;[Ljava/lang/String;III)I";
	-+ "(Ljava/lang/String;[Ljava/lang/String;IIII)I";
	- static const bool isStatic = true;
	- static const mozilla::jni::ExceptionMode exceptionMode =
	- mozilla::jni::ExceptionMode::ABORT;
	-@@ -6709,7 +6710,7 @@ public:
	- mozilla::jni::DispatchTarget::CURRENT;
	- };
	-
	-- static auto Start(mozilla::jni::String::Param, mozilla::jni::ObjectArray::Param, int32_t, int32_t, int32_t) -> int32_t;
	-+ static auto Start(mozilla::jni::String::Param, mozilla::jni::ObjectArray::Param, int32_t, int32_t, int32_t, int32_t) -> int32_t;
	-
	- static const mozilla::jni::CallingThread callingThread =
	- mozilla::jni::CallingThread::ANY;
	-diff --git xpcom/build/nsXULAppAPI.h xpcom/build/nsXULAppAPI.h
	-index 94f6daf864c9..d6ac10d51d76 100644
	---- xpcom/build/nsXULAppAPI.h
	-+++ xpcom/build/nsXULAppAPI.h
	-@@ -398,7 +398,7 @@ XRE_API(const char*,
	-
	- #if defined(MOZ_WIDGET_ANDROID)
	- XRE_API(void,
	-- XRE_SetAndroidChildFds, (JNIEnv* env, int ipcFd, int crashFd, int crashAnnotationFd))
	-+ XRE_SetAndroidChildFds, (JNIEnv* env, int prefsFd, int ipcFd, int crashFd, int crashAnnotationFd))
	- #endif // defined(MOZ_WIDGET_ANDROID)
	-
	- XRE_API(void,
	Index: www/firefox/files/patch-bug1442583
	===================================================================
	--- www/firefox/files/patch-bug1442583
	+++ /dev/null
	@@ -1,39 +0,0 @@
	-commit 7371a080accd
	-Author: Lars T Hansen <lhansen@mozilla.com>
	-Date: Mon Mar 5 09:55:28 2018 +0100
	-
	- Bug 1442583 - Properly initialize ARM64 icache flushing machinery. r=sstangl
	-
	- --HG--
	- extra : rebase_source : 73b5921da1fa0a19d6072e35d09bd7b528bb6bfc
	- extra : intermediate-source : 19516efbbf6750ba04e11c7099586d5be2fe818f
	- extra : source : 4316cc82d6302edf839a4af6fcb815f0ffa9f65c
	----
	- js/src/jit/ProcessExecutableMemory.cpp \| 7 +++++++
	- 1 file changed, 7 insertions(+)
	-
	-diff --git js/src/jit/ProcessExecutableMemory.cpp js/src/jit/ProcessExecutableMemory.cpp
	-index e763a9d68dc17..8a6d50b6a7845 100644
	---- js/src/jit/ProcessExecutableMemory.cpp
	-+++ js/src/jit/ProcessExecutableMemory.cpp
	-@@ -20,6 +20,9 @@
	- #include "jsutil.h"
	-
	- #include "gc/Memory.h"
	-+#ifdef JS_CODEGEN_ARM64
	-+# include "jit/arm64/vixl/Cpu-vixl.h"
	-+#endif
	- #include "threading/LockGuard.h"
	- #include "threading/Mutex.h"
	- #include "util/Windows.h"
	-@@ -621,6 +624,10 @@ js::jit::DeallocateExecutableMemory(void* addr, size_t bytes)
	- bool
	- js::jit::InitProcessExecutableMemory()
	- {
	-+#ifdef JS_CODEGEN_ARM64
	-+ // Initialize instruction cache flushing.
	-+ vixl::CPU::SetUp();
	-+#endif
	- return execMemory.init();
	- }
	-
	Index: www/firefox/files/patch-bug1444798
	===================================================================
	--- www/firefox/files/patch-bug1444798
	+++ /dev/null
	@@ -1,45 +0,0 @@
	-commit 7871e211ec43
	-Author: sotaro <sotaro.ikeda.g@gmail.com>
	-Date: Fri Mar 16 21:03:59 2018 +0900
	-
	- Bug 1444798 - Fix ExternalImageCallback func types r=jrmuizel
	----
	- gfx/webrender_bindings/src/bindings.rs \| 11 +++++++----
	- 1 file changed, 7 insertions(+), 4 deletions(-)
	-
	-diff --git gfx/webrender_bindings/src/bindings.rs gfx/webrender_bindings/src/bindings.rs
	-index 8517d7dd33e5..cf885ee713f3 100644
	---- gfx/webrender_bindings/src/bindings.rs
	-+++ gfx/webrender_bindings/src/bindings.rs
	-@@ -312,8 +312,8 @@ struct WrExternalImage {
	- size: usize,
	- }
	-
	--type LockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage;
	--type UnlockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8);
	-+type LockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage;
	-+type UnlockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8);
	-
	- #[repr(C)]
	- pub struct WrExternalImageHandler {
	-@@ -327,7 +327,8 @@ impl ExternalImageHandler for WrExternalImageHandler {
	- id: ExternalImageId,
	- channel_index: u8)
	- -> ExternalImage {
	-- let image = (self.lock_func)(self.external_image_obj, id.into(), channel_index);
	-+
	-+ let image = unsafe { (self.lock_func)(self.external_image_obj, id.into(), channel_index) };
	- ExternalImage {
	- uv: TexelRect::new(image.u0, image.v0, image.u1, image.v1),
	- source: match image.image_type {
	-@@ -341,7 +342,9 @@ impl ExternalImageHandler for WrExternalImageHandler {
	- fn unlock(&mut self,
	- id: ExternalImageId,
	- channel_index: u8) {
	-- (self.unlock_func)(self.external_image_obj, id.into(), channel_index);
	-+ unsafe {
	-+ (self.unlock_func)(self.external_image_obj, id.into(), channel_index);
	-+ }
	- }
	- }
	-
	Index: www/firefox/files/patch-bug1445907
	===================================================================
	--- www/firefox/files/patch-bug1445907
	+++ /dev/null
	@@ -1,75 +0,0 @@
	-commit 0c6dd4a750db
	-Author: Lars T Hansen <lhansen@mozilla.com>
	-Date: Mon Mar 19 09:58:06 2018 +0100
	-
	- Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl
	----
	- js/src/irregexp/NativeRegExpMacroAssembler.cpp \| 25 ++++++++++++++++++++++++-
	- js/src/jit-test/tests/regexp/bug1445907.js \| 15 +++++++++++++++
	- 2 files changed, 39 insertions(+), 1 deletion(-)
	-
	-diff --git js/src/irregexp/NativeRegExpMacroAssembler.cpp js/src/irregexp/NativeRegExpMacroAssembler.cpp
	-index 28a4c35e75bfe..c08b005cf856b 100644
	---- js/src/irregexp/NativeRegExpMacroAssembler.cpp
	-+++ js/src/irregexp/NativeRegExpMacroAssembler.cpp
	-@@ -123,7 +123,15 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
	- masm.bind(&entry_label_);
	-
	- #ifdef JS_CODEGEN_ARM64
	-- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
	-+ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for
	-+ // addressing. The register we use for PSP may however also be used by
	-+ // calling code, and it is nonvolatile, so save it. Do this as a special
	-+ // case first because the generic save/restore code needs the PSP to be
	-+ // initialized already.
	-+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
	-+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
	-+
	-+ // Initialize the PSP from the SP.
	- masm.initStackPtr();
	- #endif
	-
	-@@ -421,7 +429,22 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
	- for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter)
	- masm.Pop(*iter);
	-
	-+#ifdef JS_CODEGEN_ARM64
	-+ // Now restore the value that was in the PSP register on entry, and return.
	-+
	-+ // Obtain the correct SP from the PSP.
	-+ masm.Mov(sp, PseudoStackPointer64);
	-+
	-+ // Restore the saved value of the PSP register, this value is whatever the
	-+ // caller had saved in it, not any actual SP value, and it must not be
	-+ // overwritten subsequently.
	-+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
	-+
	-+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
	-+ masm.Ret(vixl::lr);
	-+#else
	- masm.abiret();
	-+#endif
	-
	- // Backtrack code (branch target for conditional backtracks).
	- if (backtrack_label_.used()) {
	-diff --git js/src/jit-test/tests/regexp/bug1445907.js js/src/jit-test/tests/regexp/bug1445907.js
	-new file mode 100644
	-index 0000000000000..75b23753eaf93
	---- /dev/null
	-+++ js/src/jit-test/tests/regexp/bug1445907.js
	-@@ -0,0 +1,15 @@
	-+// On ARM64, we failed to save x28 properly when generating code for the regexp
	-+// matcher.
	-+//
	-+// There's wasm and Debugger code here because the combination forces the use of
	-+// x28 and exposes the bug when running on the simulator.
	-+
	-+if (!wasmIsSupported())
	-+ quit();
	-+
	-+var g = newGlobal('');
	-+var dbg = new Debugger(g);
	-+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`);
	-+var re = /./;
	-+dbg.onEnterFrame = function(frame) { re.exec("x") };
	-+result = g.eval("m.exports.test()");
	Index: www/firefox/files/patch-bug1447359
	===================================================================
	--- www/firefox/files/patch-bug1447359
	+++ /dev/null
	@@ -1,45 +0,0 @@
	-commit fef467b5a93d
	-Author: Luke Wagner <luke@mozilla.com>
	-Date: Thu Mar 22 10:28:13 2018 -0500
	-
	- Bug 1447359 - Baldr: add AutoForbidPools in a few missing places (r=lth)
	-
	- --HG--
	- extra : rebase_source : 75f1909deb352391529ce5e58a89e5f9cfeb3662
	----
	- js/src/jit/arm64/MacroAssembler-arm64-inl.h \| 1 +
	- js/src/jit/arm64/MacroAssembler-arm64.cpp \| 2 ++
	- 2 files changed, 3 insertions(+)
	-
	-diff --git js/src/jit/arm64/MacroAssembler-arm64-inl.h js/src/jit/arm64/MacroAssembler-arm64-inl.h
	-index 7061cbfd93ebb..190442f7afa0a 100644
	---- js/src/jit/arm64/MacroAssembler-arm64-inl.h
	-+++ js/src/jit/arm64/MacroAssembler-arm64-inl.h
	-@@ -359,6 +359,7 @@ MacroAssembler::sub32FromStackPtrWithPatch(Register dest)
	- {
	- vixl::UseScratchRegisterScope temps(this);
	- const ARMRegister scratch = temps.AcquireX();
	-+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 3);
	- CodeOffset offs = CodeOffset(currentOffset());
	- movz(scratch, 0, 0);
	- movk(scratch, 0, 16);
	-diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
	-index 7b599b7e9d610..4e8fdb6a67019 100644
	---- js/src/jit/arm64/MacroAssembler-arm64.cpp
	-+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
	-@@ -707,6 +707,7 @@ MacroAssembler::patchFarJump(CodeOffset farJump, uint32_t targetOffset)
	- CodeOffset
	- MacroAssembler::nopPatchableToCall(const wasm::CallSiteDesc& desc)
	- {
	-+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
	- CodeOffset offset(currentOffset());
	- Nop();
	- append(desc, CodeOffset(currentOffset()));
	-@@ -1077,6 +1078,7 @@ MacroAssembler::comment(const char* msg)
	- CodeOffset
	- MacroAssembler::wasmTrapInstruction()
	- {
	-+ AutoForbidPools afp(this, /* max number of instructions in scope = */ 1);
	- CodeOffset offs(currentOffset());
	- Unreachable();
	- return offs;
	Index: www/firefox/files/patch-bug1451292
	===================================================================
	--- www/firefox/files/patch-bug1451292
	+++ /dev/null
	@@ -1,33 +0,0 @@
	-commit b3a02fddbce8
	-Author: Lars T Hansen <lhansen@mozilla.com>
	-Date: Wed Apr 4 15:48:48 2018 +0200
	-
	- Bug 1451292 - Better payload for arm64 breakpoint instruction. r=sstangl
	-
	- At least some non-zero payloads confuse GDB and make it iloop on the
	- breakpoint instruction rather than break to the command line as it
	- should. There seems to be no reason not to use a zero payload.
	-
	- --HG--
	- extra : rebase_source : 6d6f9aa2911b86b02572f88948d48bc2238c6353
	- extra : amend_source : 9fed9235d481a9eadafc4a3e0075c9fef8b6050d
	----
	- js/src/jit/arm64/MacroAssembler-arm64.cpp \| 5 +++--
	- 1 file changed, 3 insertions(+), 2 deletions(-)
	-
	-diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
	-index 4ea64b1225d00..a212de0ec2f45 100644
	---- js/src/jit/arm64/MacroAssembler-arm64.cpp
	-+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
	-@@ -237,8 +237,9 @@ MacroAssemblerCompat::profilerEnterFrame(RegisterOrSP framePtr, Register scratch
	- void
	- MacroAssemblerCompat::breakpoint()
	- {
	-- static int code = 0xA77;
	-- Brk((code++) & 0xffff);
	-+ // Note, other payloads are possible, but GDB is known to misinterpret them
	-+ // sometimes and iloop on the breakpoint instead of stopping properly.
	-+ Brk(0);
	- }
	-
	- // Either `any` is valid or `sixtyfour` is valid. Return a 32-bit ARMRegister
	Index: www/firefox/files/patch-bug1456556
	===================================================================
	--- www/firefox/files/patch-bug1456556
	+++ /dev/null
	@@ -1,22 +0,0 @@
	-commit f6fc0b418aa3
	-Author: Andrea Marchesini <amarchesini@mozilla.com>
	-Date: Tue May 1 08:47:13 2018 +0200
	-
	- Bug 1456556 - FetchConsumer scope-exit RAII must grab 'self' by value, r=erahm
	----
	- dom/fetch/FetchConsumer.cpp \| 2 +-
	- 1 file changed, 1 insertion(+), 1 deletion(-)
	-
	-diff --git dom/fetch/FetchConsumer.cpp dom/fetch/FetchConsumer.cpp
	-index 134bf7f2e703a..3c3687fea1d5a 100644
	---- dom/fetch/FetchConsumer.cpp
	-+++ dom/fetch/FetchConsumer.cpp
	-@@ -582,7 +582,7 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
	- RefPtr<Promise> localPromise = mConsumePromise.forget();
	-
	- RefPtr<FetchBodyConsumer<Derived>> self = this;
	-- auto autoReleaseObject = mozilla::MakeScopeExit([&] {
	-+ auto autoReleaseObject = mozilla::MakeScopeExit([self] {
	- self->ReleaseObject();
	- });
	-
	Index: www/firefox/files/patch-bug702179
	===================================================================
	--- www/firefox/files/patch-bug702179
	+++ /dev/null
	@@ -1,12 +0,0 @@
	-Don't build static JS lib to make sure DTrace probes are picked up.
	-
	---- js/src/build/moz.build.orig 2017-04-16 18:00:50 UTC
	-+++ js/src/build/moz.build
	-@@ -71,7 +71,3 @@ if CONFIG['OS_ARCH'] == 'SunOS':
	- ]
	-
	- OS_LIBS += CONFIG['REALTIME_LIBS']
	--
	--NO_EXPAND_LIBS = True
	--
	--DIST_INSTALL = True
	Index: www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
	===================================================================
	--- www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
	+++ www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
	@@ -7,7 +7,7 @@
	@@ -7,6 +7,7 @@
	#include "FlacDecoder.h"
	#include "MediaContainerType.h"
	- #include "MediaPrefs.h"
	+ #include "mozilla/StaticPrefs.h"
	+#include "PDMFactory.h"

	namespace mozilla {
	@@ -15,10 +15,10 @@
	@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
	{
	#ifdef MOZ_FFVPX
	- return MediaPrefs::FlacEnabled();
	+ return StaticPrefs::MediaFlacEnabled();
	+#elif defined(MOZ_FFMPEG)
	+ RefPtr<PDMFactory> platform = new PDMFactory();
	-+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
	++ return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
	+ /* DecoderDoctorDiagnostics* */ nullptr);
	#else
	// Until bug 1295886 is fixed.
	Index: www/firefox/files/patch-u2f-hid-rs62
	===================================================================
	--- www/firefox/files/patch-u2f-hid-rs62
	+++ www/firefox/files/patch-u2f-hid-rs62
	@@ -4,7 +4,7 @@
	index 4bfba0eb2f52..cd4d80035d81 100644
	--- Cargo.lock
	+++ Cargo.lock
	-@@ -486,6 +486,15 @@ dependencies = [
	+@@ -552,6 +552,15 @@ dependencies = [
	"unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
	]

	@@ -13,14 +13,14 @@
	+version = "0.2.1"
	+source = "registry+https://github.com/rust-lang/crates.io-index"
	+dependencies = [
	-+ "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
	++ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
	+ "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
	+]
	+
	[[package]]
	- name = "dtoa"
	- version = "0.4.2"
	-@@ -1170,6 +1179,14 @@ name = "nom"
	+ name = "diff"
	+ version = "0.1.11"
	+@@ -1351,6 +1360,14 @@ name = "nom"
	version = "1.2.4"
	source = "registry+https://github.com/rust-lang/crates.io-index"

	@@ -35,23 +35,23 @@
	[[package]]
	name = "nserror"
	version = "0.1.0"
	-@@ -1863,6 +1880,7 @@ dependencies = [
	+@@ -2126,6 +2143,7 @@ dependencies = [
	"bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
	"boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
	"core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
	+ "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
	- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
	+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
	"libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
	- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
	-@@ -2220,6 +2238,7 @@ dependencies = [
	+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
	+@@ -2511,6 +2529,7 @@ dependencies = [
	"checksum darling_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "167dd3e235c2f1da16a635c282630452cdf49191eb05711de1bcd1d3d5068c00"
	"checksum darling_macro 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c53edaba455f6073a10c27c72440860eb3f60444f8c8660a391032eeae744d82"
	"checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
	+"checksum devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c9ac481c38baf400d3b732e4a06850dfaa491d1b6379a249d9d40d14c2434c"
	+ "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
	+ "checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a"
	"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
	- "checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"
	- "checksum dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461"
	-@@ -2279,6 +2298,7 @@ dependencies = [
	+@@ -2581,6 +2600,7 @@ dependencies = [
	"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
	"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
	"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
	@@ -73,14 +73,6 @@
	[target.'cfg(target_os = "macos")'.dependencies]
	core-foundation-sys = "0.5.1"

	-@@ -21,6 +24,6 @@ runloop = "0.1.0"
	- bitflags = "1.0"
	-
	- [dev-dependencies]
	--rust-crypto = "^0.2"
	-+sha2 = "^0.7"
	- base64 = "^0.4"
	- env_logger = "0.4.1"
	diff --git dom/webauthn/u2f-hid-rs/README.md dom/webauthn/u2f-hid-rs/README.md
	index 2edf412211b5..a29905832e5e 100644
	--- dom/webauthn/u2f-hid-rs/README.md
	@@ -94,61 +86,6 @@
	* Supported HID Transports: USB.
	* Supported Protocols: [FIDO U2F over USB](https://fidoalliance.org/specs/fido-u2f-v1.1-id-20160915/fido-u2f-raw-message-formats-v1.1-id-20160915.html).

	-diff --git dom/webauthn/u2f-hid-rs/examples/main.rs dom/webauthn/u2f-hid-rs/examples/main.rs
	-index d0b02e61a05b..8ecf102f2136 100644
	---- dom/webauthn/u2f-hid-rs/examples/main.rs
	-+++ dom/webauthn/u2f-hid-rs/examples/main.rs
	-@@ -3,10 +3,9 @@
	- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
	-
	- extern crate base64;
	--extern crate crypto;
	-+extern crate sha2;
	- extern crate u2fhid;
	--use crypto::digest::Digest;
	--use crypto::sha2::Sha256;
	-+use sha2::{Digest, Sha256};
	- use std::io;
	- use std::sync::mpsc::channel;
	- use u2fhid::{AuthenticatorTransports, KeyHandle, RegisterFlags, SignFlags, U2FManager};
	-@@ -17,10 +16,12 @@ extern crate log;
	- macro_rules! try_or {
	- ($val:expr, $or:expr) => {
	- match $val {
	-- Ok(v) => { v }
	-- Err(e) => { return $or(e); }
	-+ Ok(v) => v,
	-+ Err(e) => {
	-+ return $or(e);
	-+ }
	- }
	-- }
	-+ };
	- }
	-
	- fn u2f_get_key_handle_from_register_response(register_response: &Vec<u8>) -> io::Result<Vec<u8>> {
	-@@ -46,15 +47,13 @@ fn main() {
	- let challenge_str = format!("{}{}",
	- r#"{"challenge": "1vQ9mxionq0ngCnjD-wTsv1zUSrGRtFqG2xP09SbZ70","#,
	- r#" "version": "U2F_V2", "appId": "http://demo.yubico.com"}"#);
	-- let mut challenge = Sha256::new();
	-- challenge.input_str(&challenge_str);
	-- let mut chall_bytes: Vec<u8> = vec![0; challenge.output_bytes()];
	-- challenge.result(&mut chall_bytes);
	-+ let mut challenge = Sha256::default();
	-+ challenge.input(challenge_str.as_bytes());
	-+ let chall_bytes = Vec::from(challenge.result().as_slice());
	-
	-- let mut application = Sha256::new();
	-- application.input_str("http://demo.yubico.com");
	-- let mut app_bytes: Vec<u8> = vec![0; application.output_bytes()];
	-- application.result(&mut app_bytes);
	-+ let mut application = Sha256::default();
	-+ application.input("http://demo.yubico.com".as_bytes());
	-+ let app_bytes = Vec::from(application.result().as_slice());
	-
	- let manager = U2FManager::new().unwrap();
	- let flags = RegisterFlags::empty();
	diff --git dom/webauthn/u2f-hid-rs/src/freebsd/device.rs dom/webauthn/u2f-hid-rs/src/freebsd/device.rs
	new file mode 100644
	index 000000000000..5b9e7f2a912e
	@@ -756,42 +693,6 @@
	#[path = "stub/mod.rs"]
	pub mod platform;

	-@@ -39,8 +51,8 @@ extern crate bitflags;
	-
	- mod consts;
	- mod statemachine;
	--mod u2ftypes;
	- mod u2fprotocol;
	-+mod u2ftypes;
	-
	- mod manager;
	- pub use manager::U2FManager;
	-@@ -88,9 +100,9 @@ pub enum Error {
	- NotAllowed = 5,
	- }
	-
	-+#[cfg(fuzzing)]
	-+pub use consts::*;
	- #[cfg(fuzzing)]
	- pub use u2fprotocol::*;
	- #[cfg(fuzzing)]
	- pub use u2ftypes::*;
	--#[cfg(fuzzing)]
	--pub use consts::*;
	-diff --git dom/webauthn/u2f-hid-rs/src/linux/device.rs dom/webauthn/u2f-hid-rs/src/linux/device.rs
	-index 6ed57106920f..35569f88a190 100644
	---- dom/webauthn/u2f-hid-rs/src/linux/device.rs
	-+++ dom/webauthn/u2f-hid-rs/src/linux/device.rs
	-@@ -11,8 +11,8 @@ use std::os::unix::prelude::*;
	-
	- use consts::CID_BROADCAST;
	- use platform::hidraw;
	--use util::from_unix_result;
	- use u2ftypes::U2FDevice;
	-+use util::from_unix_result;
	-
	- #[derive(Debug)]
	- pub struct Device {
	diff --git dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs
	index 0ce5d379c3f7..182fe0ec5f2e 100644
	--- dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs
	@@ -821,7 +722,7 @@
	const NRBITS: u32 = 8;
	const TYPEBITS: u32 = 8;

	-@@ -35,28 +29,15 @@ const TYPESHIFT: u32 = NRSHIFT + NRBITS as u32;
	+@@ -35,17 +29,6 @@ const TYPESHIFT: u32 = NRSHIFT + NRBITS as u32;
	const SIZESHIFT: u32 = TYPESHIFT + TYPEBITS as u32;
	const DIRSHIFT: u32 = SIZESHIFT + SIZEBITS as u32;

	@@ -839,27 +740,7 @@
	// https://github.com/torvalds/linux/blob/master/include/uapi/linux/hid.h
	const HID_MAX_DESCRIPTOR_SIZE: usize = 4096;

	- macro_rules! ioctl {
	-- ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => (
	-+ ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => {
	- pub unsafe fn $name(fd: libc::c_int, val: *mut $ty) -> io::Result<libc::c_int> {
	- let size = mem::size_of::<$ty>();
	-- let ioc = (($dir as u32) << DIRSHIFT) \|
	-- (($ioty as u32) << TYPESHIFT) \|
	-- (($nr as u32) << NRSHIFT) \|
	-- ((size as u32) << SIZESHIFT);
	-+ let ioc = (($dir as u32) << DIRSHIFT) \| (($ioty as u32) << TYPESHIFT)
	-+ \| (($nr as u32) << NRSHIFT) \| ((size as u32) << SIZESHIFT);
	-
	- #[cfg(not(target_env = "musl"))]
	- type IocType = libc::c_ulong;
	-@@ -65,120 +46,12 @@ macro_rules! ioctl {
	-
	- from_unix_result(libc::ioctl(fd, ioc as IocType, val))
	- }
	-- );
	-+ };
	- }
	+@@ -68,115 +51,7 @@ macro_rules! ioctl {

	// https://github.com/torvalds/linux/blob/master/include/uapi/linux/hidraw.h
	ioctl!(READ, hidiocgrdescsize, b'H', 0x01; ::libc::c_int);
	@@ -1013,126 +894,10 @@
	+ value.truncate(desc.size as usize);
	+ Ok(ReportDescriptor { value })
	}
	-diff --git dom/webauthn/u2f-hid-rs/src/linux/monitor.rs dom/webauthn/u2f-hid-rs/src/linux/monitor.rs
	-index 47c376ba9176..408ea4b7b9ad 100644
	---- dom/webauthn/u2f-hid-rs/src/linux/monitor.rs
	-+++ dom/webauthn/u2f-hid-rs/src/linux/monitor.rs
	-@@ -65,13 +65,11 @@ where
	-
	- // Start listening for new devices.
	- let mut socket = monitor.listen()?;
	-- let mut fds = vec![
	-- ::libc::pollfd {
	-- fd: socket.as_raw_fd(),
	-- events: POLLIN,
	-- revents: 0,
	-- },
	-- ];
	-+ let mut fds = vec![::libc::pollfd {
	-+ fd: socket.as_raw_fd(),
	-+ events: POLLIN,
	-+ revents: 0,
	-+ }];
	-
	- while alive() {
	- // Wait for new events, break on failure.
	-diff --git dom/webauthn/u2f-hid-rs/src/macos/iokit.rs dom/webauthn/u2f-hid-rs/src/macos/iokit.rs
	-index 7e550af2a445..79e53599004e 100644
	---- dom/webauthn/u2f-hid-rs/src/macos/iokit.rs
	-+++ dom/webauthn/u2f-hid-rs/src/macos/iokit.rs
	-@@ -282,13 +282,13 @@ extern "C" {
	-
	- #[cfg(test)]
	- mod tests {
	-+ use super::*;
	- use core_foundation_sys::base::*;
	- use core_foundation_sys::runloop::*;
	- use libc::c_void;
	- use std::ptr;
	- use std::sync::mpsc::{channel, Sender};
	- use std::thread;
	-- use super::*;
	-
	- extern "C" fn observe(_: CFRunLoopObserverRef, _: CFRunLoopActivity, context: *mut c_void) {
	- let tx: &Sender<SendableRunLoop> = unsafe { &(context as mut _) };
	-diff --git dom/webauthn/u2f-hid-rs/src/macos/monitor.rs dom/webauthn/u2f-hid-rs/src/macos/monitor.rs
	-index c346fe5eff57..b971ed885d18 100644
	---- dom/webauthn/u2f-hid-rs/src/macos/monitor.rs
	-+++ dom/webauthn/u2f-hid-rs/src/macos/monitor.rs
	-@@ -10,9 +10,9 @@ use core_foundation_sys::runloop::*;
	- use libc::c_void;
	- use platform::iokit::*;
	- use runloop::RunLoop;
	--use std::{io, slice};
	- use std::collections::HashMap;
	- use std::sync::mpsc::{channel, Receiver, Sender};
	-+use std::{io, slice};
	- use util::io_err;
	-
	- struct DeviceData {
	-diff --git dom/webauthn/u2f-hid-rs/src/manager.rs dom/webauthn/u2f-hid-rs/src/manager.rs
	-index c9f92bdbfad5..ca8b80a9584a 100644
	---- dom/webauthn/u2f-hid-rs/src/manager.rs
	-+++ dom/webauthn/u2f-hid-rs/src/manager.rs
	-@@ -7,8 +7,8 @@ use std::sync::mpsc::{channel, RecvTimeoutError, Sender};
	- use std::time::Duration;
	-
	- use consts::PARAMETER_SIZE;
	--use statemachine::StateMachine;
	- use runloop::RunLoop;
	-+use statemachine::StateMachine;
	- use util::OnceCallback;
	-
	- enum QueueAction {
	-diff --git dom/webauthn/u2f-hid-rs/src/statemachine.rs dom/webauthn/u2f-hid-rs/src/statemachine.rs
	-index 8e4abaa7cf02..55e7d36155a3 100644
	---- dom/webauthn/u2f-hid-rs/src/statemachine.rs
	-+++ dom/webauthn/u2f-hid-rs/src/statemachine.rs
	-@@ -7,8 +7,8 @@ use platform::device::Device;
	- use platform::transaction::Transaction;
	- use std::thread;
	- use std::time::Duration;
	--use util::OnceCallback;
	- use u2fprotocol::{u2f_init_device, u2f_is_keyhandle_valid, u2f_register, u2f_sign};
	-+use util::OnceCallback;
	-
	- fn is_valid_transport(transports: ::AuthenticatorTransports) -> bool {
	- transports.is_empty() \|\| transports.contains(::AuthenticatorTransports::USB)
	-diff --git dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs
	-index 4d6737b1289e..0b984407d873 100644
	---- dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs
	-+++ dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs
	-@@ -5,9 +5,9 @@
	- extern crate std;
	-
	- use rand::{thread_rng, Rng};
	-+use std::ffi::CString;
	- use std::io;
	- use std::io::{Read, Write};
	--use std::ffi::CString;
	-
	- use consts::*;
	- use u2ftypes::*;
	diff --git dom/webauthn/u2f-hid-rs/src/util.rs dom/webauthn/u2f-hid-rs/src/util.rs
	index 27db864e2fcd..770e166d57d2 100644
	--- dom/webauthn/u2f-hid-rs/src/util.rs
	+++ dom/webauthn/u2f-hid-rs/src/util.rs
	-@@ -12,10 +12,12 @@ use boxfnonce::SendBoxFnOnce;
	- macro_rules! try_or {
	- ($val:expr, $or:expr) => {
	- match $val {
	-- Ok(v) => { v }
	-- Err(e) => { return $or(e); }
	-+ Ok(v) => v,
	-+ Err(e) => {
	-+ return $or(e);
	-+ }
	- }
	-- }
	-+ };
	- }
	-
	- pub trait Signed {
	@@ -44,6 +46,16 @@ pub fn from_unix_result<T: Signed>(rv: T) -> io::Result<T> {
	}
	}
	@@ -1150,33 +915,6 @@
	pub fn io_err(msg: &str) -> io::Error {
	io::Error::new(io::ErrorKind::Other, msg)
	}
	-diff --git dom/webauthn/u2f-hid-rs/src/windows/device.rs dom/webauthn/u2f-hid-rs/src/windows/device.rs
	-index cbbe2811d672..5579cc052a6f 100644
	---- dom/webauthn/u2f-hid-rs/src/windows/device.rs
	-+++ dom/webauthn/u2f-hid-rs/src/windows/device.rs
	-@@ -7,8 +7,8 @@ use std::io;
	- use std::io::{Read, Write};
	- use std::os::windows::io::AsRawHandle;
	-
	--use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE};
	- use super::winapi::DeviceCapabilities;
	-+use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE};
	-
	- use u2ftypes::U2FDevice;
	-
	-diff --git dom/webauthn/u2f-hid-rs/src/windows/winapi.rs dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
	-index 18c6898e86ee..bd8a7e58d06a 100644
	---- dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
	-+++ dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
	-@@ -60,7 +60,7 @@ extern "stdcall" {
	- macro_rules! offset_of {
	- ($ty:ty, $field:ident) => {
	- unsafe { &((0 as const $ty)).$field as *const _ as usize }
	-- }
	-+ };
	- }
	-
	- fn from_wide_ptr(ptr: *const u16, len: usize) -> String {
	diff --git third_party/rust/devd-rs/.cargo-checksum.json third_party/rust/devd-rs/.cargo-checksum.json
	new file mode 100644
	index 000000000000..7f8c6af3141e
	Index: www/firefox/files/patch-z-bug1436911
	===================================================================
	--- www/firefox/files/patch-z-bug1436911
	+++ /dev/null
	@@ -1,1162 +0,0 @@
	-commit 6b81d0b99f20
	-Author: Nicholas Nethercote <nnethercote@mozilla.com>
	-Date: Thu Mar 8 15:47:24 2018 +1100
	-
	- Bug 1436911 - Avoid the early/late prefs split. r=glandium
	-
	- All prefs that need to be sent to a new content process are now put into the
	- shared memory segment, and they are identified by the pref name instead of an
	- index into a list. The old IPC used at process startup (in XPCOMInitData) is
	- removed.
	-
	- Benefits:
	-
	- - It removes the need for the early prefs list
	- (dom/ipc/ContentProcesses.{h,cpp}) and the associated checking, which is ugly
	- and often trips people up (e.g. bug 1432979, bug 1439406).
	-
	- - Using prefnames instead of indices fixes some fragility (fixing bug 1419432).
	-
	- - It fixes the problem of early prefs being installed as unlocked default
	- values even if they are locked and/or have user values.
	-
	- MozReview-Commit-ID: FRIzHF8Tjd
	----
	- dom/ipc/ContentChild.cpp \| 2 -
	- dom/ipc/ContentParent.cpp \| 4 +-
	- dom/ipc/ContentPrefs.cpp \| 357 ------------------------------
	- dom/ipc/ContentPrefs.h \| 27 ---
	- dom/ipc/ContentProcess.cpp \| 5 +-
	- dom/ipc/PContent.ipdl \| 7 +-
	- dom/ipc/moz.build \| 2 -
	- layout/style/nsCSSProps.h \| 2 +-
	- modules/libpref/Preferences.cpp \| 470 ++++++++++++++++++++++------------------
	- modules/libpref/Preferences.h \| 15 +-
	- 10 files changed, 278 insertions(+), 613 deletions(-)
	-
	-diff --git dom/ipc/ContentChild.cpp dom/ipc/ContentChild.cpp
	-index f61ab07b81e2..af1ef9cf4c7e 100644
	---- dom/ipc/ContentChild.cpp
	-+++ dom/ipc/ContentChild.cpp
	-@@ -1185,8 +1185,6 @@ void
	- ContentChild::InitXPCOM(const XPCOMInitData& aXPCOMInit,
	- const mozilla::dom::ipc::StructuredCloneData& aInitialData)
	- {
	-- Preferences::SetLatePreferences(&aXPCOMInit.prefs());
	--
	- // Do this as early as possible to get the parent process to initialize the
	- // background thread since we'll likely need database information very soon.
	- BackgroundChild::Startup();
	-diff --git dom/ipc/ContentParent.cpp dom/ipc/ContentParent.cpp
	-index 208bb47a970b..4ce5c6bf23d5 100644
	---- dom/ipc/ContentParent.cpp
	-+++ dom/ipc/ContentParent.cpp
	-@@ -197,7 +197,6 @@
	-
	- #include "nsLayoutStylesheetCache.h"
	-
	--#include "ContentPrefs.h"
	- #include "mozilla/Sprintf.h"
	-
	- #ifdef MOZ_WEBRTC
	-@@ -2009,7 +2008,7 @@ ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PR
	-
	- // Serialize the early prefs.
	- nsAutoCStringN<1024> prefs;
	-- Preferences::SerializeEarlyPreferences(prefs);
	-+ Preferences::SerializePreferences(prefs);
	-
	- // Set up the shared memory.
	- base::SharedMemory shm;
	-@@ -2228,7 +2227,6 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority)
	-
	- XPCOMInitData xpcomInit;
	-
	-- Preferences::GetPreferences(&xpcomInit.prefs());
	- nsCOMPtr<nsIIOService> io(do_GetIOService());
	- MOZ_ASSERT(io, "No IO service?");
	- DebugOnly<nsresult> rv = io->GetOffline(&xpcomInit.isOffline());
	-diff --git dom/ipc/ContentPrefs.cpp dom/ipc/ContentPrefs.cpp
	-deleted file mode 100644
	-index 808b797d9bee..000000000000
	---- dom/ipc/ContentPrefs.cpp
	-+++ /dev/null
	-@@ -1,360 +0,0 @@
	--/* -- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -- */
	--/* vim: set ts=8 sts=2 et sw=2 tw=80: */
	--/* 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/. */
	--
	--#include "ContentPrefs.h"
	--
	--/******************************************************************************
	-- *
	-- * DO NOT ADD PREFS TO THIS LIST WITHOUT DOM PEER REVIEW
	-- *
	-- * This is the list of preferences that are sent to the content process on
	-- * startup. Only prefs that are required immediately upon startup should be
	-- * listed here. The first IPC message received in the content process will
	-- * contain all the other prefs. Prefs should only be listed here if they must be
	-- * read before the first IPC message is received.
	-- *
	-- ******************************************************************************/
	--
	--const char* mozilla::dom::ContentPrefs::gEarlyPrefs[] = {
	-- "accessibility.monoaudio.enable",
	-- "accessibility.mouse_focuses_formcontrol",
	-- "accessibility.tabfocus_applies_to_xul",
	-- "app.update.channel",
	-- "browser.autofocus",
	-- "browser.dom.window.dump.enabled",
	-- "browser.sessionhistory.max_entries",
	-- "browser.sessionhistory.max_total_viewers",
	--#if defined(NIGHTLY_BUILD) \|\| defined(DEBUG)
	-- "browser.startup.record",
	--#endif
	--#if defined(ANDROID)
	-- "consoleservice.logcat",
	--#endif
	-- "content.cors.disable",
	-- "content.cors.no_private_data",
	-- "content.notify.backoffcount",
	-- "content.notify.interval",
	-- "content.notify.ontimer",
	-- "content.sink.enable_perf_mode",
	-- "content.sink.event_probe_rate",
	-- "content.sink.initial_perf_time",
	-- "content.sink.interactive_deflect_count",
	-- "content.sink.interactive_parse_time",
	-- "content.sink.interactive_time",
	-- "content.sink.pending_event_mode",
	-- "content.sink.perf_deflect_count",
	-- "content.sink.perf_parse_time",
	-- "device.storage.prompt.testing",
	-- "device.storage.writable.name",
	-- "devtools.enabled",
	-- "dom.allow_XUL_XBL_for_file",
	-- "dom.allow_cut_copy",
	-- "dom.animations-api.core.enabled",
	-- "dom.animations-api.element-animate.enabled",
	-- "dom.animations-api.pending-member.enabled",
	-- "dom.enable_frame_timing",
	-- "dom.enable_performance",
	-- "dom.enable_performance_navigation_timing",
	-- "dom.enable_resource_timing",
	-- "dom.event.handling-user-input-time-limit",
	-- "dom.event.touch.coalescing.enabled",
	-- "dom.forms.autocomplete.formautofill",
	-- "dom.forms.inputmode",
	-- "dom.input.skip_cursor_move_for_same_value_set",
	-- "dom.ipc.processPriorityManager.backgroundGracePeriodMS",
	-- "dom.ipc.processPriorityManager.backgroundPerceivableGracePeriodMS",
	-- "dom.ipc.useNativeEventProcessing.content",
	-- "dom.max_chrome_script_run_time",
	-- "dom.max_ext_content_script_run_time",
	-- "dom.max_script_run_time",
	-- "dom.mozBrowserFramesEnabled",
	-- "dom.performance.enable_notify_performance_timing",
	-- "dom.performance.enable_user_timing_logging",
	-- "dom.placeholder.show_on_focus",
	-- "dom.requestIdleCallback.enabled",
	-- "dom.script_loader.bytecode_cache.enabled",
	-- "dom.script_loader.bytecode_cache.strategy",
	-- "dom.storage.testing",
	-- "dom.url.encode_decode_hash",
	-- "dom.url.getters_decode_hash",
	-- "dom.use_watchdog",
	-- "dom.vibrator.enabled",
	-- "dom.vibrator.max_vibrate_list_len",
	-- "dom.vibrator.max_vibrate_ms",
	-- "dom.webcomponents.customelements.enabled",
	-- "dom.webcomponents.shadowdom.enabled",
	-- "focusmanager.testmode",
	-- "font.size.inflation.disabledInMasterProcess",
	-- "font.size.inflation.emPerLine",
	-- "font.size.inflation.forceEnabled",
	-- "font.size.inflation.lineThreshold",
	-- "font.size.inflation.mappingIntercept",
	-- "font.size.inflation.maxRatio",
	-- "font.size.inflation.minTwips",
	-- "font.size.systemFontScale",
	-- "full-screen-api.allow-trusted-requests-only",
	-- "full-screen-api.enabled",
	-- "full-screen-api.unprefix.enabled",
	--#ifdef FUZZING
	-- "fuzzing.enabled",
	--#endif
	-- "gfx.font_rendering.opentype_svg.enabled",
	-- "hangmonitor.timeout",
	-- "html5.flushtimer.initialdelay",
	-- "html5.flushtimer.subsequentdelay",
	-- "html5.offmainthread",
	-- "intl.charset.fallback.tld",
	-- "intl.charset.fallback.utf8_for_file",
	-- "intl.ime.hack.on_ime_unaware_apps.fire_key_events_for_composition",
	-- "javascript.enabled",
	-- "javascript.options.array_prototype_values",
	-- "javascript.options.asmjs",
	-- "javascript.options.asyncstack",
	-- "javascript.options.baselinejit",
	-- "javascript.options.baselinejit.threshold",
	-- "javascript.options.baselinejit.unsafe_eager_compilation",
	-- "javascript.options.discardSystemSource",
	-- "javascript.options.dump_stack_on_debuggee_would_run",
	-- "javascript.options.gczeal",
	-- "javascript.options.gczeal.frequency",
	-- "javascript.options.ion",
	-- "javascript.options.ion.offthread_compilation",
	-- "javascript.options.ion.threshold",
	-- "javascript.options.ion.unsafe_eager_compilation",
	-- "javascript.options.jit.full_debug_checks",
	-- "javascript.options.native_regexp",
	-- "javascript.options.parallel_parsing",
	-- "javascript.options.shared_memory",
	-- "javascript.options.spectre.index_masking",
	-- "javascript.options.spectre.jit_to_C++_calls",
	-- "javascript.options.spectre.object_mitigations.barriers",
	-- "javascript.options.spectre.object_mitigations.misc",
	-- "javascript.options.spectre.string_mitigations",
	-- "javascript.options.spectre.value_masking",
	-- "javascript.options.streams",
	-- "javascript.options.strict",
	-- "javascript.options.strict.debug",
	-- "javascript.options.throw_on_asmjs_validation_failure",
	-- "javascript.options.throw_on_debuggee_would_run",
	-- "javascript.options.wasm",
	-- "javascript.options.wasm_baselinejit",
	-- "javascript.options.wasm_ionjit",
	-- "javascript.options.werror",
	-- "javascript.use_us_english_locale",
	-- "jsloader.shareGlobal",
	-- "layout.css.all-shorthand.enabled",
	-- "layout.css.background-blend-mode.enabled",
	-- "layout.css.box-decoration-break.enabled",
	-- "layout.css.color-adjust.enabled",
	-- "layout.css.column-span.enabled",
	-- "layout.css.contain.enabled",
	-- "layout.css.control-characters.visible",
	-- "layout.css.emulate-moz-box-with-flex",
	-- "layout.css.expensive-style-struct-assertions.enabled",
	-- "layout.css.float-logical-values.enabled",
	-- "layout.css.font-display.enabled",
	-- "layout.css.font-variations.enabled",
	-- "layout.css.frames-timing.enabled",
	-- "layout.css.getBoxQuads.enabled",
	-- "layout.css.grid-template-subgrid-value.enabled",
	-- "layout.css.grid.enabled",
	-- "layout.css.image-orientation.enabled",
	-- "layout.css.individual-transform.enabled",
	-- "layout.css.initial-letter.enabled",
	-- "layout.css.isolation.enabled",
	-- "layout.css.mix-blend-mode.enabled",
	-- "layout.css.moz-document.content.enabled",
	-- "layout.css.osx-font-smoothing.enabled",
	-- "layout.css.overflow-clip-box.enabled",
	-- "layout.css.overscroll-behavior.enabled",
	-- "layout.css.prefixes.animations",
	-- "layout.css.prefixes.border-image",
	-- "layout.css.prefixes.box-sizing",
	-- "layout.css.prefixes.device-pixel-ratio-webkit",
	-- "layout.css.prefixes.font-features",
	-- "layout.css.prefixes.gradients",
	-- "layout.css.prefixes.transforms",
	-- "layout.css.prefixes.transitions",
	-- "layout.css.prefixes.webkit",
	-- "layout.css.scope-pseudo.enabled",
	-- "layout.css.scoped-style.enabled",
	-- "layout.css.scroll-behavior.property-enabled",
	-- "layout.css.scroll-snap.enabled",
	--#ifdef MOZ_STYLO
	-- "layout.css.servo.chrome.enabled",
	-- "layout.css.servo.enabled",
	--#endif
	-- "layout.css.shape-outside.enabled",
	-- "layout.css.text-align-unsafe-value.enabled",
	-- "layout.css.text-combine-upright-digits.enabled",
	-- "layout.css.text-combine-upright.enabled",
	-- "layout.css.text-justify.enabled",
	-- "layout.css.touch_action.enabled",
	-- "layout.css.visited_links_enabled",
	-- "layout.idle_period.required_quiescent_frames",
	-- "layout.idle_period.time_limit",
	-- "layout.interruptible-reflow.enabled",
	-- "mathml.disabled",
	-- "media.audio-max-decode-error",
	-- "media.cache_readahead_limit",
	-- "media.cache_resume_threshold",
	-- "media.cache_size",
	-- "media.clearkey.persistent-license.enabled",
	-- "media.cubeb.backend",
	-- "media.cubeb.sandbox",
	-- "media.cubeb_latency_msg_frames",
	-- "media.cubeb_latency_playback_ms",
	-- "media.decoder-doctor.wmf-disabled-is-failure",
	-- "media.decoder.recycle.enabled",
	-- "media.decoder.skip-to-next-key-frame.enabled",
	-- "media.dormant-on-pause-timeout-ms",
	-- "media.eme.audio.blank",
	-- "media.eme.chromium-api.video-shmems",
	-- "media.eme.enabled",
	-- "media.eme.video.blank",
	-- "media.ffmpeg.enabled",
	-- "media.ffmpeg.low-latency.enabled",
	-- "media.ffvpx.enabled",
	-- "media.ffvpx.low-latency.enabled",
	-- "media.flac.enabled",
	-- "media.forcestereo.enabled",
	-- "media.gmp.decoder.enabled",
	-- "media.gmp.insecure.allow",
	-- "media.gpu-process-decoder",
	-- "media.hls.enabled",
	-- "media.libavcodec.allow-obsolete",
	-- "media.memory_cache_max_size",
	-- "media.memory_caches_combined_limit_kb",
	-- "media.memory_caches_combined_limit_pc_sysmem",
	-- "media.mp4.enabled",
	-- "media.navigator.mediadatadecoder_enabled",
	-- "media.ogg.enabled",
	-- "media.ogg.flac.enabled",
	-- "media.playback.warnings-as-errors",
	-- "media.playback.warnings-as-errors.stagefright-vs-rust",
	-- "media.resampling.enabled",
	-- "media.resume-bkgnd-video-on-tabhover",
	-- "media.ruin-av-sync.enabled",
	-- "media.rust.mp4parser",
	-- "media.rust.test_mode",
	-- "media.seamless-looping",
	-- "media.suspend-bkgnd-video.delay-ms",
	-- "media.suspend-bkgnd-video.enabled",
	-- "media.use-blank-decoder",
	-- "media.video-max-decode-error",
	-- "media.video_stats.enabled",
	-- "media.videocontrols.lock-video-orientation",
	-- "media.volume_scale",
	-- "media.webspeech.recognition.enable",
	-- "media.webspeech.recognition.force_enable",
	-- "media.webspeech.synth.force_global_queue",
	-- "media.webspeech.test.enable",
	-- "media.webspeech.test.fake_fsm_events",
	-- "media.webspeech.test.fake_recognition_service",
	-- "media.wmf.allow-unsupported-resolutions",
	-- "media.wmf.enabled",
	-- "media.wmf.skip-blacklist",
	-- "media.wmf.vp9.enabled",
	-- "network.IDN.blacklist_chars",
	-- "network.IDN.restriction_profile",
	-- "network.IDN.use_whitelist",
	-- "network.IDN_show_punycode",
	-- "network.buffer.cache.count",
	-- "network.buffer.cache.size",
	-- "network.captive-portal-service.enabled",
	-- "network.cookie.cookieBehavior",
	-- "network.cookie.lifetimePolicy",
	-- "network.dns.disablePrefetch",
	-- "network.dns.disablePrefetchFromHTTPS",
	-- "network.http.tailing.enabled",
	-- "network.jar.block-remote-files",
	-- "network.loadinfo.skip_type_assertion",
	-- "network.notify.changed",
	-- "network.offline-mirrors-connectivity",
	-- "network.protocol-handler.external.jar",
	-- "network.proxy.type",
	-- "network.security.ports.banned",
	-- "network.security.ports.banned.override",
	-- "network.standard-url.enable-rust",
	-- "network.standard-url.max-length",
	-- "network.standard-url.punycode-host",
	-- "network.sts.max_time_for_events_between_two_polls",
	-- "network.sts.max_time_for_pr_close_during_shutdown",
	-- "network.tcp.keepalive.enabled",
	-- "network.tcp.keepalive.idle_time",
	-- "network.tcp.keepalive.probe_count",
	-- "network.tcp.keepalive.retry_interval",
	-- "network.tcp.sendbuffer",
	-- "nglayout.debug.invalidation",
	-- "privacy.donottrackheader.enabled",
	-- "privacy.firstparty.isolate",
	-- "privacy.firstparty.isolate.restrict_opener_access",
	-- "privacy.reduceTimerPrecision",
	-- "privacy.resistFingerprinting",
	-- "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts",
	-- "privacy.resistFingerprinting.reduceTimerPrecision.jitter",
	-- "privacy.resistFingerprinting.reduceTimerPrecision.microseconds",
	-- "privacy.resistFingerprinting.target_video_res",
	-- "privacy.resistFingerprinting.video_dropped_ratio",
	-- "privacy.resistFingerprinting.video_frames_per_sec",
	-- "privacy.trackingprotection.lower_network_priority",
	-- "privacy.window.maxInnerHeight",
	-- "privacy.window.maxInnerWidth",
	-- "security.csp.enable",
	-- "security.data_uri.block_toplevel_data_uri_navigations",
	-- "security.data_uri.unique_opaque_origin",
	-- "security.fileuri.strict_origin_policy",
	-- "security.mixed_content.block_active_content",
	-- "security.mixed_content.block_display_content",
	-- "security.mixed_content.block_object_subrequest",
	-- "security.mixed_content.hsts_priming_cache_timeout",
	-- "security.mixed_content.send_hsts_priming",
	-- "security.mixed_content.upgrade_display_content",
	-- "security.mixed_content.use_hsts",
	-- "security.sandbox.content.level",
	-- "security.sandbox.content.tempDirSuffix",
	-- "security.sandbox.logging.enabled",
	-- "security.sandbox.mac.track.violations",
	-- "security.sandbox.windows.log.stackTraceDepth",
	-- "svg.disabled",
	-- "svg.display-lists.hit-testing.enabled",
	-- "svg.display-lists.painting.enabled",
	-- "svg.new-getBBox.enabled",
	-- "svg.path-caching.enabled",
	-- "svg.transform-box.enabled",
	-- "toolkit.asyncshutdown.crash_timeout",
	-- "toolkit.asyncshutdown.log",
	-- "toolkit.osfile.log",
	-- "toolkit.osfile.log.redirect",
	-- "toolkit.telemetry.enabled",
	-- "toolkit.telemetry.idleTimeout",
	-- "toolkit.telemetry.initDelay",
	-- "toolkit.telemetry.log.dump",
	-- "toolkit.telemetry.log.level",
	-- "toolkit.telemetry.minSubsessionLength",
	-- "toolkit.telemetry.scheduler.idleTickInterval",
	-- "toolkit.telemetry.scheduler.tickInterval",
	-- "toolkit.telemetry.testing.overridePreRelease",
	-- "toolkit.telemetry.unified",
	-- "ui.key.menuAccessKeyFocuses",
	-- "ui.popup.disable_autohide",
	-- "ui.use_activity_cursor",
	-- "view_source.editor.external",
	-- "zoom.maxPercent",
	-- "zoom.minPercent"
	--};
	--
	--const char** mozilla::dom::ContentPrefs::GetEarlyPrefs(size_t* aCount)
	--{
	-- *aCount = ArrayLength(ContentPrefs::gEarlyPrefs);
	-- return gEarlyPrefs;
	--}
	--
	--const char* mozilla::dom::ContentPrefs::GetEarlyPref(size_t aIndex)
	--{
	-- MOZ_ASSERT(aIndex < ArrayLength(ContentPrefs::gEarlyPrefs));
	-- return gEarlyPrefs[aIndex];
	--}
	-diff --git dom/ipc/ContentPrefs.h dom/ipc/ContentPrefs.h
	-deleted file mode 100644
	-index 72ce8d236c11..000000000000
	---- dom/ipc/ContentPrefs.h
	-+++ /dev/null
	-@@ -1,27 +0,0 @@
	--/* -- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -- */
	--/* vim: set ts=8 sts=2 et sw=2 tw=80: */
	--/* 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/. */
	--
	--#ifndef mozilla_dom_ContentPrefs_h
	--#define mozilla_dom_ContentPrefs_h
	--
	--// See the comment in ContentPrefs.cpp for more information.
	--
	--namespace mozilla {
	--namespace dom {
	--
	--class ContentPrefs {
	--public:
	-- static const char** GetEarlyPrefs(size_t* aCount);
	-- static const char* GetEarlyPref(size_t aIndex);
	--
	--private:
	-- static const char* gEarlyPrefs[];
	--};
	--
	--}
	--}
	--
	--#endif
	-diff --git dom/ipc/ContentProcess.cpp dom/ipc/ContentProcess.cpp
	-index 2441c8cb9224..c00283dc5084 100644
	---- dom/ipc/ContentProcess.cpp
	-+++ dom/ipc/ContentProcess.cpp
	-@@ -7,7 +7,6 @@
	- #include "mozilla/ipc/IOThreadChild.h"
	-
	- #include "ContentProcess.h"
	--#include "ContentPrefs.h"
	- #include "base/shared_memory.h"
	- #include "mozilla/Preferences.h"
	- #include "mozilla/Scheduler.h"
	-@@ -226,8 +225,8 @@ ContentProcess::Init(int aArgc, char* aArgv[])
	- NS_ERROR("failed to map shared memory in the child");
	- return false;
	- }
	-- Preferences::DeserializeEarlyPreferences(static_cast<char*>(shm.memory()),
	-- prefsLen);
	-+ Preferences::DeserializePreferences(static_cast<char*>(shm.memory()),
	-+ prefsLen);
	-
	- Scheduler::SetPrefs(schedulerPrefs);
	- mContent.Init(IOThreadChild::message_loop(),
	-diff --git dom/ipc/PContent.ipdl dom/ipc/PContent.ipdl
	-index 5d077976569a..fb967ffc53a9 100644
	---- dom/ipc/PContent.ipdl
	-+++ dom/ipc/PContent.ipdl
	-@@ -155,6 +155,12 @@ union MaybePrefValue {
	- null_t;
	- };
	-
	-+// This serialization form mirrors that used in mozilla::Pref in
	-+// Preferences.cpp. The two should be kept in sync, e.g. if something is added
	-+// to one it should also be added to the other.
	-+//
	-+// Note: there is no need to pass the isSticky attribute because that's an
	-+// immutable attribute obtained from file at startup.
	- struct Pref {
	- nsCString name;
	- bool isLocked;
	-@@ -273,7 +279,6 @@ struct XPCOMInitData
	- ClipboardCapabilities clipboardCaps;
	- DomainPolicyClone domainPolicy;
	- OptionalURIParams userContentSheetURL;
	-- Pref[] prefs;
	- GfxVarUpdate[] gfxNonDefaultVarUpdates;
	- ContentDeviceData contentDeviceData;
	- GfxInfoFeatureStatus[] gfxFeatureStatus;
	-diff --git dom/ipc/moz.build dom/ipc/moz.build
	-index 3c5541c7791b..5e92a0d52b5d 100644
	---- dom/ipc/moz.build
	-+++ dom/ipc/moz.build
	-@@ -26,7 +26,6 @@ EXPORTS.mozilla.dom += [
	- 'ContentBridgeParent.h',
	- 'ContentChild.h',
	- 'ContentParent.h',
	-- 'ContentPrefs.h',
	- 'ContentProcess.h',
	- 'ContentProcessHost.h',
	- 'ContentProcessManager.h',
	-@@ -59,7 +58,6 @@ UNIFIED_SOURCES += [
	- 'ContentBridgeChild.cpp',
	- 'ContentBridgeParent.cpp',
	- 'ContentParent.cpp',
	-- 'ContentPrefs.cpp',
	- 'ContentProcess.cpp',
	- 'ContentProcessHost.cpp',
	- 'ContentProcessManager.cpp',
	-diff --git layout/style/nsCSSProps.h layout/style/nsCSSProps.h
	-index dce44bf61b35..80288336a08b 100644
	---- layout/style/nsCSSProps.h
	-+++ layout/style/nsCSSProps.h
	-@@ -645,7 +645,7 @@ public:
	- // In the child process, assert that we're not trying to parse stylesheets
	- // before we've gotten all our prefs.
	- MOZ_ASSERT_IF(!XRE_IsParentProcess(),
	-- mozilla::Preferences::AreAllPrefsSetInContentProcess());
	-+ mozilla::Preferences::ArePrefsInitedInContentProcess());
	- return gPropertyEnabled[aProperty];
	- }
	-
	-diff --git modules/libpref/Preferences.cpp modules/libpref/Preferences.cpp
	-index fe780686f2eb..488095f49236 100644
	---- modules/libpref/Preferences.cpp
	-+++ modules/libpref/Preferences.cpp
	-@@ -15,7 +15,6 @@
	- #include "mozilla/ArenaAllocator.h"
	- #include "mozilla/ArrayUtils.h"
	- #include "mozilla/Attributes.h"
	--#include "mozilla/dom/ContentPrefs.h"
	- #include "mozilla/dom/PContent.h"
	- #include "mozilla/HashFunctions.h"
	- #include "mozilla/Logging.h"
	-@@ -131,6 +130,29 @@ enum class PrefType : uint8_t
	- Bool = 3,
	- };
	-
	-+// This is used for pref names and string pref values. We encode the string
	-+// length, then a '/', then the string chars. This encoding means there are no
	-+// special chars that are forbidden or require escaping.
	-+static void
	-+SerializeAndAppendString(const char* aChars, nsCString& aStr)
	-+{
	-+ aStr.AppendInt(uint32_t(strlen(aChars)));
	-+ aStr.Append('/');
	-+ aStr.Append(aChars);
	-+}
	-+
	-+static char*
	-+DeserializeString(char* aChars, nsCString& aStr)
	-+{
	-+ char* p = aChars;
	-+ uint32_t length = strtol(p, &p, 10);
	-+ MOZ_ASSERT(p[0] == '/');
	-+ p++; // move past the '/'
	-+ aStr.Assign(p, length);
	-+ p += length; // move past the string itself
	-+ return p;
	-+}
	-+
	- // Keep this in sync with PrefValue in prefs_parser/src/lib.rs.
	- union PrefValue {
	- const char* mStringVal;
	-@@ -223,6 +245,64 @@ union PrefValue {
	- MOZ_CRASH();
	- }
	- }
	-+
	-+ void SerializeAndAppend(PrefType aType, nsCString& aStr)
	-+ {
	-+ switch (aType) {
	-+ case PrefType::Bool:
	-+ aStr.Append(mBoolVal ? 'T' : 'F');
	-+ break;
	-+
	-+ case PrefType::Int:
	-+ aStr.AppendInt(mIntVal);
	-+ break;
	-+
	-+ case PrefType::String: {
	-+ SerializeAndAppendString(mStringVal, aStr);
	-+ break;
	-+ }
	-+
	-+ case PrefType::None:
	-+ default:
	-+ MOZ_CRASH();
	-+ }
	-+ }
	-+
	-+ static char* Deserialize(PrefType aType,
	-+ char* aStr,
	-+ dom::MaybePrefValue* aDomValue)
	-+ {
	-+ char* p = aStr;
	-+
	-+ switch (aType) {
	-+ case PrefType::Bool:
	-+ if (*p == 'T') {
	-+ *aDomValue = true;
	-+ } else if (*p == 'F') {
	-+ *aDomValue = false;
	-+ } else {
	-+ *aDomValue = false;
	-+ NS_ERROR("bad bool pref value");
	-+ }
	-+ p++;
	-+ return p;
	-+
	-+ case PrefType::Int: {
	-+ *aDomValue = int32_t(strtol(p, &p, 10));
	-+ return p;
	-+ }
	-+
	-+ case PrefType::String: {
	-+ nsCString str;
	-+ p = DeserializeString(p, str);
	-+ *aDomValue = str;
	-+ return p;
	-+ }
	-+
	-+ default:
	-+ MOZ_CRASH();
	-+ }
	-+ }
	- };
	-
	- #ifdef DEBUG
	-@@ -694,6 +774,159 @@ public:
	- return false;
	- }
	-
	-+ // Prefs are serialized in a manner that mirrors dom::Pref. The two should be
	-+ // kept in sync. E.g. if something is added to one it should also be added to
	-+ // the other. (It would be nice to be able to use the code generated from
	-+ // IPDL for serializing dom::Pref here instead of writing by hand this
	-+ // serialization/deserialization. Unfortunately, that generated code is
	-+ // difficult to use directly, outside of the IPDL IPC code.)
	-+ //
	-+ // The grammar for the serialized prefs has the following form.
	-+ //
	-+ // <pref> = <type> <locked> ':' <name> ':' <value>? ':' <value>? '\n'
	-+ // <type> = 'B' \| 'I' \| 'S'
	-+ // <locked> = 'L' \| '-'
	-+ // <name> = <string-value>
	-+ // <value> = <bool-value> \| <int-value> \| <string-value>
	-+ // <bool-value> = 'T' \| 'F'
	-+ // <int-value> = an integer literal accepted by strtol()
	-+ // <string-value> = <int-value> '/' <chars>
	-+ // <chars> = any char sequence of length dictated by the preceding
	-+ // <int-value>.
	-+ //
	-+ // No whitespace is tolerated between tokens. <type> must match the types of
	-+ // the values.
	-+ //
	-+ // The serialization is text-based, rather than binary, for the following
	-+ // reasons.
	-+ //
	-+ // - The size difference wouldn't be much different between text-based and
	-+ // binary. Most of the space is for strings (pref names and string pref
	-+ // values), which would be the same in both styles. And other differences
	-+ // would be minimal, e.g. small integers are shorter in text but long
	-+ // integers are longer in text.
	-+ //
	-+ // - Likewise, speed differences should be negligible.
	-+ //
	-+ // - It's much easier to debug a text-based serialization. E.g. you can
	-+ // print it and inspect it easily in a debugger.
	-+ //
	-+ // Examples of unlocked boolean prefs:
	-+ // - "B-:8/my.bool1:F:T\n"
	-+ // - "B-:8/my.bool2:F:\n"
	-+ // - "B-:8/my.bool3::T\n"
	-+ //
	-+ // Examples of locked integer prefs:
	-+ // - "IL:7/my.int1:0:1\n"
	-+ // - "IL:7/my.int2:123:\n"
	-+ // - "IL:7/my.int3::-99\n"
	-+ //
	-+ // Examples of unlocked string prefs:
	-+ // - "S-:10/my.string1:3/abc:4/wxyz\n"
	-+ // - "S-:10/my.string2:5/1.234:\n"
	-+ // - "S-:10/my.string3::7/string!\n"
	-+
	-+ void SerializeAndAppend(nsCString& aStr)
	-+ {
	-+ switch (Type()) {
	-+ case PrefType::Bool:
	-+ aStr.Append('B');
	-+ break;
	-+
	-+ case PrefType::Int:
	-+ aStr.Append('I');
	-+ break;
	-+
	-+ case PrefType::String: {
	-+ aStr.Append('S');
	-+ break;
	-+ }
	-+
	-+ case PrefType::None:
	-+ default:
	-+ MOZ_CRASH();
	-+ }
	-+
	-+ aStr.Append(mIsLocked ? 'L' : '-');
	-+ aStr.Append(':');
	-+
	-+ SerializeAndAppendString(mName, aStr);
	-+ aStr.Append(':');
	-+
	-+ if (mHasDefaultValue) {
	-+ mDefaultValue.SerializeAndAppend(Type(), aStr);
	-+ }
	-+ aStr.Append(':');
	-+
	-+ if (mHasUserValue) {
	-+ mUserValue.SerializeAndAppend(Type(), aStr);
	-+ }
	-+ aStr.Append('\n');
	-+ }
	-+
	-+ static char* Deserialize(char* aStr, dom::Pref* aDomPref)
	-+ {
	-+ char* p = aStr;
	-+
	-+ // The type.
	-+ PrefType type;
	-+ if (*p == 'B') {
	-+ type = PrefType::Bool;
	-+ } else if (*p == 'I') {
	-+ type = PrefType::Int;
	-+ } else if (*p == 'S') {
	-+ type = PrefType::String;
	-+ } else {
	-+ NS_ERROR("bad pref type");
	-+ type = PrefType::None;
	-+ }
	-+ p++; // move past the type char
	-+
	-+ // Locked?
	-+ bool isLocked;
	-+ if (*p == 'L') {
	-+ isLocked = true;
	-+ } else if (*p == '-') {
	-+ isLocked = false;
	-+ } else {
	-+ NS_ERROR("bad pref locked status");
	-+ isLocked = false;
	-+ }
	-+ p++; // move past the isLocked char
	-+
	-+ MOZ_ASSERT(*p == ':');
	-+ p++; // move past the ':'
	-+
	-+ // The pref name.
	-+ nsCString name;
	-+ p = DeserializeString(p, name);
	-+
	-+ MOZ_ASSERT(*p == ':');
	-+ p++; // move past the ':' preceding the default value
	-+
	-+ dom::MaybePrefValue maybeDefaultValue;
	-+ if (*p != ':') {
	-+ dom::PrefValue defaultValue;
	-+ p = PrefValue::Deserialize(type, p, &maybeDefaultValue);
	-+ }
	-+
	-+ MOZ_ASSERT(*p == ':');
	-+ p++; // move past the ':' between the default and user values
	-+
	-+ dom::MaybePrefValue maybeUserValue;
	-+ if (*p != '\n') {
	-+ dom::PrefValue userValue;
	-+ p = PrefValue::Deserialize(type, p, &maybeUserValue);
	-+ }
	-+
	-+ MOZ_ASSERT(*p == '\n');
	-+ p++; // move past the '\n' following the user value
	-+
	-+ *aDomPref = dom::Pref(name, isLocked, maybeDefaultValue, maybeUserValue);
	-+
	-+ return p;
	-+ }
	-+
	- void AddSizeOfIncludingThis(MallocSizeOf aMallocSizeOf, PrefsSizes& aSizes)
	- {
	- // Note: mName is allocated in gPrefNameArena, measured elsewhere.
	-@@ -880,41 +1113,9 @@ pref_savePrefs()
	-
	- #ifdef DEBUG
	-
	--// For content processes, what prefs have been initialized?
	--enum class ContentProcessPhase
	--{
	-- eNoPrefsSet,
	-- eEarlyPrefsSet,
	-- eEarlyAndLatePrefsSet,
	--};
	--
	- // Note that this never changes in the parent process, and is only read in
	- // content processes.
	--static ContentProcessPhase gPhase = ContentProcessPhase::eNoPrefsSet;
	--
	--struct StringComparator
	--{
	-- const char* mPrefName;
	--
	-- explicit StringComparator(const char* aPrefName)
	-- : mPrefName(aPrefName)
	-- {
	-- }
	--
	-- int operator()(const char* aPrefName) const
	-- {
	-- return strcmp(mPrefName, aPrefName);
	-- }
	--};
	--
	--static bool
	--IsEarlyPref(const char* aPrefName)
	--{
	-- size_t prefsLen;
	-- size_t found;
	-- const char** list = mozilla::dom::ContentPrefs::GetEarlyPrefs(&prefsLen);
	-- return BinarySearchIf(list, 0, prefsLen, StringComparator(aPrefName), &found);
	--}
	-+static bool gContentProcessPrefsAreInited = false;
	-
	- #endif // DEBUG
	-
	-@@ -923,23 +1124,7 @@ pref_HashTableLookupInner(const char* aPrefName)
	- {
	- MOZ_ASSERT(NS_IsMainThread() \|\| mozilla::ServoStyleSet::IsInServoTraversal());
	-
	--#ifdef DEBUG
	-- if (!XRE_IsParentProcess()) {
	-- if (gPhase == ContentProcessPhase::eNoPrefsSet) {
	-- MOZ_CRASH_UNSAFE_PRINTF("accessing pref %s before early prefs are set",
	-- aPrefName);
	-- }
	--
	-- if (gPhase == ContentProcessPhase::eEarlyPrefsSet &&
	-- !IsEarlyPref(aPrefName)) {
	-- // If you hit this crash, you have an early access of a non-early pref.
	-- // Consider moving the access later or add the pref to the whitelist of
	-- // early prefs in ContentPrefs.cpp and get review from a DOM peer.
	-- MOZ_CRASH_UNSAFE_PRINTF(
	-- "accessing non-early pref %s before late prefs are set", aPrefName);
	-- }
	-- }
	--#endif
	-+ MOZ_ASSERT_IF(!XRE_IsParentProcess(), gContentProcessPrefsAreInited);
	-
	- return static_cast<PrefEntry*>(gHashTable->Search(aPrefName));
	- }
	-@@ -2932,8 +3117,8 @@ public:
	-
	- } // namespace
	-
	--// A list of prefs sent early from the parent, via shared memory.
	--static InfallibleTArray<dom::Pref>* gEarlyDomPrefs;
	-+// A list of changed prefs sent from the parent via shared memory.
	-+static InfallibleTArray<dom::Pref>* gChangedDomPrefs;
	-
	- static const char kTelemetryPref[] = "toolkit.telemetry.enabled";
	- static const char kChannelPref[] = "app.update.channel";
	-@@ -3050,12 +3235,12 @@ Preferences::GetInstanceForService()
	- }
	-
	- if (!XRE_IsParentProcess()) {
	-- MOZ_ASSERT(gEarlyDomPrefs);
	-- for (unsigned int i = 0; i < gEarlyDomPrefs->Length(); i++) {
	-- Preferences::SetPreference(gEarlyDomPrefs->ElementAt(i));
	-+ MOZ_ASSERT(gChangedDomPrefs);
	-+ for (unsigned int i = 0; i < gChangedDomPrefs->Length(); i++) {
	-+ Preferences::SetPreference(gChangedDomPrefs->ElementAt(i));
	- }
	-- delete gEarlyDomPrefs;
	-- gEarlyDomPrefs = nullptr;
	-+ delete gChangedDomPrefs;
	-+ gChangedDomPrefs = nullptr;
	-
	- } else {
	- // Check if there is a deployment configuration file. If so, set up the
	-@@ -3179,149 +3364,44 @@ NS_IMPL_ISUPPORTS(Preferences,
	- nsISupportsWeakReference)
	-
	- /* static */ void
	--Preferences::SerializeEarlyPreferences(nsCString& aStr)
	-+Preferences::SerializePreferences(nsCString& aStr)
	- {
	- MOZ_RELEASE_ASSERT(InitStaticMembers());
	-
	-- nsAutoCStringN<256> boolPrefs, intPrefs, stringPrefs;
	-- size_t numEarlyPrefs;
	-- dom::ContentPrefs::GetEarlyPrefs(&numEarlyPrefs);
	--
	-- for (unsigned int i = 0; i < numEarlyPrefs; i++) {
	-- const char* prefName = dom::ContentPrefs::GetEarlyPref(i);
	-- MOZ_ASSERT_IF(i > 0,
	-- strcmp(prefName, dom::ContentPrefs::GetEarlyPref(i - 1)) > 0);
	--
	-- Pref* pref = pref_HashTableLookup(prefName);
	-- if (!pref \|\| !pref->MustSendToContentProcesses()) {
	-- continue;
	-- }
	-+ aStr.Truncate();
	-
	-- switch (pref->Type()) {
	-- case PrefType::Bool:
	-- boolPrefs.Append(
	-- nsPrintfCString("%u:%d\|", i, Preferences::GetBool(prefName)));
	-- break;
	-- case PrefType::Int:
	-- intPrefs.Append(
	-- nsPrintfCString("%u:%d\|", i, Preferences::GetInt(prefName)));
	-- break;
	-- case PrefType::String: {
	-- nsAutoCString value;
	-- Preferences::GetCString(prefName, value);
	-- stringPrefs.Append(
	-- nsPrintfCString("%u:%d;%s\|", i, value.Length(), value.get()));
	-- } break;
	-- case PrefType::None:
	-- break;
	-- default:
	-- printf_stderr("preference type: %d\n", int(pref->Type()));
	-- MOZ_CRASH();
	-+ for (auto iter = gHashTable->Iter(); !iter.Done(); iter.Next()) {
	-+ Pref* pref = static_cast<PrefEntry*>(iter.Get())->mPref;
	-+ if (pref->MustSendToContentProcesses() && pref->HasAdvisablySizedValues()) {
	-+ pref->SerializeAndAppend(aStr);
	- }
	- }
	-
	-- aStr.Truncate();
	-- aStr.Append(boolPrefs);
	-- aStr.Append('\n');
	-- aStr.Append(intPrefs);
	-- aStr.Append('\n');
	-- aStr.Append(stringPrefs);
	-- aStr.Append('\n');
	- aStr.Append('\0');
	- }
	-
	- /* static */ void
	--Preferences::DeserializeEarlyPreferences(char* aStr, size_t aStrLen)
	-+Preferences::DeserializePreferences(char* aStr, size_t aPrefsLen)
	- {
	- MOZ_ASSERT(!XRE_IsParentProcess());
	-
	-- MOZ_ASSERT(!gEarlyDomPrefs);
	-- gEarlyDomPrefs = new InfallibleTArray<dom::Pref>();
	-+ MOZ_ASSERT(!gChangedDomPrefs);
	-+ gChangedDomPrefs = new InfallibleTArray<dom::Pref>();
	-
	- char* p = aStr;
	--
	-- // XXX: we assume these pref values are default values, which may not be
	-- // true. We also assume they are unlocked. Fortunately, these prefs get reset
	-- // properly by the first IPC message.
	--
	-- // Get the bool prefs.
	-- while (*p != '\n') {
	-- int32_t index = strtol(p, &p, 10);
	-- MOZ_ASSERT(p[0] == ':');
	-- p++;
	-- int v = strtol(p, &p, 10);
	-- MOZ_ASSERT(v == 0 \|\| v == 1);
	-- dom::MaybePrefValue value(dom::PrefValue(!!v));
	-- MOZ_ASSERT(p[0] == '\|');
	-- p++;
	-- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false,
	-- value,
	-- dom::MaybePrefValue());
	-- gEarlyDomPrefs->AppendElement(pref);
	-- }
	-- p++;
	--
	-- // Get the int prefs.
	-- while (*p != '\n') {
	-- int32_t index = strtol(p, &p, 10);
	-- MOZ_ASSERT(p[0] == ':');
	-- p++;
	-- dom::MaybePrefValue value(
	-- dom::PrefValue(static_cast<int32_t>(strtol(p, &p, 10))));
	-- MOZ_ASSERT(p[0] == '\|');
	-- p++;
	-- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false,
	-- value,
	-- dom::MaybePrefValue());
	-- gEarlyDomPrefs->AppendElement(pref);
	-- }
	-- p++;
	--
	-- // Get the string prefs.
	-- while (*p != '\n') {
	-- int32_t index = strtol(p, &p, 10);
	-- MOZ_ASSERT(p[0] == ':');
	-- p++;
	-- int32_t length = strtol(p, &p, 10);
	-- MOZ_ASSERT(p[0] == ';');
	-- p++;
	-- dom::MaybePrefValue value(dom::PrefValue(nsCString(p, length)));
	-- dom::Pref pref(nsCString(dom::ContentPrefs::GetEarlyPref(index)),
	-- /* isLocked */ false,
	-- value,
	-- dom::MaybePrefValue());
	-- gEarlyDomPrefs->AppendElement(pref);
	-- p += length + 1;
	-- MOZ_ASSERT(*(p - 1) == '\|');
	-- }
	-- p++;
	--
	-- MOZ_ASSERT(*p == '\0');
	-+ while (*p != '\0') {
	-+ dom::Pref pref;
	-+ p = Pref::Deserialize(p, &pref);
	-+ gChangedDomPrefs->AppendElement(pref);
	-+ }
	-
	- // We finished parsing on a '\0'. That should be the last char in the shared
	-- // memory.
	-- MOZ_ASSERT(aStr + aStrLen - 1 == p);
	--
	--#ifdef DEBUG
	-- MOZ_ASSERT(gPhase == ContentProcessPhase::eNoPrefsSet);
	-- gPhase = ContentProcessPhase::eEarlyPrefsSet;
	--#endif
	--}
	--
	--/* static */ void
	--Preferences::SetLatePreferences(const nsTArray<dom::Pref>* aDomPrefs)
	--{
	-- MOZ_ASSERT(!XRE_IsParentProcess());
	--
	-- for (unsigned int i = 0; i < aDomPrefs->Length(); i++) {
	-- Preferences::SetPreference(aDomPrefs->ElementAt(i));
	-- }
	-+ // memory. (aPrefsLen includes the '\0'.)
	-+ MOZ_ASSERT(p == aStr + aPrefsLen - 1);
	-
	- #ifdef DEBUG
	-- MOZ_ASSERT(gPhase == ContentProcessPhase::eEarlyPrefsSet);
	-- gPhase = ContentProcessPhase::eEarlyAndLatePrefsSet;
	-+ MOZ_ASSERT(!gContentProcessPrefsAreInited);
	-+ gContentProcessPrefsAreInited = true;
	- #endif
	- }
	-
	-@@ -3558,36 +3638,12 @@ Preferences::GetPreference(dom::Pref* aDomPref)
	- }
	- }
	-
	--void
	--Preferences::GetPreferences(InfallibleTArray<dom::Pref>* aDomPrefs)
	--{
	-- MOZ_ASSERT(XRE_IsParentProcess());
	-- MOZ_ASSERT(NS_IsMainThread());
	--
	-- aDomPrefs->SetCapacity(gHashTable->EntryCount());
	-- for (auto iter = gHashTable->Iter(); !iter.Done(); iter.Next()) {
	-- Pref* pref = static_cast<PrefEntry*>(iter.Get())->mPref;
	--
	-- if (!pref->MustSendToContentProcesses()) {
	-- // The pref value hasn't changed since it was initialized at startup.
	-- // Don't bother sending it, because the content process will initialize
	-- // it the same way.
	-- continue;
	-- }
	--
	-- if (pref->HasAdvisablySizedValues()) {
	-- dom::Pref* setting = aDomPrefs->AppendElement();
	-- pref->ToDomPref(setting);
	-- }
	-- }
	--}
	--
	- #ifdef DEBUG
	- bool
	--Preferences::AreAllPrefsSetInContentProcess()
	-+Preferences::ArePrefsInitedInContentProcess()
	- {
	- MOZ_ASSERT(!XRE_IsParentProcess());
	-- return gPhase == ContentProcessPhase::eEarlyAndLatePrefsSet;
	-+ return gContentProcessPrefsAreInited;
	- }
	- #endif
	-
	-diff --git modules/libpref/Preferences.h modules/libpref/Preferences.h
	-index 0d976483daae..901425b5b663 100644
	---- modules/libpref/Preferences.h
	-+++ modules/libpref/Preferences.h
	-@@ -328,15 +328,10 @@ public:
	- const char* aPref,
	- float aDefault = 0.0f);
	-
	-- // When a content process is created these methods are used to pass prefs in
	-- // bulk from the parent process. "Early" preferences are ones that are needed
	-- // very early on in the content process's lifetime; they are passed via a
	-- // special shared memory segment. "Late" preferences are the remainder, which
	-- // are passed via a standard IPC message.
	-- static void SerializeEarlyPreferences(nsCString& aStr);
	-- static void DeserializeEarlyPreferences(char* aStr, size_t aStrLen);
	-- static void GetPreferences(InfallibleTArray<dom::Pref>* aSettings);
	-- static void SetLatePreferences(const nsTArray<dom::Pref>* aSettings);
	-+ // When a content process is created these methods are used to pass changed
	-+ // prefs in bulk from the parent process, via shared memory.
	-+ static void SerializePreferences(nsCString& aStr);
	-+ static void DeserializePreferences(char* aStr, size_t aPrefsLen);
	-
	- // When a single pref is changed in the parent process, these methods are
	- // used to pass the update to content processes.
	-@@ -344,7 +339,7 @@ public:
	- static void SetPreference(const dom::Pref& aPref);
	-
	- #ifdef DEBUG
	-- static bool AreAllPrefsSetInContentProcess();
	-+ static bool ArePrefsInitedInContentProcess();
	- #endif
	-
	- static void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
	Index: www/firefox/files/patch-z-bug517422
	===================================================================
	--- www/firefox/files/patch-z-bug517422
	+++ www/firefox/files/patch-z-bug517422
	@@ -132,10 +132,10 @@
	index 7dc1f60f95cc..67d402a4117f 100644
	--- dom/media/AudioStream.h
	+++ dom/media/AudioStream.h
	-@@ -15,7 +15,11 @@
	- #include "mozilla/TimeStamp.h"
	- #include "mozilla/UniquePtr.h"
	- #include "CubebUtils.h"
	+@@ -16,7 +16,11 @@
	+ #include "nsAutoPtr.h"
	+ #include "nsCOMPtr.h"
	+ #include "nsThreadUtils.h"
	+#ifdef MOZ_SYSTEM_SOUNDTOUCH
	+#include "soundtouch/SoundTouch.h"
	+#else

File Metadata

Mime Type: text/plain
Expires: Mon, Aug 24, 10:05 AM (4 h, 28 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 37181059
Default Alt Text: D15227.id43381.diff (662 KB)

D15227.id43381.diffNo OneTemporaryActions

D15227.id43381.diffView Options

File Metadata

Event Timeline

D15227.id43381.diff
No OneTemporary
Actions

D15227.id43381.diff
View Options