diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 01:08:32 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 01:08:32 +0000 |
| commit | d94b5f4e912342758398b5c4e115a933e69424e3 (patch) | |
| tree | 6e55e51aae0bdf298850f7d03aa75a8d48da257f | |
| parent | 084b3c4606dae11279a747f9493e7ddd1a54ab0c (diff) | |
| download | chromium_src-d94b5f4e912342758398b5c4e115a933e69424e3.zip chromium_src-d94b5f4e912342758398b5c4e115a933e69424e3.tar.gz chromium_src-d94b5f4e912342758398b5c4e115a933e69424e3.tar.bz2 | |
ffmpeg new config files for roll5
BUG=none
TEST=ffmpeg should still build
Review URL: http://codereview.chromium.org/1564004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43794 0039d316-1c4b-4281-b951-d872f2087c98
22 files changed, 118 insertions, 12 deletions
@@ -2,7 +2,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "57160", - "ffmpeg_revision": "42726", + "ffmpeg_revision": "43776", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index c6887c5..7426aa5 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -97,6 +97,7 @@ 'source/patched-ffmpeg-mt/libavcodec/raw.c', 'source/patched-ffmpeg-mt/libavcodec/simple_idct.c', 'source/patched-ffmpeg-mt/libavcodec/utils.c', + 'source/patched-ffmpeg-mt/libavformat/vorbiscomment.c', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/vorbis.c', 'source/patched-ffmpeg-mt/libavcodec/vorbis_data.c', 'source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c', @@ -161,6 +162,7 @@ 'source/patched-ffmpeg-mt/libavcodec/h264_ps.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/h264_refs.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/h264_sei.c', # TODO(fbarchard): Review this file. + 'source/patched-ffmpeg-mt/libavcodec/h264dsp.c', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/h264idct.c', 'source/patched-ffmpeg-mt/libavcodec/h264pred.c', 'source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c', @@ -302,6 +304,9 @@ 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c', 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c', 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', # TODO(fbarchard): Roll5 Review this file. + 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', + 'source/patched-ffmpeg-mt/libavcodec/rdft.c', 'source/patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S', @@ -315,6 +320,7 @@ 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/fft_neon.S', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/int_neon.S', # TODO(fbarchard): Review this file. + 'source/patched-ffmpeg-mt/libavcodec/arm/rdft_neon.S', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.S', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/mdct_neon.S', # TODO(fbarchard): Review this file. @@ -324,7 +330,6 @@ }], # target_arch=="arm" ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', { 'sources': [ - 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_arm.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te_s.S', @@ -332,6 +337,7 @@ 'conditions': [ ['arm_neon==1', { 'sources': [ + 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/h264idct_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_neon.S', diff --git a/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h index 0e0e2b3..100b46d 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/arm-neon/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h index 8de3a19..ed60bba 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h index 58bea50..d53b272 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h index b964430..2d528b4 100644 --- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h index f0316ee..523447a 100644 --- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 1 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -608,12 +611,12 @@ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -#define CONFIG_VC1_ASFTORCV_BSF 0 -#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_MOV2TEXTSUB_BSF 0 #define CONFIG_NOISE_BSF 0 #define CONFIG_REMOVE_EXTRADATA_BSF 0 #define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_VC1_ASFTORCV_BSF 0 +#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_AAC_DEMUXER 0 #define CONFIG_AC3_DEMUXER 0 #define CONFIG_AEA_DEMUXER 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h index 470f51f..235f629 100644 --- a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 0 #define HAVE_SETRLIMIT 0 +#define HAVE_STRERROR_R 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -608,12 +611,12 @@ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -#define CONFIG_VC1_ASFTORCV_BSF 0 -#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_MOV2TEXTSUB_BSF 0 #define CONFIG_NOISE_BSF 0 #define CONFIG_REMOVE_EXTRADATA_BSF 0 #define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_VC1_ASFTORCV_BSF 0 +#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_AAC_DEMUXER 0 #define CONFIG_AC3_DEMUXER 0 #define CONFIG_AEA_DEMUXER 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h index 0b18132..33c27e3 100644 --- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h +++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h index f295702..ea0c903 100644 --- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h index e33fbb8..b222102 100644 --- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h index 4111102..cd52d8c 100644 --- a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 1 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h index 660e803..07fd6b5 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/arm-neon/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h index b9af34b..b823e82 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h index 0bfc5a9..c11882d 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h index 6a9b179..e834a9d 100644 --- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h index 9073b04..7fa24b3 100644 --- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 1 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -608,12 +611,12 @@ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -#define CONFIG_VC1_ASFTORCV_BSF 0 -#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_MOV2TEXTSUB_BSF 0 #define CONFIG_NOISE_BSF 0 #define CONFIG_REMOVE_EXTRADATA_BSF 0 #define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_VC1_ASFTORCV_BSF 0 +#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_AAC_DEMUXER 0 #define CONFIG_AC3_DEMUXER 0 #define CONFIG_AEA_DEMUXER 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h index 6146c20..415859a 100644 --- a/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h +++ b/third_party/ffmpeg/source/config/Chromium/win/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chromium-ffmpeg" +#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chromium-ffmpeg" #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg" #define CC_TYPE "gcc" @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 0 #define HAVE_SETRLIMIT 0 +#define HAVE_STRERROR_R 0 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,17 +158,19 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 #define CONFIG_FFPLAY 0 -#define CONFIG_FFPROBE 1 +#define CONFIG_FFPROBE 0 #define CONFIG_FFSERVER 0 #define CONFIG_FFT 1 #define CONFIG_GOLOMB 1 #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -608,12 +611,12 @@ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 -#define CONFIG_VC1_ASFTORCV_BSF 0 -#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_MOV2TEXTSUB_BSF 0 #define CONFIG_NOISE_BSF 0 #define CONFIG_REMOVE_EXTRADATA_BSF 0 #define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_VC1_ASFTORCV_BSF 0 +#define CONFIG_VC1_ASFTOANNEXG_BSF 0 #define CONFIG_AAC_DEMUXER 0 #define CONFIG_AC3_DEMUXER 0 #define CONFIG_AEA_DEMUXER 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h index 886adc3..483279e1 100644 --- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h +++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm-neon/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h index dfba42b..6abf718 100644 --- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h +++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h index 92d1807..d1fd4e5 100644 --- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h +++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h index e94848f..2296cb7 100644 --- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h +++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h @@ -116,6 +116,7 @@ #define HAVE_SOUNDCARD_H 0 #define HAVE_POLL_H 1 #define HAVE_SETRLIMIT 1 +#define HAVE_STRERROR_R 1 #define HAVE_STRUCT_ADDRINFO 0 #define HAVE_STRUCT_IPV6_MREQ 0 #define HAVE_STRUCT_SOCKADDR_IN6 0 @@ -157,6 +158,7 @@ #define CONFIG_BZLIB 0 #define CONFIG_DCT 0 #define CONFIG_DOC 0 +#define CONFIG_DWT 0 #define CONFIG_DXVA2 0 #define CONFIG_FASTDIV 1 #define CONFIG_FFMPEG 0 @@ -168,6 +170,7 @@ #define CONFIG_GPL 0 #define CONFIG_GPROF 0 #define CONFIG_GRAY 0 +#define CONFIG_H264DSP 0 #define CONFIG_HARDCODED_TABLES 0 #define CONFIG_LIBDC1394 0 #define CONFIG_LIBDIRAC 0 @@ -838,10 +841,12 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_YUV4MPEGPIPE_MUXER 0 #define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_ASPECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 #define CONFIG_NULL_FILTER 0 +#define CONFIG_PIXELASPECT_FILTER 0 #define CONFIG_SCALE_FILTER 0 #define CONFIG_SLICIFY_FILTER 0 #define CONFIG_VFLIP_FILTER 0 |