ffmpeg roll to new source that includes HE AAC

BUG=35850
TEST=FFMPEG should still build/run
Review URL: http://codereview.chromium.org/862005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41893 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 390 insertions, 50 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 3184745..47a4853 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -2,11 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# TODO(fbarchard): Turn off --enable-memalign-hack for all but windows.
+# TODO(fbarchard): Add wmapro.
 # TODO(ajwong): Determine if we want to statically link libz.
 
-
-
 {
   'target_defaults': {
     'conditions': [
@@ -151,6 +149,7 @@
                 'source/patched-ffmpeg-mt/libavcodec/aac.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_parser.c',
+                'source/patched-ffmpeg-mt/libavcodec/aacsbr.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/aactab.c',
                 'source/patched-ffmpeg-mt/libavcodec/cabac.c',
                 'source/patched-ffmpeg-mt/libavcodec/error_resilience.c',
@@ -173,6 +172,7 @@
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudiodec.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegaudiodecheader.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c',
+                'source/patched-ffmpeg-mt/libavcodec/rdft.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavformat/gxf.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavformat/id3v2.c',
                 'source/patched-ffmpeg-mt/libavformat/isom.c',
@@ -190,9 +190,9 @@
             }],  # ffmpeg_branding
             ['ffmpeg_branding=="ChromeOS"', {
               'sources': [
-		'source/patched-ffmpeg-mt/libavcodec/aandcttab.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/error_resilience.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/faandct.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/aandcttab.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/error_resilience.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/faandct.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263.c',
                 'source/patched-ffmpeg-mt/libavcodec/h263_parser.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/h263dec.c',
@@ -200,22 +200,22 @@
                 'source/patched-ffmpeg-mt/libavcodec/intrax8.c',
                 'source/patched-ffmpeg-mt/libavcodec/intrax8dsp.c',
                 'source/patched-ffmpeg-mt/libavcodec/ituh263dec.c', # TODO(fbarchard): Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/ituh263enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/jfdctint.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/jfdctfst.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/motion_est.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/ituh263enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/jfdctint.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/jfdctfst.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/motion_est.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4data.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.c', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video.h', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c', # TODO(fbarchard): Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/mpeg4videoenc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
-		'source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpeg4videoenc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4.c',
                 'source/patched-ffmpeg-mt/libavcodec/msmpeg4data.c',
-		'source/patched-ffmpeg-mt/libavcodec/ratecontrol.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
+                'source/patched-ffmpeg-mt/libavcodec/ratecontrol.c', # TODO(fbarchard): For mpeg4 bsf. Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/vc1.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1data.c',
                 'source/patched-ffmpeg-mt/libavcodec/vc1dec.c', # TODO(fbarchard): Review this file.
@@ -273,7 +273,7 @@
             ['target_arch=="ia32"', {
               'cflags!': [
                 # Turn off valgrind build option that breaks ffmpeg builds.
-		# Allows config.h HAVE_EBP_AVAILABLE 1 and HAVE_EBX_AVAILABLE 1
+                # Allows config.h HAVE_EBP_AVAILABLE 1 and HAVE_EBX_AVAILABLE 1
                 '-fno-omit-frame-pointer',
               ],
             }],  # target_arch=="ia32"
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 cde222c..09f7bf9 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
@@ -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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 bb174c4..d356cc8 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/arm/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 8d35989..595b0ac 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 0
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 375c167..befeedf 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 0
 #define ARCH_X86_64 1
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 47cee09..f0316ee 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 f3fff16..470f51f 100644
--- a/third_party/ffmpeg/source/config/Chrome/win/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/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 "--enable-pthreads --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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-pthreads --enable-yasm --enable-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 0
 #define HAVE_GETADDRINFO 0
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 1
 #define HAVE_GETPROCESSTIMES 1
 #define HAVE_GETRUSAGE 0
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_INET_ATON 0
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 0
+#define HAVE_SETRLIMIT 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 1
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 0
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 f6bd13d..545783f 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
@@ -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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 34cd707..28d5c40 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 adb916c..9a745be 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 0
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 63997bd..1959efb 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/x64/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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-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-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-demuxer=mp3 --enable-demuxer=mov --enable-parser=mpegaudio --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-bsf=mpeg4video_es --enable-bsf=vc1_asftorcv --enable-bsf=vc1_asftoannexg --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chrome-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 0
 #define ARCH_X86_64 1
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -189,7 +197,7 @@
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_POWERPC_PERF 0
-#define CONFIG_RDFT 0
+#define CONFIG_RDFT 1
 #define CONFIG_RUNTIME_CPUDETECT 0
 #define CONFIG_SHARED 1
 #define CONFIG_SMALL 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 1
 #define CONFIG_WMAV2_DECODER 1
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 cae1413..aa75d83 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
@@ -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-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --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-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 0923026..c7ae512 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/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-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --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-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 fb3ec31..1187e2b 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/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 --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --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 --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 c3a5ee0..94fcbcb 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/x64/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 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --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 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 0
 #define ARCH_X86_64 1
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 62f8bc2..9073b04 100644
--- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/mac/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 --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --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 --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 2507f33..6146c20 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 "--enable-pthreads --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-memalign-hack --cc=gcc-sjlj --extra-cflags=-O2 --prefix=./chromium-ffmpeg"
+#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_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 0
 #define HAVE_GETADDRINFO 0
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 1
 #define HAVE_GETPROCESSTIMES 1
 #define HAVE_GETRUSAGE 0
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 #define HAVE_INET_ATON 0
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 0
+#define HAVE_SETRLIMIT 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 1
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 1
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 07926dc..6e5df67 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
@@ -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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 8b0a26f..e26d453 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 0
 #define ARCH_X86_32 0
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 0
+#define HAVE_LOCAL_ALIGNED_8 0
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 42354bd..0914f16 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 1
 #define ARCH_X86_64 0
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 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 c11ab4f..22eceeb 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --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-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
 #define ARCH_SH4 0
 #define ARCH_SPARC 0
 #define ARCH_SPARC64 0
+#define ARCH_TOMI 0
 #define ARCH_X86 1
 #define ARCH_X86_32 0
 #define ARCH_X86_64 1
@@ -80,8 +81,10 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOG2 1
 #define HAVE_LOG2F 1
 #define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
 #define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
 #define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
 #define CONFIG_FASTDIV 1
 #define CONFIG_FFMPEG 0
 #define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBXVID 0
 #define CONFIG_LPC 0
+#define CONFIG_LSP 0
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_BETHSOFTVID_DECODER 0
 #define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HUFFYUV_DECODER 0
 #define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMVC_DECODER 0
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
 #define CONFIG_AC3_DECODER 0
 #define CONFIG_ALAC_DECODER 0
 #define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
 #define CONFIG_APE_DECODER 0
 #define CONFIG_ATRAC1_DECODER 0
 #define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROQ_MUXER 0
 #define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AUDIO_BEOS_INDEV 0
 #define CONFIG_BKTR_INDEV 0