projects / platform / framework / web / chromium-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 34072ef)
[m42] Add arm64 support to ffmpeg
authorAntonio Gomes <a1.gomes@samsung.com>
Thu, 21 May 2015 22:09:39 +0000 (15:09 -0700)
committerYoungsoo Choi <kenshin.choi@samsung.com>
Tue, 10 Jul 2018 06:57:09 +0000 (06:57 +0000)
The following commands were executed within arm64 GBS wayland chroot:

$ # enter chroot
$ gbs chroot --root ~/GBS-ROOT-3.0-MOBILE-ARM64-WAYLAND/local/BUILD-ROOTS/scratch.aarch64.0/
$ # copy over src/third_party/ffmpeg to chroot (e.g.: /home/abuild)
$ cd ffmpeg
$ ./chromium/scripts/build_ffmpeg.py linux arm64
$ ./chromium/scripts/copy_config.sh
$ # edit chromium/scripts/generate_gyp.py; add "arm64" to support platforms.
$ python chromium/scripts/generate_gyp.py
$ edit ffmpeg.gyp; add "asm_sources" to the build
$ # generate the patch against a unchanged ffmpeg copy

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=12490
Reviewed by: SeungSeop Park, arno renevier

Change-Id: I7aaab106225cf9a65d97977e9c24220d7ab863c5
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>
tizen_src/build/apply_patches.sh patch | blob | history
tizen_src/build/patches/ffmpeg_arm64bit_support.diff [new file with mode: 0644] patch | blob

diff --git a/tizen_src/build/apply_patches.sh b/tizen_src/build/apply_patches.sh
index 72f1e20..d59eb38 100755 (executable)
--- a/tizen_src/build/apply_patches.sh
+++ b/tizen_src/build/apply_patches.sh
@@ -3,7 +3,7 @@
 function silentApply() {
   PATCH=$(readlink -f $1)
   patch -d ${CHROME_SRC} --forward --reject-file=- -p1 -i $PATCH >/dev/null
-  if [ "$?" -gt 1 ]; then
+  if [ "$?" -gt 0 ]; then
     >&2 echo "failed applying $1"
   fi
 }
@@ -25,7 +25,7 @@ function silentDeapply() {
 echo "$@" | grep -q "\-r" && REVERSE=1
 
 patchdir=${TOPDIR}/tizen_src/build/patches
-for patch in $(find $patchdir -name *.diff); do
+for patch in $patchdir/*.diff; do
   if [ -z "$REVERSE" ]; then
     silentApply $patch
   else
diff --git a/tizen_src/build/patches/ffmpeg_arm64bit_support.diff b/tizen_src/build/patches/ffmpeg_arm64bit_support.diff
new file mode 100644 (file)
index 0000000..a4a4be2
--- /dev/null
+++ b/tizen_src/build/patches/ffmpeg_arm64bit_support.diff
@@ -0,0 +1,1611 @@
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/Chrome/linux/arm64/config.h src/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h
+--- src/third_party/ffmpeg-orig/chromium/config/Chrome/linux/arm64/config.h    2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h 2015-05-21 19:19:02.000000000 +0000
+@@ -1,17 +1,17 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+-#define CONFIG_THIS_YEAR 2014
++#define CONFIG_THIS_YEAR 2015
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+-#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
++#define CC_IDENT "gcc 4.9 (Tizen)"
+ #define av_restrict restrict
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM 
+ #define BUILDSUF ""
+ #define SLIBSUF ".so"
+ #define HAVE_MMX2 HAVE_MMXEXT
+ #define SWS_MAX_FILTER_SIZE 256
+ #define ARCH_AARCH64 1
+@@ -169,17 +169,16 @@
+ #define HAVE_FAST_UNALIGNED 1
+ #define HAVE_INCOMPATIBLE_LIBAV_ABI 0
+ #define HAVE_ALSA_ASOUNDLIB_H 0
+ #define HAVE_ALTIVEC_H 0
+ #define HAVE_ARPA_INET_H 0
+ #define HAVE_ASM_TYPES_H 1
+ #define HAVE_CDIO_PARANOIA_H 0
+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+-#define HAVE_CL_CL_H 0
+ #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
+ #define HAVE_DEV_IC_BT8XX_H 0
+ #define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
+ #define HAVE_DIRECT_H 0
+ #define HAVE_DLFCN_H 1
+ #define HAVE_DXVA_H 0
+@@ -261,17 +260,16 @@
+ #define HAVE_INET_ATON 0
+ #define HAVE_ISATTY 1
+ #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+ #define HAVE_KBHIT 0
+ #define HAVE_LOCALTIME_R 1
+ #define HAVE_LZO1X_999_COMPRESS 0
+ #define HAVE_MACH_ABSOLUTE_TIME 0
+ #define HAVE_MAPVIEWOFFILE 0
+-#define HAVE_MOVEFILEEXA 0
+ #define HAVE_MEMALIGN 1
+ #define HAVE_MKSTEMP 1
+ #define HAVE_MMAP 1
+ #define HAVE_MPROTECT 1
+ #define HAVE_NANOSLEEP 1
+ #define HAVE_PEEKNAMEDPIPE 0
+ #define HAVE_POSIX_MEMALIGN 1
+ #define HAVE_PTHREAD_CANCEL 1
+@@ -298,23 +296,24 @@
+ #define HAVE_EBX_AVAILABLE 0
+ #define HAVE_GNU_AS 1
+ #define HAVE_GNU_WINDRES 0
+ #define HAVE_IBM_ASM 0
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 0
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+ #define HAVE_XFORM_ASM 0
+ #define HAVE_XMM_CLOBBERS 0
+ #define HAVE_CONDITION_VARIABLE_PTR 0
++#define HAVE_DXVA_PICPARAMS_HEVC 0
+ #define HAVE_SOCKLEN_T 0
+ #define HAVE_STRUCT_ADDRINFO 0
+ #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+ #define HAVE_STRUCT_IP_MREQ_SOURCE 0
+ #define HAVE_STRUCT_IPV6_MREQ 0
+ #define HAVE_STRUCT_POLLFD 0
+ #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+ #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
+@@ -325,41 +324,42 @@
+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
+ #define HAVE_ATOMICS_NATIVE 1
+ #define HAVE_DOS_PATHS 0
+ #define HAVE_DXVA2API_COBJ 0
+ #define HAVE_DXVA2_LIB 0
+ #define HAVE_LIBC_MSVCRT 0
+ #define HAVE_LIBDC1394_1 0
+ #define HAVE_LIBDC1394_2 0
+-#define HAVE_MAKEINFO 1
+-#define HAVE_MAKEINFO_HTML 1
++#define HAVE_MAKEINFO 0
++#define HAVE_MAKEINFO_HTML 0
+ #define HAVE_PERL 1
+ #define HAVE_POD2MAN 1
+ #define HAVE_SDL 0
++#define HAVE_SECTION_DATA_REL_RO 1
+ #define HAVE_TEXI2HTML 0
+ #define HAVE_THREADS 1
+ #define HAVE_VDPAU_X11 0
+ #define HAVE_XLIB 0
+ #define CONFIG_BSFS 0
+ #define CONFIG_DECODERS 1
+ #define CONFIG_DEMUXERS 1
+ #define CONFIG_ENCODERS 0
+ #define CONFIG_FILTERS 0
+ #define CONFIG_HWACCELS 0
+ #define CONFIG_INDEVS 0
+ #define CONFIG_MUXERS 0
+ #define CONFIG_OUTDEVS 0
+ #define CONFIG_PARSERS 1
+ #define CONFIG_PROTOCOLS 0
+ #define CONFIG_DOC 0
+-#define CONFIG_HTMLPAGES 1
++#define CONFIG_HTMLPAGES 0
+ #define CONFIG_MANPAGES 1
+ #define CONFIG_PODPAGES 1
+-#define CONFIG_TXTPAGES 1
++#define CONFIG_TXTPAGES 0
+ #define CONFIG_AVIO_READING_EXAMPLE 1
+ #define CONFIG_DECODING_ENCODING_EXAMPLE 1
+ #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+ #define CONFIG_EXTRACT_MVS_EXAMPLE 1
+ #define CONFIG_FILTER_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+ #define CONFIG_METADATA_EXAMPLE 1
+@@ -396,16 +396,17 @@
+ #define CONFIG_LIBIEC61883 0
+ #define CONFIG_LIBILBC 0
+ #define CONFIG_LIBMODPLUG 0
+ #define CONFIG_LIBMP3LAME 0
+ #define CONFIG_LIBNUT 0
+ #define CONFIG_LIBOPENCORE_AMRNB 0
+ #define CONFIG_LIBOPENCORE_AMRWB 0
+ #define CONFIG_LIBOPENCV 0
++#define CONFIG_LIBOPENH264 0
+ #define CONFIG_LIBOPENJPEG 0
+ #define CONFIG_LIBOPUS 0
+ #define CONFIG_LIBPULSE 0
+ #define CONFIG_LIBQUVI 0
+ #define CONFIG_LIBRTMP 0
+ #define CONFIG_LIBSCHROEDINGER 0
+ #define CONFIG_LIBSHINE 0
+ #define CONFIG_LIBSMBCLIENT 0
+@@ -430,16 +431,17 @@
+ #define CONFIG_LIBXCB 0
+ #define CONFIG_LIBXCB_SHM 0
+ #define CONFIG_LIBXCB_SHAPE 0
+ #define CONFIG_LIBXCB_XFIXES 0
+ #define CONFIG_LIBXVID 0
+ #define CONFIG_LIBZMQ 0
+ #define CONFIG_LIBZVBI 0
+ #define CONFIG_LZMA 0
++#define CONFIG_NVENC 0
+ #define CONFIG_OPENAL 0
+ #define CONFIG_OPENCL 0
+ #define CONFIG_OPENGL 0
+ #define CONFIG_OPENSSL 0
+ #define CONFIG_SDL 0
+ #define CONFIG_X11GRAB 0
+ #define CONFIG_XLIB 0
+ #define CONFIG_ZLIB 0
+@@ -918,16 +920,17 @@
+ #define CONFIG_ADPCM_SWF_DECODER 0
+ #define CONFIG_ADPCM_THP_DECODER 0
+ #define CONFIG_ADPCM_VIMA_DECODER 0
+ #define CONFIG_ADPCM_XA_DECODER 0
+ #define CONFIG_ADPCM_YAMAHA_DECODER 0
+ #define CONFIG_VIMA_DECODER 0
+ #define CONFIG_SSA_DECODER 0
+ #define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
+ #define CONFIG_DVBSUB_DECODER 0
+ #define CONFIG_DVDSUB_DECODER 0
+ #define CONFIG_JACOSUB_DECODER 0
+ #define CONFIG_MICRODVD_DECODER 0
+ #define CONFIG_MOVTEXT_DECODER 0
+ #define CONFIG_MPL2_DECODER 0
+ #define CONFIG_PGSSUB_DECODER 0
+ #define CONFIG_PJS_DECODER 0
+@@ -1005,16 +1008,17 @@
+ #define CONFIG_DFA_DEMUXER 0
+ #define CONFIG_DIRAC_DEMUXER 0
+ #define CONFIG_DNXHD_DEMUXER 0
+ #define CONFIG_DSF_DEMUXER 0
+ #define CONFIG_DSICIN_DEMUXER 0
+ #define CONFIG_DTS_DEMUXER 0
+ #define CONFIG_DTSHD_DEMUXER 0
+ #define CONFIG_DV_DEMUXER 0
++#define CONFIG_DVBSUB_DEMUXER 0
+ #define CONFIG_DXA_DEMUXER 0
+ #define CONFIG_EA_DEMUXER 0
+ #define CONFIG_EA_CDATA_DEMUXER 0
+ #define CONFIG_EAC3_DEMUXER 0
+ #define CONFIG_EPAF_DEMUXER 0
+ #define CONFIG_FFM_DEMUXER 0
+ #define CONFIG_FFMETADATA_DEMUXER 0
+ #define CONFIG_FILMSTRIP_DEMUXER 0
+@@ -1230,16 +1234,17 @@
+ #define CONFIG_LJPEG_ENCODER 0
+ #define CONFIG_MJPEG_ENCODER 0
+ #define CONFIG_MPEG1VIDEO_ENCODER 0
+ #define CONFIG_MPEG2VIDEO_ENCODER 0
+ #define CONFIG_MPEG4_ENCODER 0
+ #define CONFIG_MSMPEG4V2_ENCODER 0
+ #define CONFIG_MSMPEG4V3_ENCODER 0
+ #define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
+ #define CONFIG_PAM_ENCODER 0
+ #define CONFIG_PBM_ENCODER 0
+ #define CONFIG_PCX_ENCODER 0
+ #define CONFIG_PGM_ENCODER 0
+ #define CONFIG_PGMYUV_ENCODER 0
+ #define CONFIG_PNG_ENCODER 0
+ #define CONFIG_PPM_ENCODER 0
+ #define CONFIG_PRORES_ENCODER 0
+@@ -1359,16 +1364,17 @@
+ #define CONFIG_LIBWAVPACK_ENCODER 0
+ #define CONFIG_LIBWEBP_ENCODER 0
+ #define CONFIG_LIBX264_ENCODER 0
+ #define CONFIG_LIBX264RGB_ENCODER 0
+ #define CONFIG_LIBX265_ENCODER 0
+ #define CONFIG_LIBXAVS_ENCODER 0
+ #define CONFIG_LIBXVID_ENCODER 0
+ #define CONFIG_LIBAACPLUS_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
+ #define CONFIG_ADELAY_FILTER 0
+ #define CONFIG_AECHO_FILTER 0
+ #define CONFIG_AEVAL_FILTER 0
+ #define CONFIG_AFADE_FILTER 0
+ #define CONFIG_AFORMAT_FILTER 0
+ #define CONFIG_AINTERLEAVE_FILTER 0
+ #define CONFIG_ALLPASS_FILTER 0
+ #define CONFIG_AMERGE_FILTER 0
+@@ -1427,41 +1433,44 @@
+ #define CONFIG_BBOX_FILTER 0
+ #define CONFIG_BLACKDETECT_FILTER 0
+ #define CONFIG_BLACKFRAME_FILTER 0
+ #define CONFIG_BLEND_FILTER 0
+ #define CONFIG_BOXBLUR_FILTER 0
+ #define CONFIG_CODECVIEW_FILTER 0
+ #define CONFIG_COLORBALANCE_FILTER 0
+ #define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
+ #define CONFIG_COLORMATRIX_FILTER 0
+ #define CONFIG_COPY_FILTER 0
+ #define CONFIG_CROP_FILTER 0
+ #define CONFIG_CROPDETECT_FILTER 0
+ #define CONFIG_CURVES_FILTER 0
+ #define CONFIG_DCTDNOIZ_FILTER 0
+ #define CONFIG_DECIMATE_FILTER 0
+ #define CONFIG_DEJUDDER_FILTER 0
+ #define CONFIG_DELOGO_FILTER 0
+ #define CONFIG_DESHAKE_FILTER 0
+ #define CONFIG_DRAWBOX_FILTER 0
+ #define CONFIG_DRAWGRID_FILTER 0
+ #define CONFIG_DRAWTEXT_FILTER 0
+ #define CONFIG_EDGEDETECT_FILTER 0
+ #define CONFIG_ELBG_FILTER 0
++#define CONFIG_EQ_FILTER 0
+ #define CONFIG_EXTRACTPLANES_FILTER 0
+ #define CONFIG_FADE_FILTER 0
+ #define CONFIG_FIELD_FILTER 0
+ #define CONFIG_FIELDMATCH_FILTER 0
+ #define CONFIG_FIELDORDER_FILTER 0
+ #define CONFIG_FORMAT_FILTER 0
+ #define CONFIG_FPS_FILTER 0
+ #define CONFIG_FRAMEPACK_FILTER 0
+ #define CONFIG_FRAMESTEP_FILTER 0
+ #define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
+ #define CONFIG_GEQ_FILTER 0
+ #define CONFIG_GRADFUN_FILTER 0
+ #define CONFIG_HALDCLUT_FILTER 0
+ #define CONFIG_HFLIP_FILTER 0
+ #define CONFIG_HISTEQ_FILTER 0
+ #define CONFIG_HISTOGRAM_FILTER 0
+ #define CONFIG_HQDN3D_FILTER 0
+ #define CONFIG_HQX_FILTER 0
+@@ -1488,47 +1497,52 @@
+ #define CONFIG_OVERLAY_FILTER 0
+ #define CONFIG_OWDENOISE_FILTER 0
+ #define CONFIG_PAD_FILTER 0
+ #define CONFIG_PERMS_FILTER 0
+ #define CONFIG_PERSPECTIVE_FILTER 0
+ #define CONFIG_PHASE_FILTER 0
+ #define CONFIG_PIXDESCTEST_FILTER 0
+ #define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
+ #define CONFIG_PSNR_FILTER 0
+ #define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
+ #define CONFIG_REMOVELOGO_FILTER 0
+ #define CONFIG_ROTATE_FILTER 0
+ #define CONFIG_SAB_FILTER 0
+ #define CONFIG_SCALE_FILTER 0
+ #define CONFIG_SELECT_FILTER 0
+ #define CONFIG_SENDCMD_FILTER 0
+ #define CONFIG_SEPARATEFIELDS_FILTER 0
+ #define CONFIG_SETDAR_FILTER 0
+ #define CONFIG_SETFIELD_FILTER 0
+ #define CONFIG_SETPTS_FILTER 0
+ #define CONFIG_SETSAR_FILTER 0
+ #define CONFIG_SETTB_FILTER 0
+ #define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
+ #define CONFIG_SHUFFLEPLANES_FILTER 0
+ #define CONFIG_SIGNALSTATS_FILTER 0
+ #define CONFIG_SMARTBLUR_FILTER 0
+ #define CONFIG_SPLIT_FILTER 0
+ #define CONFIG_SPP_FILTER 0
+ #define CONFIG_STEREO3D_FILTER 0
+ #define CONFIG_SUBTITLES_FILTER 0
+ #define CONFIG_SUPER2XSAI_FILTER 0
+ #define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
+ #define CONFIG_TELECINE_FILTER 0
+ #define CONFIG_THUMBNAIL_FILTER 0
+ #define CONFIG_TILE_FILTER 0
+ #define CONFIG_TINTERLACE_FILTER 0
+ #define CONFIG_TRANSPOSE_FILTER 0
+ #define CONFIG_TRIM_FILTER 0
+ #define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_USPP_FILTER 0
+ #define CONFIG_VFLIP_FILTER 0
+ #define CONFIG_VIDSTABDETECT_FILTER 0
+ #define CONFIG_VIDSTABTRANSFORM_FILTER 0
+ #define CONFIG_VIGNETTE_FILTER 0
+ #define CONFIG_W3FDIF_FILTER 0
+ #define CONFIG_XBR_FILTER 0
+ #define CONFIG_YADIF_FILTER 0
+ #define CONFIG_ZMQ_FILTER 0
+@@ -1555,16 +1569,17 @@
+ #define CONFIG_MOVIE_FILTER 0
+ #define CONFIG_H263_VAAPI_HWACCEL 0
+ #define CONFIG_H263_VDPAU_HWACCEL 0
+ #define CONFIG_H264_DXVA2_HWACCEL 0
+ #define CONFIG_H264_VAAPI_HWACCEL 0
+ #define CONFIG_H264_VDA_HWACCEL 0
+ #define CONFIG_H264_VDA_OLD_HWACCEL 0
+ #define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG1_XVMC_HWACCEL 0
+ #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG2_XVMC_HWACCEL 0
+ #define CONFIG_MPEG2_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG2_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG2_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG4_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+@@ -1700,16 +1715,17 @@
+ #define CONFIG_PCM_U16LE_MUXER 0
+ #define CONFIG_PCM_U8_MUXER 0
+ #define CONFIG_PSP_MUXER 0
+ #define CONFIG_RAWVIDEO_MUXER 0
+ #define CONFIG_RM_MUXER 0
+ #define CONFIG_ROQ_MUXER 0
+ #define CONFIG_RSO_MUXER 0
+ #define CONFIG_RTP_MUXER 0
++#define CONFIG_RTP_MPEGTS_MUXER 0
+ #define CONFIG_RTSP_MUXER 0
+ #define CONFIG_SAP_MUXER 0
+ #define CONFIG_SEGMENT_MUXER 0
+ #define CONFIG_STREAM_SEGMENT_MUXER 0
+ #define CONFIG_SMJPEG_MUXER 0
+ #define CONFIG_SMOOTHSTREAMING_MUXER 0
+ #define CONFIG_SOX_MUXER 0
+ #define CONFIG_SPX_MUXER 0
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h src/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h
+--- src/third_party/ffmpeg-orig/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h       1970-01-01 00:00:00.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h    2015-05-21 19:19:03.000000000 +0000
+@@ -0,0 +1,4 @@
++#ifndef AVUTIL_FFVERSION_H
++#define AVUTIL_FFVERSION_H
++#define FFMPEG_VERSION "2.5.git"
++#endif /* AVUTIL_FFVERSION_H */
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/ChromeOS/linux/arm64/config.h src/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h
+--- src/third_party/ffmpeg-orig/chromium/config/ChromeOS/linux/arm64/config.h  2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h       2015-05-21 19:19:03.000000000 +0000
+@@ -1,17 +1,17 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+-#define CONFIG_THIS_YEAR 2014
++#define CONFIG_THIS_YEAR 2015
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+-#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
++#define CC_IDENT "gcc 4.9 (Tizen)"
+ #define av_restrict restrict
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM 
+ #define BUILDSUF ""
+ #define SLIBSUF ".so"
+ #define HAVE_MMX2 HAVE_MMXEXT
+ #define SWS_MAX_FILTER_SIZE 256
+ #define ARCH_AARCH64 1
+@@ -169,17 +169,16 @@
+ #define HAVE_FAST_UNALIGNED 1
+ #define HAVE_INCOMPATIBLE_LIBAV_ABI 0
+ #define HAVE_ALSA_ASOUNDLIB_H 0
+ #define HAVE_ALTIVEC_H 0
+ #define HAVE_ARPA_INET_H 0
+ #define HAVE_ASM_TYPES_H 1
+ #define HAVE_CDIO_PARANOIA_H 0
+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+-#define HAVE_CL_CL_H 0
+ #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
+ #define HAVE_DEV_IC_BT8XX_H 0
+ #define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
+ #define HAVE_DIRECT_H 0
+ #define HAVE_DLFCN_H 1
+ #define HAVE_DXVA_H 0
+@@ -261,17 +260,16 @@
+ #define HAVE_INET_ATON 0
+ #define HAVE_ISATTY 1
+ #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+ #define HAVE_KBHIT 0
+ #define HAVE_LOCALTIME_R 1
+ #define HAVE_LZO1X_999_COMPRESS 0
+ #define HAVE_MACH_ABSOLUTE_TIME 0
+ #define HAVE_MAPVIEWOFFILE 0
+-#define HAVE_MOVEFILEEXA 0
+ #define HAVE_MEMALIGN 1
+ #define HAVE_MKSTEMP 1
+ #define HAVE_MMAP 1
+ #define HAVE_MPROTECT 1
+ #define HAVE_NANOSLEEP 1
+ #define HAVE_PEEKNAMEDPIPE 0
+ #define HAVE_POSIX_MEMALIGN 1
+ #define HAVE_PTHREAD_CANCEL 1
+@@ -298,23 +296,24 @@
+ #define HAVE_EBX_AVAILABLE 0
+ #define HAVE_GNU_AS 1
+ #define HAVE_GNU_WINDRES 0
+ #define HAVE_IBM_ASM 0
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 0
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+ #define HAVE_XFORM_ASM 0
+ #define HAVE_XMM_CLOBBERS 0
+ #define HAVE_CONDITION_VARIABLE_PTR 0
++#define HAVE_DXVA_PICPARAMS_HEVC 0
+ #define HAVE_SOCKLEN_T 0
+ #define HAVE_STRUCT_ADDRINFO 0
+ #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+ #define HAVE_STRUCT_IP_MREQ_SOURCE 0
+ #define HAVE_STRUCT_IPV6_MREQ 0
+ #define HAVE_STRUCT_POLLFD 0
+ #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+ #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
+@@ -325,41 +324,42 @@
+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
+ #define HAVE_ATOMICS_NATIVE 1
+ #define HAVE_DOS_PATHS 0
+ #define HAVE_DXVA2API_COBJ 0
+ #define HAVE_DXVA2_LIB 0
+ #define HAVE_LIBC_MSVCRT 0
+ #define HAVE_LIBDC1394_1 0
+ #define HAVE_LIBDC1394_2 0
+-#define HAVE_MAKEINFO 1
+-#define HAVE_MAKEINFO_HTML 1
++#define HAVE_MAKEINFO 0
++#define HAVE_MAKEINFO_HTML 0
+ #define HAVE_PERL 1
+ #define HAVE_POD2MAN 1
+ #define HAVE_SDL 0
++#define HAVE_SECTION_DATA_REL_RO 1
+ #define HAVE_TEXI2HTML 0
+ #define HAVE_THREADS 1
+ #define HAVE_VDPAU_X11 0
+ #define HAVE_XLIB 0
+ #define CONFIG_BSFS 0
+ #define CONFIG_DECODERS 1
+ #define CONFIG_DEMUXERS 1
+ #define CONFIG_ENCODERS 0
+ #define CONFIG_FILTERS 0
+ #define CONFIG_HWACCELS 0
+ #define CONFIG_INDEVS 0
+ #define CONFIG_MUXERS 0
+ #define CONFIG_OUTDEVS 0
+ #define CONFIG_PARSERS 1
+ #define CONFIG_PROTOCOLS 0
+ #define CONFIG_DOC 0
+-#define CONFIG_HTMLPAGES 1
++#define CONFIG_HTMLPAGES 0
+ #define CONFIG_MANPAGES 1
+ #define CONFIG_PODPAGES 1
+-#define CONFIG_TXTPAGES 1
++#define CONFIG_TXTPAGES 0
+ #define CONFIG_AVIO_READING_EXAMPLE 1
+ #define CONFIG_DECODING_ENCODING_EXAMPLE 1
+ #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+ #define CONFIG_EXTRACT_MVS_EXAMPLE 1
+ #define CONFIG_FILTER_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+ #define CONFIG_METADATA_EXAMPLE 1
+@@ -396,16 +396,17 @@
+ #define CONFIG_LIBIEC61883 0
+ #define CONFIG_LIBILBC 0
+ #define CONFIG_LIBMODPLUG 0
+ #define CONFIG_LIBMP3LAME 0
+ #define CONFIG_LIBNUT 0
+ #define CONFIG_LIBOPENCORE_AMRNB 0
+ #define CONFIG_LIBOPENCORE_AMRWB 0
+ #define CONFIG_LIBOPENCV 0
++#define CONFIG_LIBOPENH264 0
+ #define CONFIG_LIBOPENJPEG 0
+ #define CONFIG_LIBOPUS 0
+ #define CONFIG_LIBPULSE 0
+ #define CONFIG_LIBQUVI 0
+ #define CONFIG_LIBRTMP 0
+ #define CONFIG_LIBSCHROEDINGER 0
+ #define CONFIG_LIBSHINE 0
+ #define CONFIG_LIBSMBCLIENT 0
+@@ -430,16 +431,17 @@
+ #define CONFIG_LIBXCB 0
+ #define CONFIG_LIBXCB_SHM 0
+ #define CONFIG_LIBXCB_SHAPE 0
+ #define CONFIG_LIBXCB_XFIXES 0
+ #define CONFIG_LIBXVID 0
+ #define CONFIG_LIBZMQ 0
+ #define CONFIG_LIBZVBI 0
+ #define CONFIG_LZMA 0
++#define CONFIG_NVENC 0
+ #define CONFIG_OPENAL 0
+ #define CONFIG_OPENCL 0
+ #define CONFIG_OPENGL 0
+ #define CONFIG_OPENSSL 0
+ #define CONFIG_SDL 0
+ #define CONFIG_X11GRAB 0
+ #define CONFIG_XLIB 0
+ #define CONFIG_ZLIB 0
+@@ -918,16 +920,17 @@
+ #define CONFIG_ADPCM_SWF_DECODER 0
+ #define CONFIG_ADPCM_THP_DECODER 0
+ #define CONFIG_ADPCM_VIMA_DECODER 0
+ #define CONFIG_ADPCM_XA_DECODER 0
+ #define CONFIG_ADPCM_YAMAHA_DECODER 0
+ #define CONFIG_VIMA_DECODER 0
+ #define CONFIG_SSA_DECODER 0
+ #define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
+ #define CONFIG_DVBSUB_DECODER 0
+ #define CONFIG_DVDSUB_DECODER 0
+ #define CONFIG_JACOSUB_DECODER 0
+ #define CONFIG_MICRODVD_DECODER 0
+ #define CONFIG_MOVTEXT_DECODER 0
+ #define CONFIG_MPL2_DECODER 0
+ #define CONFIG_PGSSUB_DECODER 0
+ #define CONFIG_PJS_DECODER 0
+@@ -1005,16 +1008,17 @@
+ #define CONFIG_DFA_DEMUXER 0
+ #define CONFIG_DIRAC_DEMUXER 0
+ #define CONFIG_DNXHD_DEMUXER 0
+ #define CONFIG_DSF_DEMUXER 0
+ #define CONFIG_DSICIN_DEMUXER 0
+ #define CONFIG_DTS_DEMUXER 0
+ #define CONFIG_DTSHD_DEMUXER 0
+ #define CONFIG_DV_DEMUXER 0
++#define CONFIG_DVBSUB_DEMUXER 0
+ #define CONFIG_DXA_DEMUXER 0
+ #define CONFIG_EA_DEMUXER 0
+ #define CONFIG_EA_CDATA_DEMUXER 0
+ #define CONFIG_EAC3_DEMUXER 0
+ #define CONFIG_EPAF_DEMUXER 0
+ #define CONFIG_FFM_DEMUXER 0
+ #define CONFIG_FFMETADATA_DEMUXER 0
+ #define CONFIG_FILMSTRIP_DEMUXER 0
+@@ -1230,16 +1234,17 @@
+ #define CONFIG_LJPEG_ENCODER 0
+ #define CONFIG_MJPEG_ENCODER 0
+ #define CONFIG_MPEG1VIDEO_ENCODER 0
+ #define CONFIG_MPEG2VIDEO_ENCODER 0
+ #define CONFIG_MPEG4_ENCODER 0
+ #define CONFIG_MSMPEG4V2_ENCODER 0
+ #define CONFIG_MSMPEG4V3_ENCODER 0
+ #define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
+ #define CONFIG_PAM_ENCODER 0
+ #define CONFIG_PBM_ENCODER 0
+ #define CONFIG_PCX_ENCODER 0
+ #define CONFIG_PGM_ENCODER 0
+ #define CONFIG_PGMYUV_ENCODER 0
+ #define CONFIG_PNG_ENCODER 0
+ #define CONFIG_PPM_ENCODER 0
+ #define CONFIG_PRORES_ENCODER 0
+@@ -1359,16 +1364,17 @@
+ #define CONFIG_LIBWAVPACK_ENCODER 0
+ #define CONFIG_LIBWEBP_ENCODER 0
+ #define CONFIG_LIBX264_ENCODER 0
+ #define CONFIG_LIBX264RGB_ENCODER 0
+ #define CONFIG_LIBX265_ENCODER 0
+ #define CONFIG_LIBXAVS_ENCODER 0
+ #define CONFIG_LIBXVID_ENCODER 0
+ #define CONFIG_LIBAACPLUS_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
+ #define CONFIG_ADELAY_FILTER 0
+ #define CONFIG_AECHO_FILTER 0
+ #define CONFIG_AEVAL_FILTER 0
+ #define CONFIG_AFADE_FILTER 0
+ #define CONFIG_AFORMAT_FILTER 0
+ #define CONFIG_AINTERLEAVE_FILTER 0
+ #define CONFIG_ALLPASS_FILTER 0
+ #define CONFIG_AMERGE_FILTER 0
+@@ -1427,41 +1433,44 @@
+ #define CONFIG_BBOX_FILTER 0
+ #define CONFIG_BLACKDETECT_FILTER 0
+ #define CONFIG_BLACKFRAME_FILTER 0
+ #define CONFIG_BLEND_FILTER 0
+ #define CONFIG_BOXBLUR_FILTER 0
+ #define CONFIG_CODECVIEW_FILTER 0
+ #define CONFIG_COLORBALANCE_FILTER 0
+ #define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
+ #define CONFIG_COLORMATRIX_FILTER 0
+ #define CONFIG_COPY_FILTER 0
+ #define CONFIG_CROP_FILTER 0
+ #define CONFIG_CROPDETECT_FILTER 0
+ #define CONFIG_CURVES_FILTER 0
+ #define CONFIG_DCTDNOIZ_FILTER 0
+ #define CONFIG_DECIMATE_FILTER 0
+ #define CONFIG_DEJUDDER_FILTER 0
+ #define CONFIG_DELOGO_FILTER 0
+ #define CONFIG_DESHAKE_FILTER 0
+ #define CONFIG_DRAWBOX_FILTER 0
+ #define CONFIG_DRAWGRID_FILTER 0
+ #define CONFIG_DRAWTEXT_FILTER 0
+ #define CONFIG_EDGEDETECT_FILTER 0
+ #define CONFIG_ELBG_FILTER 0
++#define CONFIG_EQ_FILTER 0
+ #define CONFIG_EXTRACTPLANES_FILTER 0
+ #define CONFIG_FADE_FILTER 0
+ #define CONFIG_FIELD_FILTER 0
+ #define CONFIG_FIELDMATCH_FILTER 0
+ #define CONFIG_FIELDORDER_FILTER 0
+ #define CONFIG_FORMAT_FILTER 0
+ #define CONFIG_FPS_FILTER 0
+ #define CONFIG_FRAMEPACK_FILTER 0
+ #define CONFIG_FRAMESTEP_FILTER 0
+ #define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
+ #define CONFIG_GEQ_FILTER 0
+ #define CONFIG_GRADFUN_FILTER 0
+ #define CONFIG_HALDCLUT_FILTER 0
+ #define CONFIG_HFLIP_FILTER 0
+ #define CONFIG_HISTEQ_FILTER 0
+ #define CONFIG_HISTOGRAM_FILTER 0
+ #define CONFIG_HQDN3D_FILTER 0
+ #define CONFIG_HQX_FILTER 0
+@@ -1488,47 +1497,52 @@
+ #define CONFIG_OVERLAY_FILTER 0
+ #define CONFIG_OWDENOISE_FILTER 0
+ #define CONFIG_PAD_FILTER 0
+ #define CONFIG_PERMS_FILTER 0
+ #define CONFIG_PERSPECTIVE_FILTER 0
+ #define CONFIG_PHASE_FILTER 0
+ #define CONFIG_PIXDESCTEST_FILTER 0
+ #define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
+ #define CONFIG_PSNR_FILTER 0
+ #define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
+ #define CONFIG_REMOVELOGO_FILTER 0
+ #define CONFIG_ROTATE_FILTER 0
+ #define CONFIG_SAB_FILTER 0
+ #define CONFIG_SCALE_FILTER 0
+ #define CONFIG_SELECT_FILTER 0
+ #define CONFIG_SENDCMD_FILTER 0
+ #define CONFIG_SEPARATEFIELDS_FILTER 0
+ #define CONFIG_SETDAR_FILTER 0
+ #define CONFIG_SETFIELD_FILTER 0
+ #define CONFIG_SETPTS_FILTER 0
+ #define CONFIG_SETSAR_FILTER 0
+ #define CONFIG_SETTB_FILTER 0
+ #define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
+ #define CONFIG_SHUFFLEPLANES_FILTER 0
+ #define CONFIG_SIGNALSTATS_FILTER 0
+ #define CONFIG_SMARTBLUR_FILTER 0
+ #define CONFIG_SPLIT_FILTER 0
+ #define CONFIG_SPP_FILTER 0
+ #define CONFIG_STEREO3D_FILTER 0
+ #define CONFIG_SUBTITLES_FILTER 0
+ #define CONFIG_SUPER2XSAI_FILTER 0
+ #define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
+ #define CONFIG_TELECINE_FILTER 0
+ #define CONFIG_THUMBNAIL_FILTER 0
+ #define CONFIG_TILE_FILTER 0
+ #define CONFIG_TINTERLACE_FILTER 0
+ #define CONFIG_TRANSPOSE_FILTER 0
+ #define CONFIG_TRIM_FILTER 0
+ #define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_USPP_FILTER 0
+ #define CONFIG_VFLIP_FILTER 0
+ #define CONFIG_VIDSTABDETECT_FILTER 0
+ #define CONFIG_VIDSTABTRANSFORM_FILTER 0
+ #define CONFIG_VIGNETTE_FILTER 0
+ #define CONFIG_W3FDIF_FILTER 0
+ #define CONFIG_XBR_FILTER 0
+ #define CONFIG_YADIF_FILTER 0
+ #define CONFIG_ZMQ_FILTER 0
+@@ -1555,16 +1569,17 @@
+ #define CONFIG_MOVIE_FILTER 0
+ #define CONFIG_H263_VAAPI_HWACCEL 0
+ #define CONFIG_H263_VDPAU_HWACCEL 0
+ #define CONFIG_H264_DXVA2_HWACCEL 0
+ #define CONFIG_H264_VAAPI_HWACCEL 0
+ #define CONFIG_H264_VDA_HWACCEL 0
+ #define CONFIG_H264_VDA_OLD_HWACCEL 0
+ #define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG1_XVMC_HWACCEL 0
+ #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG2_XVMC_HWACCEL 0
+ #define CONFIG_MPEG2_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG2_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG2_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG4_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+@@ -1700,16 +1715,17 @@
+ #define CONFIG_PCM_U16LE_MUXER 0
+ #define CONFIG_PCM_U8_MUXER 0
+ #define CONFIG_PSP_MUXER 0
+ #define CONFIG_RAWVIDEO_MUXER 0
+ #define CONFIG_RM_MUXER 0
+ #define CONFIG_ROQ_MUXER 0
+ #define CONFIG_RSO_MUXER 0
+ #define CONFIG_RTP_MUXER 0
++#define CONFIG_RTP_MPEGTS_MUXER 0
+ #define CONFIG_RTSP_MUXER 0
+ #define CONFIG_SAP_MUXER 0
+ #define CONFIG_SEGMENT_MUXER 0
+ #define CONFIG_STREAM_SEGMENT_MUXER 0
+ #define CONFIG_SMJPEG_MUXER 0
+ #define CONFIG_SMOOTHSTREAMING_MUXER 0
+ #define CONFIG_SOX_MUXER 0
+ #define CONFIG_SPX_MUXER 0
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h src/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h
+--- src/third_party/ffmpeg-orig/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h     1970-01-01 00:00:00.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h  2015-05-21 19:19:03.000000000 +0000
+@@ -0,0 +1,4 @@
++#ifndef AVUTIL_FFVERSION_H
++#define AVUTIL_FFVERSION_H
++#define FFMPEG_VERSION "2.5.git"
++#endif /* AVUTIL_FFVERSION_H */
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/Chromium/linux/arm64/config.h src/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
+--- src/third_party/ffmpeg-orig/chromium/config/Chromium/linux/arm64/config.h  2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h       2015-05-21 19:19:02.000000000 +0000
+@@ -1,17 +1,17 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+-#define CONFIG_THIS_YEAR 2014
++#define CONFIG_THIS_YEAR 2015
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+-#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
++#define CC_IDENT "gcc 4.9 (Tizen)"
+ #define av_restrict restrict
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM 
+ #define BUILDSUF ""
+ #define SLIBSUF ".so"
+ #define HAVE_MMX2 HAVE_MMXEXT
+ #define SWS_MAX_FILTER_SIZE 256
+ #define ARCH_AARCH64 1
+@@ -169,17 +169,16 @@
+ #define HAVE_FAST_UNALIGNED 1
+ #define HAVE_INCOMPATIBLE_LIBAV_ABI 0
+ #define HAVE_ALSA_ASOUNDLIB_H 0
+ #define HAVE_ALTIVEC_H 0
+ #define HAVE_ARPA_INET_H 0
+ #define HAVE_ASM_TYPES_H 1
+ #define HAVE_CDIO_PARANOIA_H 0
+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+-#define HAVE_CL_CL_H 0
+ #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
+ #define HAVE_DEV_IC_BT8XX_H 0
+ #define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
+ #define HAVE_DIRECT_H 0
+ #define HAVE_DLFCN_H 1
+ #define HAVE_DXVA_H 0
+@@ -261,17 +260,16 @@
+ #define HAVE_INET_ATON 0
+ #define HAVE_ISATTY 1
+ #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+ #define HAVE_KBHIT 0
+ #define HAVE_LOCALTIME_R 1
+ #define HAVE_LZO1X_999_COMPRESS 0
+ #define HAVE_MACH_ABSOLUTE_TIME 0
+ #define HAVE_MAPVIEWOFFILE 0
+-#define HAVE_MOVEFILEEXA 0
+ #define HAVE_MEMALIGN 1
+ #define HAVE_MKSTEMP 1
+ #define HAVE_MMAP 1
+ #define HAVE_MPROTECT 1
+ #define HAVE_NANOSLEEP 1
+ #define HAVE_PEEKNAMEDPIPE 0
+ #define HAVE_POSIX_MEMALIGN 1
+ #define HAVE_PTHREAD_CANCEL 1
+@@ -298,23 +296,24 @@
+ #define HAVE_EBX_AVAILABLE 0
+ #define HAVE_GNU_AS 1
+ #define HAVE_GNU_WINDRES 0
+ #define HAVE_IBM_ASM 0
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 0
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+ #define HAVE_XFORM_ASM 0
+ #define HAVE_XMM_CLOBBERS 0
+ #define HAVE_CONDITION_VARIABLE_PTR 0
++#define HAVE_DXVA_PICPARAMS_HEVC 0
+ #define HAVE_SOCKLEN_T 0
+ #define HAVE_STRUCT_ADDRINFO 0
+ #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+ #define HAVE_STRUCT_IP_MREQ_SOURCE 0
+ #define HAVE_STRUCT_IPV6_MREQ 0
+ #define HAVE_STRUCT_POLLFD 0
+ #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+ #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
+@@ -325,41 +324,42 @@
+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
+ #define HAVE_ATOMICS_NATIVE 1
+ #define HAVE_DOS_PATHS 0
+ #define HAVE_DXVA2API_COBJ 0
+ #define HAVE_DXVA2_LIB 0
+ #define HAVE_LIBC_MSVCRT 0
+ #define HAVE_LIBDC1394_1 0
+ #define HAVE_LIBDC1394_2 0
+-#define HAVE_MAKEINFO 1
+-#define HAVE_MAKEINFO_HTML 1
++#define HAVE_MAKEINFO 0
++#define HAVE_MAKEINFO_HTML 0
+ #define HAVE_PERL 1
+ #define HAVE_POD2MAN 1
+ #define HAVE_SDL 0
++#define HAVE_SECTION_DATA_REL_RO 1
+ #define HAVE_TEXI2HTML 0
+ #define HAVE_THREADS 1
+ #define HAVE_VDPAU_X11 0
+ #define HAVE_XLIB 0
+ #define CONFIG_BSFS 0
+ #define CONFIG_DECODERS 1
+ #define CONFIG_DEMUXERS 1
+ #define CONFIG_ENCODERS 0
+ #define CONFIG_FILTERS 0
+ #define CONFIG_HWACCELS 0
+ #define CONFIG_INDEVS 0
+ #define CONFIG_MUXERS 0
+ #define CONFIG_OUTDEVS 0
+ #define CONFIG_PARSERS 1
+ #define CONFIG_PROTOCOLS 0
+ #define CONFIG_DOC 0
+-#define CONFIG_HTMLPAGES 1
++#define CONFIG_HTMLPAGES 0
+ #define CONFIG_MANPAGES 1
+ #define CONFIG_PODPAGES 1
+-#define CONFIG_TXTPAGES 1
++#define CONFIG_TXTPAGES 0
+ #define CONFIG_AVIO_READING_EXAMPLE 1
+ #define CONFIG_DECODING_ENCODING_EXAMPLE 1
+ #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+ #define CONFIG_EXTRACT_MVS_EXAMPLE 1
+ #define CONFIG_FILTER_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+ #define CONFIG_METADATA_EXAMPLE 1
+@@ -396,16 +396,17 @@
+ #define CONFIG_LIBIEC61883 0
+ #define CONFIG_LIBILBC 0
+ #define CONFIG_LIBMODPLUG 0
+ #define CONFIG_LIBMP3LAME 0
+ #define CONFIG_LIBNUT 0
+ #define CONFIG_LIBOPENCORE_AMRNB 0
+ #define CONFIG_LIBOPENCORE_AMRWB 0
+ #define CONFIG_LIBOPENCV 0
++#define CONFIG_LIBOPENH264 0
+ #define CONFIG_LIBOPENJPEG 0
+ #define CONFIG_LIBOPUS 0
+ #define CONFIG_LIBPULSE 0
+ #define CONFIG_LIBQUVI 0
+ #define CONFIG_LIBRTMP 0
+ #define CONFIG_LIBSCHROEDINGER 0
+ #define CONFIG_LIBSHINE 0
+ #define CONFIG_LIBSMBCLIENT 0
+@@ -430,16 +431,17 @@
+ #define CONFIG_LIBXCB 0
+ #define CONFIG_LIBXCB_SHM 0
+ #define CONFIG_LIBXCB_SHAPE 0
+ #define CONFIG_LIBXCB_XFIXES 0
+ #define CONFIG_LIBXVID 0
+ #define CONFIG_LIBZMQ 0
+ #define CONFIG_LIBZVBI 0
+ #define CONFIG_LZMA 0
++#define CONFIG_NVENC 0
+ #define CONFIG_OPENAL 0
+ #define CONFIG_OPENCL 0
+ #define CONFIG_OPENGL 0
+ #define CONFIG_OPENSSL 0
+ #define CONFIG_SDL 0
+ #define CONFIG_X11GRAB 0
+ #define CONFIG_XLIB 0
+ #define CONFIG_ZLIB 0
+@@ -918,16 +920,17 @@
+ #define CONFIG_ADPCM_SWF_DECODER 0
+ #define CONFIG_ADPCM_THP_DECODER 0
+ #define CONFIG_ADPCM_VIMA_DECODER 0
+ #define CONFIG_ADPCM_XA_DECODER 0
+ #define CONFIG_ADPCM_YAMAHA_DECODER 0
+ #define CONFIG_VIMA_DECODER 0
+ #define CONFIG_SSA_DECODER 0
+ #define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
+ #define CONFIG_DVBSUB_DECODER 0
+ #define CONFIG_DVDSUB_DECODER 0
+ #define CONFIG_JACOSUB_DECODER 0
+ #define CONFIG_MICRODVD_DECODER 0
+ #define CONFIG_MOVTEXT_DECODER 0
+ #define CONFIG_MPL2_DECODER 0
+ #define CONFIG_PGSSUB_DECODER 0
+ #define CONFIG_PJS_DECODER 0
+@@ -1005,16 +1008,17 @@
+ #define CONFIG_DFA_DEMUXER 0
+ #define CONFIG_DIRAC_DEMUXER 0
+ #define CONFIG_DNXHD_DEMUXER 0
+ #define CONFIG_DSF_DEMUXER 0
+ #define CONFIG_DSICIN_DEMUXER 0
+ #define CONFIG_DTS_DEMUXER 0
+ #define CONFIG_DTSHD_DEMUXER 0
+ #define CONFIG_DV_DEMUXER 0
++#define CONFIG_DVBSUB_DEMUXER 0
+ #define CONFIG_DXA_DEMUXER 0
+ #define CONFIG_EA_DEMUXER 0
+ #define CONFIG_EA_CDATA_DEMUXER 0
+ #define CONFIG_EAC3_DEMUXER 0
+ #define CONFIG_EPAF_DEMUXER 0
+ #define CONFIG_FFM_DEMUXER 0
+ #define CONFIG_FFMETADATA_DEMUXER 0
+ #define CONFIG_FILMSTRIP_DEMUXER 0
+@@ -1230,16 +1234,17 @@
+ #define CONFIG_LJPEG_ENCODER 0
+ #define CONFIG_MJPEG_ENCODER 0
+ #define CONFIG_MPEG1VIDEO_ENCODER 0
+ #define CONFIG_MPEG2VIDEO_ENCODER 0
+ #define CONFIG_MPEG4_ENCODER 0
+ #define CONFIG_MSMPEG4V2_ENCODER 0
+ #define CONFIG_MSMPEG4V3_ENCODER 0
+ #define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
+ #define CONFIG_PAM_ENCODER 0
+ #define CONFIG_PBM_ENCODER 0
+ #define CONFIG_PCX_ENCODER 0
+ #define CONFIG_PGM_ENCODER 0
+ #define CONFIG_PGMYUV_ENCODER 0
+ #define CONFIG_PNG_ENCODER 0
+ #define CONFIG_PPM_ENCODER 0
+ #define CONFIG_PRORES_ENCODER 0
+@@ -1359,16 +1364,17 @@
+ #define CONFIG_LIBWAVPACK_ENCODER 0
+ #define CONFIG_LIBWEBP_ENCODER 0
+ #define CONFIG_LIBX264_ENCODER 0
+ #define CONFIG_LIBX264RGB_ENCODER 0
+ #define CONFIG_LIBX265_ENCODER 0
+ #define CONFIG_LIBXAVS_ENCODER 0
+ #define CONFIG_LIBXVID_ENCODER 0
+ #define CONFIG_LIBAACPLUS_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
+ #define CONFIG_ADELAY_FILTER 0
+ #define CONFIG_AECHO_FILTER 0
+ #define CONFIG_AEVAL_FILTER 0
+ #define CONFIG_AFADE_FILTER 0
+ #define CONFIG_AFORMAT_FILTER 0
+ #define CONFIG_AINTERLEAVE_FILTER 0
+ #define CONFIG_ALLPASS_FILTER 0
+ #define CONFIG_AMERGE_FILTER 0
+@@ -1427,41 +1433,44 @@
+ #define CONFIG_BBOX_FILTER 0
+ #define CONFIG_BLACKDETECT_FILTER 0
+ #define CONFIG_BLACKFRAME_FILTER 0
+ #define CONFIG_BLEND_FILTER 0
+ #define CONFIG_BOXBLUR_FILTER 0
+ #define CONFIG_CODECVIEW_FILTER 0
+ #define CONFIG_COLORBALANCE_FILTER 0
+ #define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
+ #define CONFIG_COLORMATRIX_FILTER 0
+ #define CONFIG_COPY_FILTER 0
+ #define CONFIG_CROP_FILTER 0
+ #define CONFIG_CROPDETECT_FILTER 0
+ #define CONFIG_CURVES_FILTER 0
+ #define CONFIG_DCTDNOIZ_FILTER 0
+ #define CONFIG_DECIMATE_FILTER 0
+ #define CONFIG_DEJUDDER_FILTER 0
+ #define CONFIG_DELOGO_FILTER 0
+ #define CONFIG_DESHAKE_FILTER 0
+ #define CONFIG_DRAWBOX_FILTER 0
+ #define CONFIG_DRAWGRID_FILTER 0
+ #define CONFIG_DRAWTEXT_FILTER 0
+ #define CONFIG_EDGEDETECT_FILTER 0
+ #define CONFIG_ELBG_FILTER 0
++#define CONFIG_EQ_FILTER 0
+ #define CONFIG_EXTRACTPLANES_FILTER 0
+ #define CONFIG_FADE_FILTER 0
+ #define CONFIG_FIELD_FILTER 0
+ #define CONFIG_FIELDMATCH_FILTER 0
+ #define CONFIG_FIELDORDER_FILTER 0
+ #define CONFIG_FORMAT_FILTER 0
+ #define CONFIG_FPS_FILTER 0
+ #define CONFIG_FRAMEPACK_FILTER 0
+ #define CONFIG_FRAMESTEP_FILTER 0
+ #define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
+ #define CONFIG_GEQ_FILTER 0
+ #define CONFIG_GRADFUN_FILTER 0
+ #define CONFIG_HALDCLUT_FILTER 0
+ #define CONFIG_HFLIP_FILTER 0
+ #define CONFIG_HISTEQ_FILTER 0
+ #define CONFIG_HISTOGRAM_FILTER 0
+ #define CONFIG_HQDN3D_FILTER 0
+ #define CONFIG_HQX_FILTER 0
+@@ -1488,47 +1497,52 @@
+ #define CONFIG_OVERLAY_FILTER 0
+ #define CONFIG_OWDENOISE_FILTER 0
+ #define CONFIG_PAD_FILTER 0
+ #define CONFIG_PERMS_FILTER 0
+ #define CONFIG_PERSPECTIVE_FILTER 0
+ #define CONFIG_PHASE_FILTER 0
+ #define CONFIG_PIXDESCTEST_FILTER 0
+ #define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
+ #define CONFIG_PSNR_FILTER 0
+ #define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
+ #define CONFIG_REMOVELOGO_FILTER 0
+ #define CONFIG_ROTATE_FILTER 0
+ #define CONFIG_SAB_FILTER 0
+ #define CONFIG_SCALE_FILTER 0
+ #define CONFIG_SELECT_FILTER 0
+ #define CONFIG_SENDCMD_FILTER 0
+ #define CONFIG_SEPARATEFIELDS_FILTER 0
+ #define CONFIG_SETDAR_FILTER 0
+ #define CONFIG_SETFIELD_FILTER 0
+ #define CONFIG_SETPTS_FILTER 0
+ #define CONFIG_SETSAR_FILTER 0
+ #define CONFIG_SETTB_FILTER 0
+ #define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
+ #define CONFIG_SHUFFLEPLANES_FILTER 0
+ #define CONFIG_SIGNALSTATS_FILTER 0
+ #define CONFIG_SMARTBLUR_FILTER 0
+ #define CONFIG_SPLIT_FILTER 0
+ #define CONFIG_SPP_FILTER 0
+ #define CONFIG_STEREO3D_FILTER 0
+ #define CONFIG_SUBTITLES_FILTER 0
+ #define CONFIG_SUPER2XSAI_FILTER 0
+ #define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
+ #define CONFIG_TELECINE_FILTER 0
+ #define CONFIG_THUMBNAIL_FILTER 0
+ #define CONFIG_TILE_FILTER 0
+ #define CONFIG_TINTERLACE_FILTER 0
+ #define CONFIG_TRANSPOSE_FILTER 0
+ #define CONFIG_TRIM_FILTER 0
+ #define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_USPP_FILTER 0
+ #define CONFIG_VFLIP_FILTER 0
+ #define CONFIG_VIDSTABDETECT_FILTER 0
+ #define CONFIG_VIDSTABTRANSFORM_FILTER 0
+ #define CONFIG_VIGNETTE_FILTER 0
+ #define CONFIG_W3FDIF_FILTER 0
+ #define CONFIG_XBR_FILTER 0
+ #define CONFIG_YADIF_FILTER 0
+ #define CONFIG_ZMQ_FILTER 0
+@@ -1555,16 +1569,17 @@
+ #define CONFIG_MOVIE_FILTER 0
+ #define CONFIG_H263_VAAPI_HWACCEL 0
+ #define CONFIG_H263_VDPAU_HWACCEL 0
+ #define CONFIG_H264_DXVA2_HWACCEL 0
+ #define CONFIG_H264_VAAPI_HWACCEL 0
+ #define CONFIG_H264_VDA_HWACCEL 0
+ #define CONFIG_H264_VDA_OLD_HWACCEL 0
+ #define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG1_XVMC_HWACCEL 0
+ #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG2_XVMC_HWACCEL 0
+ #define CONFIG_MPEG2_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG2_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG2_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG4_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+@@ -1700,16 +1715,17 @@
+ #define CONFIG_PCM_U16LE_MUXER 0
+ #define CONFIG_PCM_U8_MUXER 0
+ #define CONFIG_PSP_MUXER 0
+ #define CONFIG_RAWVIDEO_MUXER 0
+ #define CONFIG_RM_MUXER 0
+ #define CONFIG_ROQ_MUXER 0
+ #define CONFIG_RSO_MUXER 0
+ #define CONFIG_RTP_MUXER 0
++#define CONFIG_RTP_MPEGTS_MUXER 0
+ #define CONFIG_RTSP_MUXER 0
+ #define CONFIG_SAP_MUXER 0
+ #define CONFIG_SEGMENT_MUXER 0
+ #define CONFIG_STREAM_SEGMENT_MUXER 0
+ #define CONFIG_SMJPEG_MUXER 0
+ #define CONFIG_SMOOTHSTREAMING_MUXER 0
+ #define CONFIG_SOX_MUXER 0
+ #define CONFIG_SPX_MUXER 0
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h src/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h
+--- src/third_party/ffmpeg-orig/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h     1970-01-01 00:00:00.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h  2015-05-21 19:19:02.000000000 +0000
+@@ -0,0 +1,4 @@
++#ifndef AVUTIL_FFVERSION_H
++#define AVUTIL_FFVERSION_H
++#define FFMPEG_VERSION "2.5.git"
++#endif /* AVUTIL_FFVERSION_H */
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/ChromiumOS/linux/arm64/config.h src/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h
+--- src/third_party/ffmpeg-orig/chromium/config/ChromiumOS/linux/arm64/config.h        2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h     2015-05-21 19:19:02.000000000 +0000
+@@ -1,17 +1,17 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac"
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+-#define CONFIG_THIS_YEAR 2014
++#define CONFIG_THIS_YEAR 2015
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+-#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
++#define CC_IDENT "gcc 4.9 (Tizen)"
+ #define av_restrict restrict
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM 
+ #define BUILDSUF ""
+ #define SLIBSUF ".so"
+ #define HAVE_MMX2 HAVE_MMXEXT
+ #define SWS_MAX_FILTER_SIZE 256
+ #define ARCH_AARCH64 1
+@@ -169,17 +169,16 @@
+ #define HAVE_FAST_UNALIGNED 1
+ #define HAVE_INCOMPATIBLE_LIBAV_ABI 0
+ #define HAVE_ALSA_ASOUNDLIB_H 0
+ #define HAVE_ALTIVEC_H 0
+ #define HAVE_ARPA_INET_H 0
+ #define HAVE_ASM_TYPES_H 1
+ #define HAVE_CDIO_PARANOIA_H 0
+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
+-#define HAVE_CL_CL_H 0
+ #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
+ #define HAVE_DEV_IC_BT8XX_H 0
+ #define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
+ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
+ #define HAVE_DIRECT_H 0
+ #define HAVE_DLFCN_H 1
+ #define HAVE_DXVA_H 0
+@@ -261,17 +260,16 @@
+ #define HAVE_INET_ATON 0
+ #define HAVE_ISATTY 1
+ #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
+ #define HAVE_KBHIT 0
+ #define HAVE_LOCALTIME_R 1
+ #define HAVE_LZO1X_999_COMPRESS 0
+ #define HAVE_MACH_ABSOLUTE_TIME 0
+ #define HAVE_MAPVIEWOFFILE 0
+-#define HAVE_MOVEFILEEXA 0
+ #define HAVE_MEMALIGN 1
+ #define HAVE_MKSTEMP 1
+ #define HAVE_MMAP 1
+ #define HAVE_MPROTECT 1
+ #define HAVE_NANOSLEEP 1
+ #define HAVE_PEEKNAMEDPIPE 0
+ #define HAVE_POSIX_MEMALIGN 1
+ #define HAVE_PTHREAD_CANCEL 1
+@@ -298,23 +296,24 @@
+ #define HAVE_EBX_AVAILABLE 0
+ #define HAVE_GNU_AS 1
+ #define HAVE_GNU_WINDRES 0
+ #define HAVE_IBM_ASM 0
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 0
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+ #define HAVE_XFORM_ASM 0
+ #define HAVE_XMM_CLOBBERS 0
+ #define HAVE_CONDITION_VARIABLE_PTR 0
++#define HAVE_DXVA_PICPARAMS_HEVC 0
+ #define HAVE_SOCKLEN_T 0
+ #define HAVE_STRUCT_ADDRINFO 0
+ #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
+ #define HAVE_STRUCT_IP_MREQ_SOURCE 0
+ #define HAVE_STRUCT_IPV6_MREQ 0
+ #define HAVE_STRUCT_POLLFD 0
+ #define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+ #define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
+@@ -325,41 +324,42 @@
+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
+ #define HAVE_ATOMICS_NATIVE 1
+ #define HAVE_DOS_PATHS 0
+ #define HAVE_DXVA2API_COBJ 0
+ #define HAVE_DXVA2_LIB 0
+ #define HAVE_LIBC_MSVCRT 0
+ #define HAVE_LIBDC1394_1 0
+ #define HAVE_LIBDC1394_2 0
+-#define HAVE_MAKEINFO 1
+-#define HAVE_MAKEINFO_HTML 1
++#define HAVE_MAKEINFO 0
++#define HAVE_MAKEINFO_HTML 0
+ #define HAVE_PERL 1
+ #define HAVE_POD2MAN 1
+ #define HAVE_SDL 0
++#define HAVE_SECTION_DATA_REL_RO 1
+ #define HAVE_TEXI2HTML 0
+ #define HAVE_THREADS 1
+ #define HAVE_VDPAU_X11 0
+ #define HAVE_XLIB 0
+ #define CONFIG_BSFS 0
+ #define CONFIG_DECODERS 1
+ #define CONFIG_DEMUXERS 1
+ #define CONFIG_ENCODERS 0
+ #define CONFIG_FILTERS 0
+ #define CONFIG_HWACCELS 0
+ #define CONFIG_INDEVS 0
+ #define CONFIG_MUXERS 0
+ #define CONFIG_OUTDEVS 0
+ #define CONFIG_PARSERS 1
+ #define CONFIG_PROTOCOLS 0
+ #define CONFIG_DOC 0
+-#define CONFIG_HTMLPAGES 1
++#define CONFIG_HTMLPAGES 0
+ #define CONFIG_MANPAGES 1
+ #define CONFIG_PODPAGES 1
+-#define CONFIG_TXTPAGES 1
++#define CONFIG_TXTPAGES 0
+ #define CONFIG_AVIO_READING_EXAMPLE 1
+ #define CONFIG_DECODING_ENCODING_EXAMPLE 1
+ #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
+ #define CONFIG_EXTRACT_MVS_EXAMPLE 1
+ #define CONFIG_FILTER_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
+ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+ #define CONFIG_METADATA_EXAMPLE 1
+@@ -396,16 +396,17 @@
+ #define CONFIG_LIBIEC61883 0
+ #define CONFIG_LIBILBC 0
+ #define CONFIG_LIBMODPLUG 0
+ #define CONFIG_LIBMP3LAME 0
+ #define CONFIG_LIBNUT 0
+ #define CONFIG_LIBOPENCORE_AMRNB 0
+ #define CONFIG_LIBOPENCORE_AMRWB 0
+ #define CONFIG_LIBOPENCV 0
++#define CONFIG_LIBOPENH264 0
+ #define CONFIG_LIBOPENJPEG 0
+ #define CONFIG_LIBOPUS 0
+ #define CONFIG_LIBPULSE 0
+ #define CONFIG_LIBQUVI 0
+ #define CONFIG_LIBRTMP 0
+ #define CONFIG_LIBSCHROEDINGER 0
+ #define CONFIG_LIBSHINE 0
+ #define CONFIG_LIBSMBCLIENT 0
+@@ -430,16 +431,17 @@
+ #define CONFIG_LIBXCB 0
+ #define CONFIG_LIBXCB_SHM 0
+ #define CONFIG_LIBXCB_SHAPE 0
+ #define CONFIG_LIBXCB_XFIXES 0
+ #define CONFIG_LIBXVID 0
+ #define CONFIG_LIBZMQ 0
+ #define CONFIG_LIBZVBI 0
+ #define CONFIG_LZMA 0
++#define CONFIG_NVENC 0
+ #define CONFIG_OPENAL 0
+ #define CONFIG_OPENCL 0
+ #define CONFIG_OPENGL 0
+ #define CONFIG_OPENSSL 0
+ #define CONFIG_SDL 0
+ #define CONFIG_X11GRAB 0
+ #define CONFIG_XLIB 0
+ #define CONFIG_ZLIB 0
+@@ -918,16 +920,17 @@
+ #define CONFIG_ADPCM_SWF_DECODER 0
+ #define CONFIG_ADPCM_THP_DECODER 0
+ #define CONFIG_ADPCM_VIMA_DECODER 0
+ #define CONFIG_ADPCM_XA_DECODER 0
+ #define CONFIG_ADPCM_YAMAHA_DECODER 0
+ #define CONFIG_VIMA_DECODER 0
+ #define CONFIG_SSA_DECODER 0
+ #define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
+ #define CONFIG_DVBSUB_DECODER 0
+ #define CONFIG_DVDSUB_DECODER 0
+ #define CONFIG_JACOSUB_DECODER 0
+ #define CONFIG_MICRODVD_DECODER 0
+ #define CONFIG_MOVTEXT_DECODER 0
+ #define CONFIG_MPL2_DECODER 0
+ #define CONFIG_PGSSUB_DECODER 0
+ #define CONFIG_PJS_DECODER 0
+@@ -1005,16 +1008,17 @@
+ #define CONFIG_DFA_DEMUXER 0
+ #define CONFIG_DIRAC_DEMUXER 0
+ #define CONFIG_DNXHD_DEMUXER 0
+ #define CONFIG_DSF_DEMUXER 0
+ #define CONFIG_DSICIN_DEMUXER 0
+ #define CONFIG_DTS_DEMUXER 0
+ #define CONFIG_DTSHD_DEMUXER 0
+ #define CONFIG_DV_DEMUXER 0
++#define CONFIG_DVBSUB_DEMUXER 0
+ #define CONFIG_DXA_DEMUXER 0
+ #define CONFIG_EA_DEMUXER 0
+ #define CONFIG_EA_CDATA_DEMUXER 0
+ #define CONFIG_EAC3_DEMUXER 0
+ #define CONFIG_EPAF_DEMUXER 0
+ #define CONFIG_FFM_DEMUXER 0
+ #define CONFIG_FFMETADATA_DEMUXER 0
+ #define CONFIG_FILMSTRIP_DEMUXER 0
+@@ -1230,16 +1234,17 @@
+ #define CONFIG_LJPEG_ENCODER 0
+ #define CONFIG_MJPEG_ENCODER 0
+ #define CONFIG_MPEG1VIDEO_ENCODER 0
+ #define CONFIG_MPEG2VIDEO_ENCODER 0
+ #define CONFIG_MPEG4_ENCODER 0
+ #define CONFIG_MSMPEG4V2_ENCODER 0
+ #define CONFIG_MSMPEG4V3_ENCODER 0
+ #define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
+ #define CONFIG_PAM_ENCODER 0
+ #define CONFIG_PBM_ENCODER 0
+ #define CONFIG_PCX_ENCODER 0
+ #define CONFIG_PGM_ENCODER 0
+ #define CONFIG_PGMYUV_ENCODER 0
+ #define CONFIG_PNG_ENCODER 0
+ #define CONFIG_PPM_ENCODER 0
+ #define CONFIG_PRORES_ENCODER 0
+@@ -1359,16 +1364,17 @@
+ #define CONFIG_LIBWAVPACK_ENCODER 0
+ #define CONFIG_LIBWEBP_ENCODER 0
+ #define CONFIG_LIBX264_ENCODER 0
+ #define CONFIG_LIBX264RGB_ENCODER 0
+ #define CONFIG_LIBX265_ENCODER 0
+ #define CONFIG_LIBXAVS_ENCODER 0
+ #define CONFIG_LIBXVID_ENCODER 0
+ #define CONFIG_LIBAACPLUS_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
+ #define CONFIG_ADELAY_FILTER 0
+ #define CONFIG_AECHO_FILTER 0
+ #define CONFIG_AEVAL_FILTER 0
+ #define CONFIG_AFADE_FILTER 0
+ #define CONFIG_AFORMAT_FILTER 0
+ #define CONFIG_AINTERLEAVE_FILTER 0
+ #define CONFIG_ALLPASS_FILTER 0
+ #define CONFIG_AMERGE_FILTER 0
+@@ -1427,41 +1433,44 @@
+ #define CONFIG_BBOX_FILTER 0
+ #define CONFIG_BLACKDETECT_FILTER 0
+ #define CONFIG_BLACKFRAME_FILTER 0
+ #define CONFIG_BLEND_FILTER 0
+ #define CONFIG_BOXBLUR_FILTER 0
+ #define CONFIG_CODECVIEW_FILTER 0
+ #define CONFIG_COLORBALANCE_FILTER 0
+ #define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
+ #define CONFIG_COLORMATRIX_FILTER 0
+ #define CONFIG_COPY_FILTER 0
+ #define CONFIG_CROP_FILTER 0
+ #define CONFIG_CROPDETECT_FILTER 0
+ #define CONFIG_CURVES_FILTER 0
+ #define CONFIG_DCTDNOIZ_FILTER 0
+ #define CONFIG_DECIMATE_FILTER 0
+ #define CONFIG_DEJUDDER_FILTER 0
+ #define CONFIG_DELOGO_FILTER 0
+ #define CONFIG_DESHAKE_FILTER 0
+ #define CONFIG_DRAWBOX_FILTER 0
+ #define CONFIG_DRAWGRID_FILTER 0
+ #define CONFIG_DRAWTEXT_FILTER 0
+ #define CONFIG_EDGEDETECT_FILTER 0
+ #define CONFIG_ELBG_FILTER 0
++#define CONFIG_EQ_FILTER 0
+ #define CONFIG_EXTRACTPLANES_FILTER 0
+ #define CONFIG_FADE_FILTER 0
+ #define CONFIG_FIELD_FILTER 0
+ #define CONFIG_FIELDMATCH_FILTER 0
+ #define CONFIG_FIELDORDER_FILTER 0
+ #define CONFIG_FORMAT_FILTER 0
+ #define CONFIG_FPS_FILTER 0
+ #define CONFIG_FRAMEPACK_FILTER 0
+ #define CONFIG_FRAMESTEP_FILTER 0
+ #define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
+ #define CONFIG_GEQ_FILTER 0
+ #define CONFIG_GRADFUN_FILTER 0
+ #define CONFIG_HALDCLUT_FILTER 0
+ #define CONFIG_HFLIP_FILTER 0
+ #define CONFIG_HISTEQ_FILTER 0
+ #define CONFIG_HISTOGRAM_FILTER 0
+ #define CONFIG_HQDN3D_FILTER 0
+ #define CONFIG_HQX_FILTER 0
+@@ -1488,47 +1497,52 @@
+ #define CONFIG_OVERLAY_FILTER 0
+ #define CONFIG_OWDENOISE_FILTER 0
+ #define CONFIG_PAD_FILTER 0
+ #define CONFIG_PERMS_FILTER 0
+ #define CONFIG_PERSPECTIVE_FILTER 0
+ #define CONFIG_PHASE_FILTER 0
+ #define CONFIG_PIXDESCTEST_FILTER 0
+ #define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
+ #define CONFIG_PSNR_FILTER 0
+ #define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
+ #define CONFIG_REMOVELOGO_FILTER 0
+ #define CONFIG_ROTATE_FILTER 0
+ #define CONFIG_SAB_FILTER 0
+ #define CONFIG_SCALE_FILTER 0
+ #define CONFIG_SELECT_FILTER 0
+ #define CONFIG_SENDCMD_FILTER 0
+ #define CONFIG_SEPARATEFIELDS_FILTER 0
+ #define CONFIG_SETDAR_FILTER 0
+ #define CONFIG_SETFIELD_FILTER 0
+ #define CONFIG_SETPTS_FILTER 0
+ #define CONFIG_SETSAR_FILTER 0
+ #define CONFIG_SETTB_FILTER 0
+ #define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
+ #define CONFIG_SHUFFLEPLANES_FILTER 0
+ #define CONFIG_SIGNALSTATS_FILTER 0
+ #define CONFIG_SMARTBLUR_FILTER 0
+ #define CONFIG_SPLIT_FILTER 0
+ #define CONFIG_SPP_FILTER 0
+ #define CONFIG_STEREO3D_FILTER 0
+ #define CONFIG_SUBTITLES_FILTER 0
+ #define CONFIG_SUPER2XSAI_FILTER 0
+ #define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
+ #define CONFIG_TELECINE_FILTER 0
+ #define CONFIG_THUMBNAIL_FILTER 0
+ #define CONFIG_TILE_FILTER 0
+ #define CONFIG_TINTERLACE_FILTER 0
+ #define CONFIG_TRANSPOSE_FILTER 0
+ #define CONFIG_TRIM_FILTER 0
+ #define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_USPP_FILTER 0
+ #define CONFIG_VFLIP_FILTER 0
+ #define CONFIG_VIDSTABDETECT_FILTER 0
+ #define CONFIG_VIDSTABTRANSFORM_FILTER 0
+ #define CONFIG_VIGNETTE_FILTER 0
+ #define CONFIG_W3FDIF_FILTER 0
+ #define CONFIG_XBR_FILTER 0
+ #define CONFIG_YADIF_FILTER 0
+ #define CONFIG_ZMQ_FILTER 0
+@@ -1555,16 +1569,17 @@
+ #define CONFIG_MOVIE_FILTER 0
+ #define CONFIG_H263_VAAPI_HWACCEL 0
+ #define CONFIG_H263_VDPAU_HWACCEL 0
+ #define CONFIG_H264_DXVA2_HWACCEL 0
+ #define CONFIG_H264_VAAPI_HWACCEL 0
+ #define CONFIG_H264_VDA_HWACCEL 0
+ #define CONFIG_H264_VDA_OLD_HWACCEL 0
+ #define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG1_XVMC_HWACCEL 0
+ #define CONFIG_MPEG1_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG2_XVMC_HWACCEL 0
+ #define CONFIG_MPEG2_DXVA2_HWACCEL 0
+ #define CONFIG_MPEG2_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG2_VDPAU_HWACCEL 0
+ #define CONFIG_MPEG4_VAAPI_HWACCEL 0
+ #define CONFIG_MPEG4_VDPAU_HWACCEL 0
+@@ -1700,16 +1715,17 @@
+ #define CONFIG_PCM_U16LE_MUXER 0
+ #define CONFIG_PCM_U8_MUXER 0
+ #define CONFIG_PSP_MUXER 0
+ #define CONFIG_RAWVIDEO_MUXER 0
+ #define CONFIG_RM_MUXER 0
+ #define CONFIG_ROQ_MUXER 0
+ #define CONFIG_RSO_MUXER 0
+ #define CONFIG_RTP_MUXER 0
++#define CONFIG_RTP_MPEGTS_MUXER 0
+ #define CONFIG_RTSP_MUXER 0
+ #define CONFIG_SAP_MUXER 0
+ #define CONFIG_SEGMENT_MUXER 0
+ #define CONFIG_STREAM_SEGMENT_MUXER 0
+ #define CONFIG_SMJPEG_MUXER 0
+ #define CONFIG_SMOOTHSTREAMING_MUXER 0
+ #define CONFIG_SOX_MUXER 0
+ #define CONFIG_SPX_MUXER 0
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h src/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h
+--- src/third_party/ffmpeg-orig/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h   1970-01-01 00:00:00.000000000 +0000
++++ src/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h        2015-05-21 19:19:02.000000000 +0000
+@@ -0,0 +1,4 @@
++#ifndef AVUTIL_FFVERSION_H
++#define AVUTIL_FFVERSION_H
++#define FFMPEG_VERSION "2.5.git"
++#endif /* AVUTIL_FFVERSION_H */
+diff -U 8 -phrN src/third_party/ffmpeg-orig/chromium/scripts/generate_gyp.py src/third_party/ffmpeg/chromium/scripts/generate_gyp.py
+--- src/third_party/ffmpeg-orig/chromium/scripts/generate_gyp.py       2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/chromium/scripts/generate_gyp.py    2015-05-21 18:42:21.000000000 +0000
+@@ -135,17 +135,17 @@ GN_GAS_SOURCES_BEGIN = """ffmpeg_gas_sou
+ GN_YASM_SOURCES_BEGIN = """ffmpeg_yasm_sources += [
+ """
+ GN_SOURCE_ITEM = """  "%s",
+ """
+ GN_SOURCE_END = """]
+ """
+ 
+ # Controls GYP conditional stanza generation.
+-SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64', 'mipsel']
++SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64', 'mipsel', 'aarch64', 'arm64']
+ SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS', 'Ensemble']
+ # Mac doesn't have any platform specific files, so just use linux and win.
+ SUPPORTED_PLATFORMS = ['linux', 'win']
+ 
+ 
+ def NormalizeFilename(name):
+   """ Removes leading path separators in an attempt to normalize paths."""
+   return string.lstrip(name, os.sep)
+--- src/third_party/ffmpeg-orig/ffmpeg_generated.gypi  2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/ffmpeg_generated.gypi       2015-05-22 21:11:46.000000000 +0000
+@@ -485,11 +485,30 @@
+           'libavutil/stereo3d.c',
+           'libavutil/threadmessage.c',
+           'libavutil/time.c',
+           'libavutil/timecode.c',
+           'libavutil/twofish.c',
+           'libavutil/utils.c',
+         ],
+       }],  # (1) and (1) and (1)
++
++      ['(target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "Chromium" or ffmpeg_branding == "ChromeOS") and (1)', {
++         'c_sources': [
++           'libavcodec/aarch64/fft_init_aarch64.c',
++           'libavcodec/aarch64/hpeldsp_init_aarch64.c',
++           'libavcodec/aarch64/videodsp_init.c',
++           'libavcodec/aarch64/vorbisdsp_init.c',
++           'libavutil/aarch64/cpu.c',
++           'libavutil/aarch64/float_dsp_init.c',
++         ],
++        'asm_sources': [
++           'libavcodec/aarch64/fft_neon.S',
++           'libavcodec/aarch64/hpeldsp_neon.S',
++           'libavcodec/aarch64/mdct_neon.S',
++           'libavcodec/aarch64/videodsp.S',
++           'libavcodec/aarch64/vorbisdsp_neon.S',
++           'libavutil/aarch64/float_dsp_neon.S',
++        ],
++      }],  # (target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "Chromium" or ffmpeg_branding == "ChromeOS") and (1)
+     ],  # conditions
+   },
+ }
+diff -U 8 -phrN src/third_party/ffmpeg-orig/ffmpeg.gyp src/third_party/ffmpeg/ffmpeg.gyp
+--- src/third_party/ffmpeg-orig/ffmpeg.gyp     2015-05-22 06:23:51.000000000 +0000
++++ src/third_party/ffmpeg/ffmpeg.gyp  2015-05-21 22:00:28.000000000 +0000
+@@ -316,16 +316,19 @@
+               ],
+               'cflags!': [
+                 # Ensure the symbols are exported.
+                 #
+                 # TODO(ajwong): Manually tag the API that we use to be
+                 # exported.
+                 '-fvisibility=hidden',
+               ],
++              'sources': [
++                '<@(asm_sources)',
++              ],
+               'link_settings': {
+                 'ldflags': [
+                   '-Wl,-Bsymbolic',
+                   '-L<(shared_generated_dir)',
+                 ],
+                 'libraries': [
+                   '-lm',
+                   '-lrt',
+Binary files src/third_party/ffmpeg-orig/.git/index and src/third_party/ffmpeg/.git/index differ
Domain: Web Framework / Web Engine;