Thorium_Archive/thorium-mirror
1
0
Fork 0
mirror of https://github.com/Alex313031/thorium.git synced 2025-01-09 11:27:32 -03:00
Code Issues Projects Releases Packages Wiki Activity

update ffmpeg patches

Browse source
This commit is contained in:
Alexander Frick 2024-07-29 16:01:03 -05:00
parent 88ec3acefe
commit a45a7add82
3 changed files with 4040 additions and 802 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3237
other/add-hevc-ffmpeg-decoder-parser.bak Normal file
View file

File diff suppressed because it is too large Load diff

1533
other/add-hevc-ffmpeg-decoder-parser.patch
View file

File diff suppressed because it is too large Load diff

72
other/ffmpeg_hevc_ac3.patch
View file

@ -1,8 +1,8 @@
diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h
index 98b659a3de..e43c410450 100644 index a98fdf201a..421b1cff30 100644
--- a/chromium/config/Chrome/linux/x64/config.h --- a/chromium/config/Chrome/linux/x64/config.h
+++ b/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/x64/config.h
@@ -667,7 +667,7 @@ @@ -668,7 +668,7 @@
#define CONFIG_MUXERS 0 #define CONFIG_MUXERS 0
#define CONFIG_PROTOCOLS 0 #define CONFIG_PROTOCOLS 0
#define CONFIG_AANDCTTABLES 0 #define CONFIG_AANDCTTABLES 0
@ -12,7 +12,7 @@ index 98b659a3de..e43c410450 100644
#define CONFIG_ATSC_A53 1 #define CONFIG_ATSC_A53 1
#define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIO_FRAME_QUEUE 0
diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h
index 4e79eb091b..3fb519b01d 100644 index 66c41749ef..cc3ded1a8b 100644
--- a/chromium/config/Chrome/linux/x64/config_components.h --- a/chromium/config/Chrome/linux/x64/config_components.h
+++ b/chromium/config/Chrome/linux/x64/config_components.h +++ b/chromium/config/Chrome/linux/x64/config_components.h
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -24,7 +24,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EXTRACT_EXTRADATA_BSF 0 #define CONFIG_EXTRACT_EXTRADATA_BSF 0
#define CONFIG_FILTER_UNITS_BSF 0 #define CONFIG_FILTER_UNITS_BSF 0
#define CONFIG_H264_METADATA_BSF 0 #define CONFIG_H264_METADATA_BSF 0
@@ -346,8 +346,8 @@ @@ -338,8 +338,8 @@
#define CONFIG_AAC_DECODER 1 #define CONFIG_AAC_DECODER 1
#define CONFIG_AAC_FIXED_DECODER 0 #define CONFIG_AAC_FIXED_DECODER 0
#define CONFIG_AAC_LATM_DECODER 0 #define CONFIG_AAC_LATM_DECODER 0
@ -35,7 +35,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ACELP_KELVIN_DECODER 0 #define CONFIG_ACELP_KELVIN_DECODER 0
#define CONFIG_ALAC_DECODER 0 #define CONFIG_ALAC_DECODER 0
#define CONFIG_ALS_DECODER 0 #define CONFIG_ALS_DECODER 0
@@ -378,7 +378,7 @@ @@ -370,7 +370,7 @@
#define CONFIG_DSICINAUDIO_DECODER 0 #define CONFIG_DSICINAUDIO_DECODER 0
#define CONFIG_DSS_SP_DECODER 0 #define CONFIG_DSS_SP_DECODER 0
#define CONFIG_DST_DECODER 0 #define CONFIG_DST_DECODER 0
@ -44,7 +44,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EVRC_DECODER 0 #define CONFIG_EVRC_DECODER 0
#define CONFIG_FASTAUDIO_DECODER 0 #define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -567,11 +567,11 @@ @@ -559,11 +559,11 @@
#define CONFIG_WEBVTT_DECODER 0 #define CONFIG_WEBVTT_DECODER 0
#define CONFIG_XSUB_DECODER 0 #define CONFIG_XSUB_DECODER 0
#define CONFIG_AAC_AT_DECODER 0 #define CONFIG_AAC_AT_DECODER 0
@ -58,7 +58,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_GSM_MS_AT_DECODER 0 #define CONFIG_GSM_MS_AT_DECODER 0
#define CONFIG_ILBC_AT_DECODER 0 #define CONFIG_ILBC_AT_DECODER 0
#define CONFIG_MP1_AT_DECODER 0 #define CONFIG_MP1_AT_DECODER 0
@@ -960,7 +960,7 @@ @@ -953,7 +953,7 @@
#define CONFIG_WMV3_VDPAU_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0
#define CONFIG_AAC_PARSER 1 #define CONFIG_AAC_PARSER 1
#define CONFIG_AAC_LATM_PARSER 0 #define CONFIG_AAC_LATM_PARSER 0
@ -67,7 +67,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ADX_PARSER 0 #define CONFIG_ADX_PARSER 0
#define CONFIG_AMR_PARSER 0 #define CONFIG_AMR_PARSER 0
#define CONFIG_AV1_PARSER 0 #define CONFIG_AV1_PARSER 0
@@ -1626,7 +1626,7 @@ @@ -1619,7 +1619,7 @@
#define CONFIG_AA_DEMUXER 0 #define CONFIG_AA_DEMUXER 0
#define CONFIG_AAC_DEMUXER 1 #define CONFIG_AAC_DEMUXER 1
#define CONFIG_AAX_DEMUXER 0 #define CONFIG_AAX_DEMUXER 0
@ -76,7 +76,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_AC4_DEMUXER 0 #define CONFIG_AC4_DEMUXER 0
#define CONFIG_ACE_DEMUXER 0 #define CONFIG_ACE_DEMUXER 0
#define CONFIG_ACM_DEMUXER 0 #define CONFIG_ACM_DEMUXER 0
@@ -1709,7 +1709,7 @@ @@ -1703,7 +1703,7 @@
#define CONFIG_DXA_DEMUXER 0 #define CONFIG_DXA_DEMUXER 0
#define CONFIG_EA_DEMUXER 0 #define CONFIG_EA_DEMUXER 0
#define CONFIG_EA_CDATA_DEMUXER 0 #define CONFIG_EA_CDATA_DEMUXER 0
@ -108,10 +108,10 @@ index c85087a596..a9e086ef6d 100644
+ &ff_ac3_parser, + &ff_ac3_parser,
NULL }; NULL };
diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c
index 920b22bfa7..d6d293dc60 100644 index 29f1f59381..6fb0769ce7 100644
--- a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c --- a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c
+++ b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c +++ b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c
@@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { @@ -6,4 +6,6 @@ static const FFInputFormat * const demuxer_list[] = {
&ff_mp3_demuxer, &ff_mp3_demuxer,
&ff_ogg_demuxer, &ff_ogg_demuxer,
&ff_wav_demuxer, &ff_wav_demuxer,
@ -119,10 +119,10 @@ index 920b22bfa7..d6d293dc60 100644
+ &ff_eac3_demuxer, + &ff_eac3_demuxer,
NULL }; NULL };
diff --git a/chromium/config/Chrome/mac/x64/config.h b/chromium/config/Chrome/mac/x64/config.h diff --git a/chromium/config/Chrome/mac/x64/config.h b/chromium/config/Chrome/mac/x64/config.h
index 3b5d872b52..470252e5b3 100644 index 92151a92d2..69194a7959 100644
--- a/chromium/config/Chrome/mac/x64/config.h --- a/chromium/config/Chrome/mac/x64/config.h
+++ b/chromium/config/Chrome/mac/x64/config.h +++ b/chromium/config/Chrome/mac/x64/config.h
@@ -667,7 +667,7 @@ @@ -668,7 +668,7 @@
#define CONFIG_MUXERS 0 #define CONFIG_MUXERS 0
#define CONFIG_PROTOCOLS 0 #define CONFIG_PROTOCOLS 0
#define CONFIG_AANDCTTABLES 0 #define CONFIG_AANDCTTABLES 0
@ -132,7 +132,7 @@ index 3b5d872b52..470252e5b3 100644
#define CONFIG_ATSC_A53 1 #define CONFIG_ATSC_A53 1
#define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIO_FRAME_QUEUE 0
diff --git a/chromium/config/Chrome/mac/x64/config_components.h b/chromium/config/Chrome/mac/x64/config_components.h diff --git a/chromium/config/Chrome/mac/x64/config_components.h b/chromium/config/Chrome/mac/x64/config_components.h
index 4e79eb091b..3fb519b01d 100644 index 66c41749ef..cc3ded1a8b 100644
--- a/chromium/config/Chrome/mac/x64/config_components.h --- a/chromium/config/Chrome/mac/x64/config_components.h
+++ b/chromium/config/Chrome/mac/x64/config_components.h +++ b/chromium/config/Chrome/mac/x64/config_components.h
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -144,7 +144,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EXTRACT_EXTRADATA_BSF 0 #define CONFIG_EXTRACT_EXTRADATA_BSF 0
#define CONFIG_FILTER_UNITS_BSF 0 #define CONFIG_FILTER_UNITS_BSF 0
#define CONFIG_H264_METADATA_BSF 0 #define CONFIG_H264_METADATA_BSF 0
@@ -346,8 +346,8 @@ @@ -338,8 +338,8 @@
#define CONFIG_AAC_DECODER 1 #define CONFIG_AAC_DECODER 1
#define CONFIG_AAC_FIXED_DECODER 0 #define CONFIG_AAC_FIXED_DECODER 0
#define CONFIG_AAC_LATM_DECODER 0 #define CONFIG_AAC_LATM_DECODER 0
@ -155,7 +155,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ACELP_KELVIN_DECODER 0 #define CONFIG_ACELP_KELVIN_DECODER 0
#define CONFIG_ALAC_DECODER 0 #define CONFIG_ALAC_DECODER 0
#define CONFIG_ALS_DECODER 0 #define CONFIG_ALS_DECODER 0
@@ -378,7 +378,7 @@ @@ -370,7 +370,7 @@
#define CONFIG_DSICINAUDIO_DECODER 0 #define CONFIG_DSICINAUDIO_DECODER 0
#define CONFIG_DSS_SP_DECODER 0 #define CONFIG_DSS_SP_DECODER 0
#define CONFIG_DST_DECODER 0 #define CONFIG_DST_DECODER 0
@ -164,7 +164,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EVRC_DECODER 0 #define CONFIG_EVRC_DECODER 0
#define CONFIG_FASTAUDIO_DECODER 0 #define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -567,11 +567,11 @@ @@ -559,11 +559,11 @@
#define CONFIG_WEBVTT_DECODER 0 #define CONFIG_WEBVTT_DECODER 0
#define CONFIG_XSUB_DECODER 0 #define CONFIG_XSUB_DECODER 0
#define CONFIG_AAC_AT_DECODER 0 #define CONFIG_AAC_AT_DECODER 0
@ -178,7 +178,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_GSM_MS_AT_DECODER 0 #define CONFIG_GSM_MS_AT_DECODER 0
#define CONFIG_ILBC_AT_DECODER 0 #define CONFIG_ILBC_AT_DECODER 0
#define CONFIG_MP1_AT_DECODER 0 #define CONFIG_MP1_AT_DECODER 0
@@ -960,7 +960,7 @@ @@ -953,7 +953,7 @@
#define CONFIG_WMV3_VDPAU_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0
#define CONFIG_AAC_PARSER 1 #define CONFIG_AAC_PARSER 1
#define CONFIG_AAC_LATM_PARSER 0 #define CONFIG_AAC_LATM_PARSER 0
@ -187,7 +187,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ADX_PARSER 0 #define CONFIG_ADX_PARSER 0
#define CONFIG_AMR_PARSER 0 #define CONFIG_AMR_PARSER 0
#define CONFIG_AV1_PARSER 0 #define CONFIG_AV1_PARSER 0
@@ -1626,7 +1626,7 @@ @@ -1619,7 +1619,7 @@
#define CONFIG_AA_DEMUXER 0 #define CONFIG_AA_DEMUXER 0
#define CONFIG_AAC_DEMUXER 1 #define CONFIG_AAC_DEMUXER 1
#define CONFIG_AAX_DEMUXER 0 #define CONFIG_AAX_DEMUXER 0
@ -196,7 +196,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_AC4_DEMUXER 0 #define CONFIG_AC4_DEMUXER 0
#define CONFIG_ACE_DEMUXER 0 #define CONFIG_ACE_DEMUXER 0
#define CONFIG_ACM_DEMUXER 0 #define CONFIG_ACM_DEMUXER 0
@@ -1709,7 +1709,7 @@ @@ -1703,7 +1703,7 @@
#define CONFIG_DXA_DEMUXER 0 #define CONFIG_DXA_DEMUXER 0
#define CONFIG_EA_DEMUXER 0 #define CONFIG_EA_DEMUXER 0
#define CONFIG_EA_CDATA_DEMUXER 0 #define CONFIG_EA_CDATA_DEMUXER 0
@ -228,10 +228,10 @@ index c85087a596..a9e086ef6d 100644
+ &ff_ac3_parser, + &ff_ac3_parser,
NULL }; NULL };
diff --git a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c diff --git a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c
index 920b22bfa7..d6d293dc60 100644 index 29f1f59381..6fb0769ce7 100644
--- a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c --- a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c
+++ b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c +++ b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c
@@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { @@ -6,4 +6,6 @@ static const FFInputFormat * const demuxer_list[] = {
&ff_mp3_demuxer, &ff_mp3_demuxer,
&ff_ogg_demuxer, &ff_ogg_demuxer,
&ff_wav_demuxer, &ff_wav_demuxer,
@ -239,10 +239,10 @@ index 920b22bfa7..d6d293dc60 100644
+ &ff_eac3_demuxer, + &ff_eac3_demuxer,
NULL }; NULL };
diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h
index 60bba62b39..c2f791466e 100644 index 01114d6539..2bf150657a 100644
--- a/chromium/config/Chrome/win/x64/config.h --- a/chromium/config/Chrome/win/x64/config.h
+++ b/chromium/config/Chrome/win/x64/config.h +++ b/chromium/config/Chrome/win/x64/config.h
@@ -667,7 +667,7 @@ @@ -668,7 +668,7 @@
#define CONFIG_MUXERS 0 #define CONFIG_MUXERS 0
#define CONFIG_PROTOCOLS 0 #define CONFIG_PROTOCOLS 0
#define CONFIG_AANDCTTABLES 0 #define CONFIG_AANDCTTABLES 0
@ -252,7 +252,7 @@ index 60bba62b39..c2f791466e 100644
#define CONFIG_ATSC_A53 1 #define CONFIG_ATSC_A53 1
#define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIO_FRAME_QUEUE 0
diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h
index 4e79eb091b..3fb519b01d 100644 index 66c41749ef..cc3ded1a8b 100644
--- a/chromium/config/Chrome/win/x64/config_components.h --- a/chromium/config/Chrome/win/x64/config_components.h
+++ b/chromium/config/Chrome/win/x64/config_components.h +++ b/chromium/config/Chrome/win/x64/config_components.h
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -264,7 +264,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EXTRACT_EXTRADATA_BSF 0 #define CONFIG_EXTRACT_EXTRADATA_BSF 0
#define CONFIG_FILTER_UNITS_BSF 0 #define CONFIG_FILTER_UNITS_BSF 0
#define CONFIG_H264_METADATA_BSF 0 #define CONFIG_H264_METADATA_BSF 0
@@ -346,8 +346,8 @@ @@ -338,8 +338,8 @@
#define CONFIG_AAC_DECODER 1 #define CONFIG_AAC_DECODER 1
#define CONFIG_AAC_FIXED_DECODER 0 #define CONFIG_AAC_FIXED_DECODER 0
#define CONFIG_AAC_LATM_DECODER 0 #define CONFIG_AAC_LATM_DECODER 0
@ -275,7 +275,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ACELP_KELVIN_DECODER 0 #define CONFIG_ACELP_KELVIN_DECODER 0
#define CONFIG_ALAC_DECODER 0 #define CONFIG_ALAC_DECODER 0
#define CONFIG_ALS_DECODER 0 #define CONFIG_ALS_DECODER 0
@@ -378,7 +378,7 @@ @@ -370,7 +370,7 @@
#define CONFIG_DSICINAUDIO_DECODER 0 #define CONFIG_DSICINAUDIO_DECODER 0
#define CONFIG_DSS_SP_DECODER 0 #define CONFIG_DSS_SP_DECODER 0
#define CONFIG_DST_DECODER 0 #define CONFIG_DST_DECODER 0
@ -284,7 +284,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_EVRC_DECODER 0 #define CONFIG_EVRC_DECODER 0
#define CONFIG_FASTAUDIO_DECODER 0 #define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0 #define CONFIG_FFWAVESYNTH_DECODER 0
@@ -567,11 +567,11 @@ @@ -559,11 +559,11 @@
#define CONFIG_WEBVTT_DECODER 0 #define CONFIG_WEBVTT_DECODER 0
#define CONFIG_XSUB_DECODER 0 #define CONFIG_XSUB_DECODER 0
#define CONFIG_AAC_AT_DECODER 0 #define CONFIG_AAC_AT_DECODER 0
@ -298,7 +298,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_GSM_MS_AT_DECODER 0 #define CONFIG_GSM_MS_AT_DECODER 0
#define CONFIG_ILBC_AT_DECODER 0 #define CONFIG_ILBC_AT_DECODER 0
#define CONFIG_MP1_AT_DECODER 0 #define CONFIG_MP1_AT_DECODER 0
@@ -960,7 +960,7 @@ @@ -953,7 +953,7 @@
#define CONFIG_WMV3_VDPAU_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0
#define CONFIG_AAC_PARSER 1 #define CONFIG_AAC_PARSER 1
#define CONFIG_AAC_LATM_PARSER 0 #define CONFIG_AAC_LATM_PARSER 0
@ -307,7 +307,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_ADX_PARSER 0 #define CONFIG_ADX_PARSER 0
#define CONFIG_AMR_PARSER 0 #define CONFIG_AMR_PARSER 0
#define CONFIG_AV1_PARSER 0 #define CONFIG_AV1_PARSER 0
@@ -1626,7 +1626,7 @@ @@ -1619,7 +1619,7 @@
#define CONFIG_AA_DEMUXER 0 #define CONFIG_AA_DEMUXER 0
#define CONFIG_AAC_DEMUXER 1 #define CONFIG_AAC_DEMUXER 1
#define CONFIG_AAX_DEMUXER 0 #define CONFIG_AAX_DEMUXER 0
@ -316,7 +316,7 @@ index 4e79eb091b..3fb519b01d 100644
#define CONFIG_AC4_DEMUXER 0 #define CONFIG_AC4_DEMUXER 0
#define CONFIG_ACE_DEMUXER 0 #define CONFIG_ACE_DEMUXER 0
#define CONFIG_ACM_DEMUXER 0 #define CONFIG_ACM_DEMUXER 0
@@ -1709,7 +1709,7 @@ @@ -1703,7 +1703,7 @@
#define CONFIG_DXA_DEMUXER 0 #define CONFIG_DXA_DEMUXER 0
#define CONFIG_EA_DEMUXER 0 #define CONFIG_EA_DEMUXER 0
#define CONFIG_EA_CDATA_DEMUXER 0 #define CONFIG_EA_CDATA_DEMUXER 0
@ -348,10 +348,10 @@ index c85087a596..a9e086ef6d 100644
+ &ff_ac3_parser, + &ff_ac3_parser,
NULL }; NULL };
diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c
index 920b22bfa7..d6d293dc60 100644 index 29f1f59381..6fb0769ce7 100644
--- a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c --- a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c
+++ b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c +++ b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c
@@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { @@ -6,4 +6,6 @@ static const FFInputFormat * const demuxer_list[] = {
&ff_mp3_demuxer, &ff_mp3_demuxer,
&ff_ogg_demuxer, &ff_ogg_demuxer,
&ff_wav_demuxer, &ff_wav_demuxer,
@ -359,10 +359,10 @@ index 920b22bfa7..d6d293dc60 100644
+ &ff_eac3_demuxer, + &ff_eac3_demuxer,
NULL }; NULL };
diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
index 16e1b7c3ff..21439c5672 100644 index c279607332..012c89422f 100644
--- a/ffmpeg_generated.gni --- a/ffmpeg_generated.gni
+++ b/ffmpeg_generated.gni +++ b/ffmpeg_generated.gni
@@ -265,7 +265,19 @@ if ((is_apple && ffmpeg_branding == "Chrome") || @@ -267,7 +267,19 @@ if ((is_apple && ffmpeg_branding == "Chrome") ||
"libavcodec/hevc_sei.c", "libavcodec/hevc_sei.c",
"libavcodec/hevcdec.c", "libavcodec/hevcdec.c",
"libavcodec/hevcdsp.c", "libavcodec/hevcdsp.c",
@ -383,7 +383,7 @@ index 16e1b7c3ff..21439c5672 100644
] ]
ffmpeg_c_sources += [ ffmpeg_c_sources += [
@@ -324,7 +336,10 @@ if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") || @@ -326,7 +338,10 @@ if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
"libavcodec/x86/hevc_mc.asm", "libavcodec/x86/hevc_mc.asm",
"libavcodec/x86/hevc_sao.asm", "libavcodec/x86/hevc_sao.asm",
"libavcodec/x86/hevc_sao_10bit.asm", "libavcodec/x86/hevc_sao_10bit.asm",