From 6c11fb357ec39bf087b8b632e2b1e375aef1b38b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 16 May 2019 09:59:13 +0200 Subject: BASELINE: Update Chromium to 74.0.3729.159 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8d2497da544c275415aedd94dd25328d555de811 Reviewed-by: Michael Brüning --- .../chromium/config/Chromium/linux/x64/config.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h') diff --git a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h index 7a67ce5b4b2..5a6076ef74e 100644 --- a/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" -#define CONFIG_THIS_YEAR 2018 +#define CONFIG_THIS_YEAR 2019 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "clang version 8.0.0 (trunk 349417)" +#define CC_IDENT "clang version 9.0.0 (trunk 353250)" #define av_restrict restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -419,6 +419,7 @@ #define CONFIG_OPENSSL 0 #define CONFIG_LIBTLS 0 #define CONFIG_GMP 0 +#define CONFIG_LIBARIBB24 0 #define CONFIG_LIBLENSFUN 0 #define CONFIG_LIBOPENCORE_AMRNB 0 #define CONFIG_LIBOPENCORE_AMRWB 0 @@ -714,6 +715,7 @@ #define CONFIG_ANM_DECODER 0 #define CONFIG_ANSI_DECODER 0 #define CONFIG_APNG_DECODER 0 +#define CONFIG_ARBC_DECODER 0 #define CONFIG_ASV1_DECODER 0 #define CONFIG_ASV2_DECODER 0 #define CONFIG_AURA_DECODER 0 @@ -801,6 +803,7 @@ #define CONFIG_HQ_HQA_DECODER 0 #define CONFIG_HQX_DECODER 0 #define CONFIG_HUFFYUV_DECODER 0 +#define CONFIG_HYMT_DECODER 0 #define CONFIG_IDCIN_DECODER 0 #define CONFIG_IFF_ILBM_DECODER 0 #define CONFIG_IMM4_DECODER 0 @@ -1009,6 +1012,7 @@ #define CONFIG_G729_DECODER 0 #define CONFIG_GSM_DECODER 0 #define CONFIG_GSM_MS_DECODER 0 +#define CONFIG_HCOM_DECODER 0 #define CONFIG_IAC_DECODER 0 #define CONFIG_ILBC_DECODER 0 #define CONFIG_IMC_DECODER 0 @@ -1179,6 +1183,7 @@ #define CONFIG_QDMC_AT_DECODER 0 #define CONFIG_QDM2_AT_DECODER 0 #define CONFIG_LIBAOM_AV1_DECODER 0 +#define CONFIG_LIBARIBB24_DECODER 0 #define CONFIG_LIBCELT_DECODER 0 #define CONFIG_LIBCODEC2_DECODER 0 #define CONFIG_LIBDAV1D_DECODER 0 @@ -1321,6 +1326,7 @@ #define CONFIG_WMAV1_ENCODER 0 #define CONFIG_WMAV2_ENCODER 0 #define CONFIG_PCM_ALAW_ENCODER 0 +#define CONFIG_PCM_DVD_ENCODER 0 #define CONFIG_PCM_F32BE_ENCODER 0 #define CONFIG_PCM_F32LE_ENCODER 0 #define CONFIG_PCM_F64BE_ENCODER 0 @@ -1500,7 +1506,9 @@ #define CONFIG_DVDSUB_PARSER 0 #define CONFIG_DVD_NAV_PARSER 0 #define CONFIG_FLAC_PARSER 1 +#define CONFIG_G723_1_PARSER 0 #define CONFIG_G729_PARSER 0 +#define CONFIG_GIF_PARSER 0 #define CONFIG_GSM_PARSER 0 #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 @@ -1591,6 +1599,7 @@ #define CONFIG_AMIX_FILTER 0 #define CONFIG_AMULTIPLY_FILTER 0 #define CONFIG_ANEQUALIZER_FILTER 0 +#define CONFIG_ANLMDN_FILTER 0 #define CONFIG_ANULL_FILTER 0 #define CONFIG_APAD_FILTER 0 #define CONFIG_APERMS_FILTER 0 @@ -1798,6 +1807,7 @@ #define CONFIG_LUTYUV_FILTER 0 #define CONFIG_MASKEDCLAMP_FILTER 0 #define CONFIG_MASKEDMERGE_FILTER 0 +#define CONFIG_MASKFUN_FILTER 0 #define CONFIG_MCDEINT_FILTER 0 #define CONFIG_MERGEPLANES_FILTER 0 #define CONFIG_MESTIMATE_FILTER 0 @@ -1905,6 +1915,8 @@ #define CONFIG_TPAD_FILTER 0 #define CONFIG_TRANSPOSE_FILTER 0 #define CONFIG_TRANSPOSE_NPP_FILTER 0 +#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 +#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 #define CONFIG_TRIM_FILTER 0 #define CONFIG_UNPREMULTIPLY_FILTER 0 #define CONFIG_UNSHARP_FILTER 0 @@ -2066,6 +2078,7 @@ #define CONFIG_H261_DEMUXER 0 #define CONFIG_H263_DEMUXER 0 #define CONFIG_H264_DEMUXER 0 +#define CONFIG_HCOM_DEMUXER 0 #define CONFIG_HEVC_DEMUXER 0 #define CONFIG_HLS_DEMUXER 0 #define CONFIG_HNM_DEMUXER 0 @@ -2214,6 +2227,7 @@ #define CONFIG_VAG_DEMUXER 0 #define CONFIG_VC1_DEMUXER 0 #define CONFIG_VC1T_DEMUXER 0 +#define CONFIG_VIVIDAS_DEMUXER 0 #define CONFIG_VIVO_DEMUXER 0 #define CONFIG_VMD_DEMUXER 0 #define CONFIG_VOBSUB_DEMUXER 0 @@ -2243,6 +2257,7 @@ #define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -- cgit v1.2.1