Add tarball files

Closes #1837.

.gitmodules

@@ -4,7 +4,7 @@
 	ignore = dirty
 [submodule "wxWidgets"]
 	path = vendor/wxWidgets
-	url = git://github.com/wxWidgets/wxWidgets.git
+	url = git://github.com/Aegisub/wxWidgets.git
 	ignore = dirty
 [submodule "googletest"]
 	path = vendor/googletest

Makefile.inc.in

@@ -29,7 +29,7 @@ CPPFLAGS            = @CPPFLAGS@
 CFLAGS_DEP          = -MMD -MP
 LIBS                = @LIBS@
 LDFLAGS             = @LDFLAGS@
-INSTALL_FLAGS       = -m 664
+INSTALL_FLAGS       = -m 644
 LIB_SHARED_LINK     = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL)
 LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.7 -install_name ${CURDIR}/$(LIB_SHARED_FULL)
 

acconf.h.in

@@ -0,0 +1,196 @@
+/* acconf.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Name of the Aegisub gettext catalog */
+#undef AEGISUB_CATALOG
+
+/* Name of the Aegisub executable */
+#undef AEGISUB_COMMAND
+
+/* Enable if iconv expects the in argument to be const */
+#undef AGI_ICONV_CONST
+
+/* Build credit supplied in application title using --with-build-credit= */
+#undef BUILD_CREDIT
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Define to 1 if you have the <boost/spirit/home/phoenix/version.hpp> header
+   file. */
+#undef HAVE_BOOST_SPIRIT_HOME_PHOENIX_VERSION_HPP
+
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+#undef HAVE_DCGETTEXT
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the <GL/gl.h> header file. */
+#undef HAVE_GL_GL_H
+
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <OpenGL/gl.h> header file. */
+#undef HAVE_OPENGL_GL_H
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
+/* Define to 1 if you have the <soundcard.h> header file. */
+#undef HAVE_SOUNDCARD_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/soundcard.h> header file. */
+#undef HAVE_SYS_SOUNDCARD_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <windows.h> header file. */
+#undef HAVE_WINDOWS_H
+
+/* Default install prefix, or --prefix. */
+#undef INSTALL_PREFIX
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Base path for the update checker */
+#undef UPDATE_CHECKER_BASE_URL
+
+/* Server for the update checker */
+#undef UPDATE_CHECKER_SERVER
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Enable ALSA Support */
+#undef WITH_ALSA
+
+/* Enable exception handling in debug mode. (--enable-debug) This is always
+   enabled when debug mode is off. */
+#undef WITH_EXCEPTIONS
+
+/* Enable FFMS2 support */
+#undef WITH_FFMS2
+
+/* Enable fftw support */
+#undef WITH_FFTW3
+
+/* Enable Hunspell support */
+#undef WITH_HUNSPELL
+
+/* Enable PulseAudio support */
+#undef WITH_LIBPULSE
+
+/* Enable OpenAL support */
+#undef WITH_OPENAL
+
+/* Enable OSS support */
+#undef WITH_OSS
+
+/* Enable PortAudio v19 support */
+#undef WITH_PORTAUDIO
+
+/* Whether to enable the update checker */
+#undef WITH_UPDATE_CHECKER
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

automation/tests/aegisub.cpp

@@ -33,6 +33,12 @@ void check(lua_State *L, int status) {
 		exit(status);
 	}
 }
+
+int close_and_exit(lua_State *L) {
+	int status = lua_tointeger(L, 1);
+	lua_close(L);
+	exit(status);
+}
 }
 
 int main(int argc, char **argv) {
@@ -54,6 +60,13 @@ int main(int argc, char **argv) {
 	preload_modules(L);
 	Install(L, {"include"});
 
+	// Patch os.exit to close the lua state first since busted calls it when
+	// it's done
+	lua_getglobal(L, "os");
+	lua_pushcfunction(L, close_and_exit);
+	lua_setfield(L, -2, "exit");
+	lua_pop(L, 1);
+
 	// Build arg table for scripts
 	lua_createtable(L, argc - 1, 0);
 	for (int i = 1; i < argc; ++i) {
@@ -76,5 +89,6 @@ int main(int argc, char **argv) {
 
 	int base = lua_gettop(L) - argc + 1;
 	check(L, lua_pcall(L, argc - 2, LUA_MULTRET, base));
+	lua_close(L);
 }
 

build/ffmpeg/config-x64.asm

@@ -29,10 +29,12 @@
 %define HAVE_NEON 0
 %define HAVE_VFP 0
 %define HAVE_VFPV3 0
+%define HAVE_SETEND 0
 %define HAVE_ALTIVEC 0
 %define HAVE_DCBZL 1
 %define HAVE_LDBRX 1
 %define HAVE_PPC4XX 0
+%define HAVE_VSX 0
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@@ -62,10 +64,12 @@
 %define HAVE_NEON_EXTERNAL 0
 %define HAVE_VFP_EXTERNAL 0
 %define HAVE_VFPV3_EXTERNAL 0
+%define HAVE_SETEND_EXTERNAL 0
 %define HAVE_ALTIVEC_EXTERNAL 0
 %define HAVE_DCBZL_EXTERNAL 0
 %define HAVE_LDBRX_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
+%define HAVE_VSX_EXTERNAL 0
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@@ -95,10 +99,12 @@
 %define HAVE_NEON_INLINE 0
 %define HAVE_VFP_INLINE 0
 %define HAVE_VFPV3_INLINE 0
+%define HAVE_SETEND_INLINE 0
 %define HAVE_ALTIVEC_INLINE 0
 %define HAVE_DCBZL_INLINE 0
 %define HAVE_LDBRX_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
+%define HAVE_VSX_INLINE 0
 %define HAVE_AMD3DNOW_INLINE 0
 %define HAVE_AMD3DNOWEXT_INLINE 0
 %define HAVE_AVX_INLINE 0
@@ -128,10 +134,12 @@
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
+%define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1
 %define HAVE_ATOMIC_CAS_PTR 0
+%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 %define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 0
@@ -180,9 +188,11 @@
 %define HAVE_SYS_UN_H 0
 %define HAVE_SYS_VIDEOIO_H 0
 %define HAVE_TERMIOS_H 0
+%define HAVE_UDPLITE_H 0
 %define HAVE_UNISTD_H 0
 %define HAVE_WINDOWS_H 1
 %define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
 %define HAVE_ATANF 1
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
@@ -191,7 +201,6 @@
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
-%define HAVE_FMINF 1
 %define HAVE_ISINF 1
 %define HAVE_ISNAN 1
 %define HAVE_LDEXPF 1
@@ -232,6 +241,7 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
+%define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@@ -240,6 +250,7 @@
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
+%define HAVE_MOVEFILEEXA 1
 %define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
@@ -263,13 +274,13 @@
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
 %define HAVE_AS_DN_DIRECTIVE 0
-%define HAVE_AS_FUNC 1
+%define HAVE_AS_FUNC 0
 %define HAVE_ASM_MOD_Q 0
 %define HAVE_ATTRIBUTE_MAY_ALIAS 0
 %define HAVE_ATTRIBUTE_PACKED 0
 %define HAVE_EBP_AVAILABLE 0
 %define HAVE_EBX_AVAILABLE 0
-%define HAVE_GNU_AS 1
+%define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
 %define HAVE_INLINE_ASM_LABELS 0
@@ -282,6 +293,7 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
+%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_SOCKLEN_T 0
 %define HAVE_STRUCT_ADDRINFO 0
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -303,6 +315,7 @@
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
+%define HAVE_MAKEINFO_HTML 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 0
@@ -329,6 +342,7 @@
 %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
@@ -360,6 +374,7 @@
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 0
 %define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBFRIBIDI 0
 %define CONFIG_LIBGME 0
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
@@ -377,6 +392,7 @@
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
+%define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
 %define CONFIG_LIBSSH 0
@@ -395,13 +411,19 @@
 %define CONFIG_LIBX264 0
 %define CONFIG_LIBX265 0
 %define CONFIG_LIBXAVS 0
+%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_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 1
@@ -412,7 +434,6 @@
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 0
 %define CONFIG_SMALL 0
-%define CONFIG_SRAM 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
 %define CONFIG_DXVA2 1
@@ -439,11 +460,13 @@
 %define CONFIG_DCT 1
 %define CONFIG_DWT 1
 %define CONFIG_ERROR_RESILIENCE 1
+%define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
 %define CONFIG_FFT 1
 %define CONFIG_LSP 1
 %define CONFIG_LZO 1
 %define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
 %define CONFIG_NETWORK 0
 %define CONFIG_RDFT 1
 %define CONFIG_FONTCONFIG 0
@@ -459,9 +482,15 @@
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_AUDIO_FRAME_QUEUE 0
+%define CONFIG_AUDIODSP 1
+%define CONFIG_BLOCKDSP 1
+%define CONFIG_BSWAPDSP 1
 %define CONFIG_CABAC 1
-%define CONFIG_DSPUTIL 1
+%define CONFIG_DVPROFILE 1
 %define CONFIG_EXIF 1
+%define CONFIG_FAANDCT 1
+%define CONFIG_FAANIDCT 1
+%define CONFIG_FDCTDSP 1
 %define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_GCRYPT 0
 %define CONFIG_GOLOMB 1
@@ -475,16 +504,21 @@
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
 %define CONFIG_HUFFYUVENCDSP 0
+%define CONFIG_IDCTDSP 1
+%define CONFIG_IIRFILTER 0
 %define CONFIG_INTRAX8 1
 %define CONFIG_LGPLV3 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
 %define CONFIG_LPC 0
+%define CONFIG_ME_CMP 1
+%define CONFIG_MPEG_ER 1
 %define CONFIG_MPEGAUDIO 1
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
-%define CONFIG_MPEGVIDEOENC 0
+%define CONFIG_MPEGVIDEOENC 1
 %define CONFIG_NETTLE 0
+%define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_RANGECODER 1
 %define CONFIG_RIFFDEC 1
@@ -492,9 +526,11 @@
 %define CONFIG_RTPDEC 0
 %define CONFIG_RTPENC_CHAIN 0
 %define CONFIG_SINEWIN 1
+%define CONFIG_STARTCODE 1
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_WMA_FREQS 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
@@ -513,6 +549,7 @@
 %define CONFIG_AMV_DECODER 1
 %define CONFIG_ANM_DECODER 1
 %define CONFIG_ANSI_DECODER 1
+%define CONFIG_APNG_DECODER 1
 %define CONFIG_ASV1_DECODER 1
 %define CONFIG_ASV2_DECODER 1
 %define CONFIG_AURA_DECODER 1
@@ -881,6 +918,7 @@
 %define CONFIG_REALTEXT_DECODER 1
 %define CONFIG_SAMI_DECODER 1
 %define CONFIG_SRT_DECODER 1
+%define CONFIG_STL_DECODER 1
 %define CONFIG_SUBRIP_DECODER 1
 %define CONFIG_SUBVIEWER_DECODER 1
 %define CONFIG_SUBVIEWER1_DECODER 1
@@ -921,6 +959,7 @@
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
 %define CONFIG_APE_DEMUXER 1
+%define CONFIG_APNG_DEMUXER 1
 %define CONFIG_AQTITLE_DEMUXER 1
 %define CONFIG_ASF_DEMUXER 1
 %define CONFIG_ASS_DEMUXER 1
@@ -966,6 +1005,7 @@
 %define CONFIG_FLAC_DEMUXER 1
 %define CONFIG_FLIC_DEMUXER 1
 %define CONFIG_FLV_DEMUXER 1
+%define CONFIG_LIVE_FLV_DEMUXER 1
 %define CONFIG_FOURXM_DEMUXER 1
 %define CONFIG_FRM_DEMUXER 1
 %define CONFIG_G722_DEMUXER 1
@@ -1000,6 +1040,7 @@
 %define CONFIG_LATM_DEMUXER 1
 %define CONFIG_LMLM4_DEMUXER 1
 %define CONFIG_LOAS_DEMUXER 1
+%define CONFIG_LRC_DEMUXER 1
 %define CONFIG_LVF_DEMUXER 1
 %define CONFIG_LXF_DEMUXER 1
 %define CONFIG_M4V_DEMUXER 1
@@ -1089,8 +1130,10 @@
 %define CONFIG_SPDIF_DEMUXER 1
 %define CONFIG_SRT_DEMUXER 1
 %define CONFIG_STR_DEMUXER 1
+%define CONFIG_STL_DEMUXER 1
 %define CONFIG_SUBVIEWER1_DEMUXER 1
 %define CONFIG_SUBVIEWER_DEMUXER 1
+%define CONFIG_SUP_DEMUXER 1
 %define CONFIG_SWF_DEMUXER 1
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1112,6 +1155,7 @@
 %define CONFIG_W64_DEMUXER 1
 %define CONFIG_WAV_DEMUXER 1
 %define CONFIG_WC3_DEMUXER 1
+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 %define CONFIG_WEBVTT_DEMUXER 1
 %define CONFIG_WSAUD_DEMUXER 1
 %define CONFIG_WSVQA_DEMUXER 1
@@ -1123,6 +1167,18 @@
 %define CONFIG_XWMA_DEMUXER 1
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 %define CONFIG_LIBGME_DEMUXER 0
 %define CONFIG_LIBMODPLUG_DEMUXER 0
 %define CONFIG_LIBNUT_DEMUXER 0
@@ -1292,7 +1348,6 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBAACPLUS_ENCODER 0
-%define CONFIG_ACONVERT_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
 %define CONFIG_AECHO_FILTER 0
 %define CONFIG_AEVAL_FILTER 0
@@ -1332,6 +1387,7 @@
 %define CONFIG_EARWAX_FILTER 0
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
+%define CONFIG_FLANGER_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
@@ -1340,6 +1396,7 @@
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_SILENCEREMOVE_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
 %define CONFIG_VOLUME_FILTER 0
 %define CONFIG_VOLUMEDETECT_FILTER 0
@@ -1356,6 +1413,7 @@
 %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_COLORMATRIX_FILTER 0
@@ -1390,12 +1448,14 @@
 %define CONFIG_HISTEQ_FILTER 0
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
+%define CONFIG_HQX_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
 %define CONFIG_IL_FILTER 0
 %define CONFIG_INTERLACE_FILTER 0
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
+%define CONFIG_LENSCORRECTION_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1433,6 +1493,7 @@
 %define CONFIG_SETTB_FILTER 0
 %define CONFIG_SHOWINFO_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
@@ -1452,8 +1513,10 @@
 %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
+%define CONFIG_ZOOMPAN_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
@@ -1498,6 +1561,7 @@
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
+%define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_DSHOW_INDEV 0
 %define CONFIG_DV1394_INDEV 0
 %define CONFIG_FBDEV_INDEV 0
@@ -1513,6 +1577,7 @@
 %define CONFIG_V4L2_INDEV 0
 %define CONFIG_VFWCAP_INDEV 0
 %define CONFIG_X11GRAB_INDEV 0
+%define CONFIG_X11GRAB_XCB_INDEV 0
 %define CONFIG_LIBCDIO_INDEV 0
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_A64_MUXER 0
@@ -1532,6 +1597,7 @@
 %define CONFIG_CAF_MUXER 0
 %define CONFIG_CAVSVIDEO_MUXER 0
 %define CONFIG_CRC_MUXER 0
+%define CONFIG_DASH_MUXER 0
 %define CONFIG_DATA_MUXER 0
 %define CONFIG_DAUD_MUXER 0
 %define CONFIG_DIRAC_MUXER 0
@@ -1567,6 +1633,7 @@
 %define CONFIG_IVF_MUXER 0
 %define CONFIG_JACOSUB_MUXER 0
 %define CONFIG_LATM_MUXER 0
+%define CONFIG_LRC_MUXER 0
 %define CONFIG_M4V_MUXER 0
 %define CONFIG_MD5_MUXER 0
 %define CONFIG_MATROSKA_MUXER 0
@@ -1629,8 +1696,8 @@
 %define CONFIG_SMJPEG_MUXER 0
 %define CONFIG_SMOOTHSTREAMING_MUXER 0
 %define CONFIG_SOX_MUXER 0
+%define CONFIG_SPX_MUXER 0
 %define CONFIG_SPDIF_MUXER 0
-%define CONFIG_SPEEX_MUXER 0
 %define CONFIG_SRT_MUXER 0
 %define CONFIG_SWF_MUXER 0
 %define CONFIG_TEE_MUXER 0
@@ -1645,6 +1712,8 @@
 %define CONFIG_W64_MUXER 0
 %define CONFIG_WAV_MUXER 0
 %define CONFIG_WEBM_MUXER 0
+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+%define CONFIG_WEBP_MUXER 0
 %define CONFIG_WEBVTT_MUXER 0
 %define CONFIG_WTV_MUXER 0
 %define CONFIG_WV_MUXER 0
@@ -1711,6 +1780,7 @@
 %define CONFIG_HTTP_PROTOCOL 0
 %define CONFIG_HTTPPROXY_PROTOCOL 0
 %define CONFIG_HTTPS_PROTOCOL 0
+%define CONFIG_ICECAST_PROTOCOL 0
 %define CONFIG_MMSH_PROTOCOL 0
 %define CONFIG_MMST_PROTOCOL 0
 %define CONFIG_MD5_PROTOCOL 1
@@ -1728,6 +1798,7 @@
 %define CONFIG_TCP_PROTOCOL 0
 %define CONFIG_TLS_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
+%define CONFIG_UDPLITE_PROTOCOL 0
 %define CONFIG_UNIX_PROTOCOL 0
 %define CONFIG_LIBRTMP_PROTOCOL 0
 %define CONFIG_LIBRTMPE_PROTOCOL 0
@@ -1735,3 +1806,4 @@
 %define CONFIG_LIBRTMPT_PROTOCOL 0
 %define CONFIG_LIBRTMPTE_PROTOCOL 0
 %define CONFIG_LIBSSH_PROTOCOL 0
+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0

build/ffmpeg/config-x64.h

@@ -6,13 +6,14 @@
 #define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.30324 for x64"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x64"
 #define av_restrict __restrict
 #define EXTERN_PREFIX ""
 #define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256
 #define ARCH_AARCH64 0
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@@ -44,10 +45,12 @@
 #define HAVE_NEON 0
 #define HAVE_VFP 0
 #define HAVE_VFPV3 0
+#define HAVE_SETEND 0
 #define HAVE_ALTIVEC 0
 #define HAVE_DCBZL 1
 #define HAVE_LDBRX 1
 #define HAVE_PPC4XX 0
+#define HAVE_VSX 0
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
@@ -77,10 +80,12 @@
 #define HAVE_NEON_EXTERNAL 0
 #define HAVE_VFP_EXTERNAL 0
 #define HAVE_VFPV3_EXTERNAL 0
+#define HAVE_SETEND_EXTERNAL 0
 #define HAVE_ALTIVEC_EXTERNAL 0
 #define HAVE_DCBZL_EXTERNAL 0
 #define HAVE_LDBRX_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
+#define HAVE_VSX_EXTERNAL 0
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
@@ -110,10 +115,12 @@
 #define HAVE_NEON_INLINE 0
 #define HAVE_VFP_INLINE 0
 #define HAVE_VFPV3_INLINE 0
+#define HAVE_SETEND_INLINE 0
 #define HAVE_ALTIVEC_INLINE 0
 #define HAVE_DCBZL_INLINE 0
 #define HAVE_LDBRX_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
+#define HAVE_VSX_INLINE 0
 #define HAVE_AMD3DNOW_INLINE 0
 #define HAVE_AMD3DNOWEXT_INLINE 0
 #define HAVE_AVX_INLINE 0
@@ -143,10 +150,12 @@
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
+#define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1
 #define HAVE_ATOMIC_CAS_PTR 0
+#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 #define HAVE_MACHINE_RW_BARRIER 0
 #define HAVE_MEMORYBARRIER 1
 #define HAVE_MM_EMPTY 0
@@ -195,9 +204,11 @@
 #define HAVE_SYS_UN_H 0
 #define HAVE_SYS_VIDEOIO_H 0
 #define HAVE_TERMIOS_H 0
+#define HAVE_UDPLITE_H 0
 #define HAVE_UNISTD_H 0
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
 #define HAVE_ATANF 1
 #define HAVE_ATAN2F 1
 #define HAVE_CBRT 1
@@ -206,7 +217,6 @@
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_EXPF 1
-#define HAVE_FMINF 1
 #define HAVE_ISINF 1
 #define HAVE_ISNAN 1
 #define HAVE_LDEXPF 1
@@ -247,6 +257,7 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
+#define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@@ -255,6 +266,7 @@
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
+#define HAVE_MOVEFILEEXA 1
 #define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
@@ -278,13 +290,13 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
 #define HAVE_AS_DN_DIRECTIVE 0
-#define HAVE_AS_FUNC 1
+#define HAVE_AS_FUNC 0
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 0
 #define HAVE_ATTRIBUTE_PACKED 0
 #define HAVE_EBP_AVAILABLE 0
 #define HAVE_EBX_AVAILABLE 0
-#define HAVE_GNU_AS 1
+#define HAVE_GNU_AS 0
 #define HAVE_GNU_WINDRES 0
 #define HAVE_IBM_ASM 0
 #define HAVE_INLINE_ASM_LABELS 0
@@ -297,6 +309,7 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
+#define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_SOCKLEN_T 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -318,6 +331,7 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
+#define HAVE_MAKEINFO_HTML 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 0
@@ -344,6 +358,7 @@
 #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
@@ -375,6 +390,7 @@
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 0
 #define CONFIG_LIBFREETYPE 0
+#define CONFIG_LIBFRIBIDI 0
 #define CONFIG_LIBGME 0
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
@@ -392,6 +408,7 @@
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
+#define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -410,13 +427,19 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBX265 0
 #define CONFIG_LIBXAVS 0
+#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_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 1
@@ -427,7 +450,6 @@
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 0
 #define CONFIG_SMALL 0
-#define CONFIG_SRAM 0
 #define CONFIG_STATIC 1
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_DXVA2 1
@@ -454,11 +476,13 @@
 #define CONFIG_DCT 1
 #define CONFIG_DWT 1
 #define CONFIG_ERROR_RESILIENCE 1
+#define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
 #define CONFIG_FFT 1
 #define CONFIG_LSP 1
 #define CONFIG_LZO 1
 #define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
 #define CONFIG_NETWORK 0
 #define CONFIG_RDFT 1
 #define CONFIG_FONTCONFIG 0
@@ -474,9 +498,15 @@
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_AUDIO_FRAME_QUEUE 0
+#define CONFIG_AUDIODSP 1
+#define CONFIG_BLOCKDSP 1
+#define CONFIG_BSWAPDSP 1
 #define CONFIG_CABAC 1
-#define CONFIG_DSPUTIL 1
+#define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
+#define CONFIG_FAANDCT 1
+#define CONFIG_FAANIDCT 1
+#define CONFIG_FDCTDSP 1
 #define CONFIG_FRAME_THREAD_ENCODER 0
 #define CONFIG_GCRYPT 0
 #define CONFIG_GOLOMB 1
@@ -490,16 +520,21 @@
 #define CONFIG_HUFFMAN 1
 #define CONFIG_HUFFYUVDSP 1
 #define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IDCTDSP 1
+#define CONFIG_IIRFILTER 0
 #define CONFIG_INTRAX8 1
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 0
+#define CONFIG_ME_CMP 1
+#define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
-#define CONFIG_MPEGVIDEOENC 0
+#define CONFIG_MPEGVIDEOENC 1
 #define CONFIG_NETTLE 0
+#define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_RANGECODER 1
 #define CONFIG_RIFFDEC 1
@@ -507,9 +542,11 @@
 #define CONFIG_RTPDEC 0
 #define CONFIG_RTPENC_CHAIN 0
 #define CONFIG_SINEWIN 1
+#define CONFIG_STARTCODE 1
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_WMA_FREQS 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
@@ -528,6 +565,7 @@
 #define CONFIG_AMV_DECODER 1
 #define CONFIG_ANM_DECODER 1
 #define CONFIG_ANSI_DECODER 1
+#define CONFIG_APNG_DECODER 1
 #define CONFIG_ASV1_DECODER 1
 #define CONFIG_ASV2_DECODER 1
 #define CONFIG_AURA_DECODER 1
@@ -896,6 +934,7 @@
 #define CONFIG_REALTEXT_DECODER 1
 #define CONFIG_SAMI_DECODER 1
 #define CONFIG_SRT_DECODER 1
+#define CONFIG_STL_DECODER 1
 #define CONFIG_SUBRIP_DECODER 1
 #define CONFIG_SUBVIEWER_DECODER 1
 #define CONFIG_SUBVIEWER1_DECODER 1
@@ -936,6 +975,7 @@
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
+#define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
@@ -981,6 +1021,7 @@
 #define CONFIG_FLAC_DEMUXER 1
 #define CONFIG_FLIC_DEMUXER 1
 #define CONFIG_FLV_DEMUXER 1
+#define CONFIG_LIVE_FLV_DEMUXER 1
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
@@ -1015,6 +1056,7 @@
 #define CONFIG_LATM_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
+#define CONFIG_LRC_DEMUXER 1
 #define CONFIG_LVF_DEMUXER 1
 #define CONFIG_LXF_DEMUXER 1
 #define CONFIG_M4V_DEMUXER 1
@@ -1104,8 +1146,10 @@
 #define CONFIG_SPDIF_DEMUXER 1
 #define CONFIG_SRT_DEMUXER 1
 #define CONFIG_STR_DEMUXER 1
+#define CONFIG_STL_DEMUXER 1
 #define CONFIG_SUBVIEWER1_DEMUXER 1
 #define CONFIG_SUBVIEWER_DEMUXER 1
+#define CONFIG_SUP_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1127,6 +1171,7 @@
 #define CONFIG_W64_DEMUXER 1
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 1
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 #define CONFIG_WEBVTT_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
@@ -1138,6 +1183,18 @@
 #define CONFIG_XWMA_DEMUXER 1
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 #define CONFIG_LIBGME_DEMUXER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
@@ -1307,7 +1364,6 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBAACPLUS_ENCODER 0
-#define CONFIG_ACONVERT_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -1347,6 +1403,7 @@
 #define CONFIG_EARWAX_FILTER 0
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
+#define CONFIG_FLANGER_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
@@ -1355,6 +1412,7 @@
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
 #define CONFIG_VOLUME_FILTER 0
 #define CONFIG_VOLUMEDETECT_FILTER 0
@@ -1371,6 +1429,7 @@
 #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_COLORMATRIX_FILTER 0
@@ -1405,12 +1464,14 @@
 #define CONFIG_HISTEQ_FILTER 0
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
+#define CONFIG_HQX_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
+#define CONFIG_LENSCORRECTION_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1448,6 +1509,7 @@
 #define CONFIG_SETTB_FILTER 0
 #define CONFIG_SHOWINFO_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
@@ -1467,8 +1529,10 @@
 #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
+#define CONFIG_ZOOMPAN_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -1513,6 +1577,7 @@
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
+#define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_DSHOW_INDEV 0
 #define CONFIG_DV1394_INDEV 0
 #define CONFIG_FBDEV_INDEV 0
@@ -1528,6 +1593,7 @@
 #define CONFIG_V4L2_INDEV 0
 #define CONFIG_VFWCAP_INDEV 0
 #define CONFIG_X11GRAB_INDEV 0
+#define CONFIG_X11GRAB_XCB_INDEV 0
 #define CONFIG_LIBCDIO_INDEV 0
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_A64_MUXER 0
@@ -1547,6 +1613,7 @@
 #define CONFIG_CAF_MUXER 0
 #define CONFIG_CAVSVIDEO_MUXER 0
 #define CONFIG_CRC_MUXER 0
+#define CONFIG_DASH_MUXER 0
 #define CONFIG_DATA_MUXER 0
 #define CONFIG_DAUD_MUXER 0
 #define CONFIG_DIRAC_MUXER 0
@@ -1582,6 +1649,7 @@
 #define CONFIG_IVF_MUXER 0
 #define CONFIG_JACOSUB_MUXER 0
 #define CONFIG_LATM_MUXER 0
+#define CONFIG_LRC_MUXER 0
 #define CONFIG_M4V_MUXER 0
 #define CONFIG_MD5_MUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@@ -1644,8 +1712,8 @@
 #define CONFIG_SMJPEG_MUXER 0
 #define CONFIG_SMOOTHSTREAMING_MUXER 0
 #define CONFIG_SOX_MUXER 0
+#define CONFIG_SPX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
-#define CONFIG_SPEEX_MUXER 0
 #define CONFIG_SRT_MUXER 0
 #define CONFIG_SWF_MUXER 0
 #define CONFIG_TEE_MUXER 0
@@ -1660,6 +1728,8 @@
 #define CONFIG_W64_MUXER 0
 #define CONFIG_WAV_MUXER 0
 #define CONFIG_WEBM_MUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+#define CONFIG_WEBP_MUXER 0
 #define CONFIG_WEBVTT_MUXER 0
 #define CONFIG_WTV_MUXER 0
 #define CONFIG_WV_MUXER 0
@@ -1726,6 +1796,7 @@
 #define CONFIG_HTTP_PROTOCOL 0
 #define CONFIG_HTTPPROXY_PROTOCOL 0
 #define CONFIG_HTTPS_PROTOCOL 0
+#define CONFIG_ICECAST_PROTOCOL 0
 #define CONFIG_MMSH_PROTOCOL 0
 #define CONFIG_MMST_PROTOCOL 0
 #define CONFIG_MD5_PROTOCOL 1
@@ -1743,6 +1814,7 @@
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_UDPLITE_PROTOCOL 0
 #define CONFIG_UNIX_PROTOCOL 0
 #define CONFIG_LIBRTMP_PROTOCOL 0
 #define CONFIG_LIBRTMPE_PROTOCOL 0
@@ -1750,4 +1822,5 @@
 #define CONFIG_LIBRTMPT_PROTOCOL 0
 #define CONFIG_LIBRTMPTE_PROTOCOL 0
 #define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
 #endif /* FFMPEG_CONFIG_H */

build/ffmpeg/config-x86.asm

@@ -29,10 +29,12 @@
 %define HAVE_NEON 0
 %define HAVE_VFP 0
 %define HAVE_VFPV3 0
+%define HAVE_SETEND 0
 %define HAVE_ALTIVEC 0
 %define HAVE_DCBZL 1
 %define HAVE_LDBRX 1
 %define HAVE_PPC4XX 0
+%define HAVE_VSX 0
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@@ -62,10 +64,12 @@
 %define HAVE_NEON_EXTERNAL 0
 %define HAVE_VFP_EXTERNAL 0
 %define HAVE_VFPV3_EXTERNAL 0
+%define HAVE_SETEND_EXTERNAL 0
 %define HAVE_ALTIVEC_EXTERNAL 0
 %define HAVE_DCBZL_EXTERNAL 0
 %define HAVE_LDBRX_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
+%define HAVE_VSX_EXTERNAL 0
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@@ -95,10 +99,12 @@
 %define HAVE_NEON_INLINE 0
 %define HAVE_VFP_INLINE 0
 %define HAVE_VFPV3_INLINE 0
+%define HAVE_SETEND_INLINE 0
 %define HAVE_ALTIVEC_INLINE 0
 %define HAVE_DCBZL_INLINE 0
 %define HAVE_LDBRX_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
+%define HAVE_VSX_INLINE 0
 %define HAVE_AMD3DNOW_INLINE 0
 %define HAVE_AMD3DNOWEXT_INLINE 0
 %define HAVE_AVX_INLINE 0
@@ -128,10 +134,12 @@
 %define HAVE_LOCAL_ALIGNED_8 1
 %define HAVE_LOCAL_ALIGNED_16 1
 %define HAVE_LOCAL_ALIGNED_32 1
+%define HAVE_SIMD_ALIGN_16 1
 %define HAVE_ATOMICS_GCC 0
 %define HAVE_ATOMICS_SUNCC 0
 %define HAVE_ATOMICS_WIN32 1
 %define HAVE_ATOMIC_CAS_PTR 0
+%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 %define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 1
@@ -180,9 +188,11 @@
 %define HAVE_SYS_UN_H 0
 %define HAVE_SYS_VIDEOIO_H 0
 %define HAVE_TERMIOS_H 0
+%define HAVE_UDPLITE_H 0
 %define HAVE_UNISTD_H 0
 %define HAVE_WINDOWS_H 1
 %define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
 %define HAVE_ATANF 1
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
@@ -191,7 +201,6 @@
 %define HAVE_EXP2 1
 %define HAVE_EXP2F 1
 %define HAVE_EXPF 1
-%define HAVE_FMINF 1
 %define HAVE_ISINF 1
 %define HAVE_ISNAN 1
 %define HAVE_LDEXPF 1
@@ -232,6 +241,7 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
+%define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@@ -240,6 +250,7 @@
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
+%define HAVE_MOVEFILEEXA 1
 %define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
@@ -263,13 +274,13 @@
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
 %define HAVE_AS_DN_DIRECTIVE 0
-%define HAVE_AS_FUNC 1
+%define HAVE_AS_FUNC 0
 %define HAVE_ASM_MOD_Q 0
 %define HAVE_ATTRIBUTE_MAY_ALIAS 0
 %define HAVE_ATTRIBUTE_PACKED 0
 %define HAVE_EBP_AVAILABLE 0
 %define HAVE_EBX_AVAILABLE 0
-%define HAVE_GNU_AS 1
+%define HAVE_GNU_AS 0
 %define HAVE_GNU_WINDRES 0
 %define HAVE_IBM_ASM 0
 %define HAVE_INLINE_ASM_LABELS 0
@@ -282,6 +293,7 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
+%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_SOCKLEN_T 0
 %define HAVE_STRUCT_ADDRINFO 0
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -303,6 +315,7 @@
 %define HAVE_LIBDC1394_1 0
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 1
+%define HAVE_MAKEINFO_HTML 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 0
@@ -329,6 +342,7 @@
 %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
@@ -360,6 +374,7 @@
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 0
 %define CONFIG_LIBFREETYPE 0
+%define CONFIG_LIBFRIBIDI 0
 %define CONFIG_LIBGME 0
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
@@ -377,6 +392,7 @@
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
+%define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
 %define CONFIG_LIBSSH 0
@@ -395,13 +411,19 @@
 %define CONFIG_LIBX264 0
 %define CONFIG_LIBX265 0
 %define CONFIG_LIBXAVS 0
+%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_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 1
@@ -412,7 +434,6 @@
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 0
 %define CONFIG_SMALL 0
-%define CONFIG_SRAM 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
 %define CONFIG_DXVA2 1
@@ -439,11 +460,13 @@
 %define CONFIG_DCT 1
 %define CONFIG_DWT 1
 %define CONFIG_ERROR_RESILIENCE 1
+%define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
 %define CONFIG_FFT 1
 %define CONFIG_LSP 1
 %define CONFIG_LZO 1
 %define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
 %define CONFIG_NETWORK 0
 %define CONFIG_RDFT 1
 %define CONFIG_FONTCONFIG 0
@@ -459,9 +482,15 @@
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_AUDIO_FRAME_QUEUE 0
+%define CONFIG_AUDIODSP 1
+%define CONFIG_BLOCKDSP 1
+%define CONFIG_BSWAPDSP 1
 %define CONFIG_CABAC 1
-%define CONFIG_DSPUTIL 1
+%define CONFIG_DVPROFILE 1
 %define CONFIG_EXIF 1
+%define CONFIG_FAANDCT 1
+%define CONFIG_FAANIDCT 1
+%define CONFIG_FDCTDSP 1
 %define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_GCRYPT 0
 %define CONFIG_GOLOMB 1
@@ -475,16 +504,21 @@
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
 %define CONFIG_HUFFYUVENCDSP 0
+%define CONFIG_IDCTDSP 1
+%define CONFIG_IIRFILTER 0
 %define CONFIG_INTRAX8 1
 %define CONFIG_LGPLV3 0
 %define CONFIG_LLAUDDSP 1
 %define CONFIG_LLVIDDSP 1
 %define CONFIG_LPC 0
+%define CONFIG_ME_CMP 1
+%define CONFIG_MPEG_ER 1
 %define CONFIG_MPEGAUDIO 1
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
-%define CONFIG_MPEGVIDEOENC 0
+%define CONFIG_MPEGVIDEOENC 1
 %define CONFIG_NETTLE 0
+%define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_RANGECODER 1
 %define CONFIG_RIFFDEC 1
@@ -492,9 +526,11 @@
 %define CONFIG_RTPDEC 0
 %define CONFIG_RTPENC_CHAIN 0
 %define CONFIG_SINEWIN 1
+%define CONFIG_STARTCODE 1
 %define CONFIG_TPELDSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
+%define CONFIG_WMA_FREQS 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
@@ -513,6 +549,7 @@
 %define CONFIG_AMV_DECODER 1
 %define CONFIG_ANM_DECODER 1
 %define CONFIG_ANSI_DECODER 1
+%define CONFIG_APNG_DECODER 1
 %define CONFIG_ASV1_DECODER 1
 %define CONFIG_ASV2_DECODER 1
 %define CONFIG_AURA_DECODER 1
@@ -881,6 +918,7 @@
 %define CONFIG_REALTEXT_DECODER 1
 %define CONFIG_SAMI_DECODER 1
 %define CONFIG_SRT_DECODER 1
+%define CONFIG_STL_DECODER 1
 %define CONFIG_SUBRIP_DECODER 1
 %define CONFIG_SUBVIEWER_DECODER 1
 %define CONFIG_SUBVIEWER1_DECODER 1
@@ -921,6 +959,7 @@
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
 %define CONFIG_APE_DEMUXER 1
+%define CONFIG_APNG_DEMUXER 1
 %define CONFIG_AQTITLE_DEMUXER 1
 %define CONFIG_ASF_DEMUXER 1
 %define CONFIG_ASS_DEMUXER 1
@@ -966,6 +1005,7 @@
 %define CONFIG_FLAC_DEMUXER 1
 %define CONFIG_FLIC_DEMUXER 1
 %define CONFIG_FLV_DEMUXER 1
+%define CONFIG_LIVE_FLV_DEMUXER 1
 %define CONFIG_FOURXM_DEMUXER 1
 %define CONFIG_FRM_DEMUXER 1
 %define CONFIG_G722_DEMUXER 1
@@ -1000,6 +1040,7 @@
 %define CONFIG_LATM_DEMUXER 1
 %define CONFIG_LMLM4_DEMUXER 1
 %define CONFIG_LOAS_DEMUXER 1
+%define CONFIG_LRC_DEMUXER 1
 %define CONFIG_LVF_DEMUXER 1
 %define CONFIG_LXF_DEMUXER 1
 %define CONFIG_M4V_DEMUXER 1
@@ -1089,8 +1130,10 @@
 %define CONFIG_SPDIF_DEMUXER 1
 %define CONFIG_SRT_DEMUXER 1
 %define CONFIG_STR_DEMUXER 1
+%define CONFIG_STL_DEMUXER 1
 %define CONFIG_SUBVIEWER1_DEMUXER 1
 %define CONFIG_SUBVIEWER_DEMUXER 1
+%define CONFIG_SUP_DEMUXER 1
 %define CONFIG_SWF_DEMUXER 1
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1112,6 +1155,7 @@
 %define CONFIG_W64_DEMUXER 1
 %define CONFIG_WAV_DEMUXER 1
 %define CONFIG_WC3_DEMUXER 1
+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 %define CONFIG_WEBVTT_DEMUXER 1
 %define CONFIG_WSAUD_DEMUXER 1
 %define CONFIG_WSVQA_DEMUXER 1
@@ -1123,6 +1167,18 @@
 %define CONFIG_XWMA_DEMUXER 1
 %define CONFIG_YOP_DEMUXER 1
 %define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 %define CONFIG_LIBGME_DEMUXER 0
 %define CONFIG_LIBMODPLUG_DEMUXER 0
 %define CONFIG_LIBNUT_DEMUXER 0
@@ -1292,7 +1348,6 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBAACPLUS_ENCODER 0
-%define CONFIG_ACONVERT_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
 %define CONFIG_AECHO_FILTER 0
 %define CONFIG_AEVAL_FILTER 0
@@ -1332,6 +1387,7 @@
 %define CONFIG_EARWAX_FILTER 0
 %define CONFIG_EBUR128_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
+%define CONFIG_FLANGER_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
 %define CONFIG_JOIN_FILTER 0
 %define CONFIG_LADSPA_FILTER 0
@@ -1340,6 +1396,7 @@
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
+%define CONFIG_SILENCEREMOVE_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
 %define CONFIG_VOLUME_FILTER 0
 %define CONFIG_VOLUMEDETECT_FILTER 0
@@ -1356,6 +1413,7 @@
 %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_COLORMATRIX_FILTER 0
@@ -1390,12 +1448,14 @@
 %define CONFIG_HISTEQ_FILTER 0
 %define CONFIG_HISTOGRAM_FILTER 0
 %define CONFIG_HQDN3D_FILTER 0
+%define CONFIG_HQX_FILTER 0
 %define CONFIG_HUE_FILTER 0
 %define CONFIG_IDET_FILTER 0
 %define CONFIG_IL_FILTER 0
 %define CONFIG_INTERLACE_FILTER 0
 %define CONFIG_INTERLEAVE_FILTER 0
 %define CONFIG_KERNDEINT_FILTER 0
+%define CONFIG_LENSCORRECTION_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
 %define CONFIG_LUTRGB_FILTER 0
@@ -1433,6 +1493,7 @@
 %define CONFIG_SETTB_FILTER 0
 %define CONFIG_SHOWINFO_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
@@ -1452,8 +1513,10 @@
 %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
+%define CONFIG_ZOOMPAN_FILTER 0
 %define CONFIG_CELLAUTO_FILTER 0
 %define CONFIG_COLOR_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
@@ -1498,6 +1561,7 @@
 %define CONFIG_ALSA_INDEV 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
+%define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_DSHOW_INDEV 0
 %define CONFIG_DV1394_INDEV 0
 %define CONFIG_FBDEV_INDEV 0
@@ -1513,6 +1577,7 @@
 %define CONFIG_V4L2_INDEV 0
 %define CONFIG_VFWCAP_INDEV 0
 %define CONFIG_X11GRAB_INDEV 0
+%define CONFIG_X11GRAB_XCB_INDEV 0
 %define CONFIG_LIBCDIO_INDEV 0
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_A64_MUXER 0
@@ -1532,6 +1597,7 @@
 %define CONFIG_CAF_MUXER 0
 %define CONFIG_CAVSVIDEO_MUXER 0
 %define CONFIG_CRC_MUXER 0
+%define CONFIG_DASH_MUXER 0
 %define CONFIG_DATA_MUXER 0
 %define CONFIG_DAUD_MUXER 0
 %define CONFIG_DIRAC_MUXER 0
@@ -1567,6 +1633,7 @@
 %define CONFIG_IVF_MUXER 0
 %define CONFIG_JACOSUB_MUXER 0
 %define CONFIG_LATM_MUXER 0
+%define CONFIG_LRC_MUXER 0
 %define CONFIG_M4V_MUXER 0
 %define CONFIG_MD5_MUXER 0
 %define CONFIG_MATROSKA_MUXER 0
@@ -1629,8 +1696,8 @@
 %define CONFIG_SMJPEG_MUXER 0
 %define CONFIG_SMOOTHSTREAMING_MUXER 0
 %define CONFIG_SOX_MUXER 0
+%define CONFIG_SPX_MUXER 0
 %define CONFIG_SPDIF_MUXER 0
-%define CONFIG_SPEEX_MUXER 0
 %define CONFIG_SRT_MUXER 0
 %define CONFIG_SWF_MUXER 0
 %define CONFIG_TEE_MUXER 0
@@ -1645,6 +1712,8 @@
 %define CONFIG_W64_MUXER 0
 %define CONFIG_WAV_MUXER 0
 %define CONFIG_WEBM_MUXER 0
+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+%define CONFIG_WEBP_MUXER 0
 %define CONFIG_WEBVTT_MUXER 0
 %define CONFIG_WTV_MUXER 0
 %define CONFIG_WV_MUXER 0
@@ -1711,6 +1780,7 @@
 %define CONFIG_HTTP_PROTOCOL 0
 %define CONFIG_HTTPPROXY_PROTOCOL 0
 %define CONFIG_HTTPS_PROTOCOL 0
+%define CONFIG_ICECAST_PROTOCOL 0
 %define CONFIG_MMSH_PROTOCOL 0
 %define CONFIG_MMST_PROTOCOL 0
 %define CONFIG_MD5_PROTOCOL 1
@@ -1728,6 +1798,7 @@
 %define CONFIG_TCP_PROTOCOL 0
 %define CONFIG_TLS_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 0
+%define CONFIG_UDPLITE_PROTOCOL 0
 %define CONFIG_UNIX_PROTOCOL 0
 %define CONFIG_LIBRTMP_PROTOCOL 0
 %define CONFIG_LIBRTMPE_PROTOCOL 0
@@ -1735,3 +1806,4 @@
 %define CONFIG_LIBRTMPT_PROTOCOL 0
 %define CONFIG_LIBRTMPTE_PROTOCOL 0
 %define CONFIG_LIBSSH_PROTOCOL 0
+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0

build/ffmpeg/config-x86.h

@@ -6,13 +6,14 @@
 #define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.30324 for x86"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x86"
 #define av_restrict __restrict
 #define EXTERN_PREFIX "_"
 #define EXTERN_ASM _
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256
 #define ARCH_AARCH64 0
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@@ -44,10 +45,12 @@
 #define HAVE_NEON 0
 #define HAVE_VFP 0
 #define HAVE_VFPV3 0
+#define HAVE_SETEND 0
 #define HAVE_ALTIVEC 0
 #define HAVE_DCBZL 1
 #define HAVE_LDBRX 1
 #define HAVE_PPC4XX 0
+#define HAVE_VSX 0
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
@@ -77,10 +80,12 @@
 #define HAVE_NEON_EXTERNAL 0
 #define HAVE_VFP_EXTERNAL 0
 #define HAVE_VFPV3_EXTERNAL 0
+#define HAVE_SETEND_EXTERNAL 0
 #define HAVE_ALTIVEC_EXTERNAL 0
 #define HAVE_DCBZL_EXTERNAL 0
 #define HAVE_LDBRX_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
+#define HAVE_VSX_EXTERNAL 0
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
@@ -110,10 +115,12 @@
 #define HAVE_NEON_INLINE 0
 #define HAVE_VFP_INLINE 0
 #define HAVE_VFPV3_INLINE 0
+#define HAVE_SETEND_INLINE 0
 #define HAVE_ALTIVEC_INLINE 0
 #define HAVE_DCBZL_INLINE 0
 #define HAVE_LDBRX_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
+#define HAVE_VSX_INLINE 0
 #define HAVE_AMD3DNOW_INLINE 0
 #define HAVE_AMD3DNOWEXT_INLINE 0
 #define HAVE_AVX_INLINE 0
@@ -143,10 +150,12 @@
 #define HAVE_LOCAL_ALIGNED_8 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_32 1
+#define HAVE_SIMD_ALIGN_16 1
 #define HAVE_ATOMICS_GCC 0
 #define HAVE_ATOMICS_SUNCC 0
 #define HAVE_ATOMICS_WIN32 1
 #define HAVE_ATOMIC_CAS_PTR 0
+#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 #define HAVE_MACHINE_RW_BARRIER 0
 #define HAVE_MEMORYBARRIER 1
 #define HAVE_MM_EMPTY 1
@@ -195,9 +204,11 @@
 #define HAVE_SYS_UN_H 0
 #define HAVE_SYS_VIDEOIO_H 0
 #define HAVE_TERMIOS_H 0
+#define HAVE_UDPLITE_H 0
 #define HAVE_UNISTD_H 0
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
 #define HAVE_ATANF 1
 #define HAVE_ATAN2F 1
 #define HAVE_CBRT 1
@@ -206,7 +217,6 @@
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_EXPF 1
-#define HAVE_FMINF 1
 #define HAVE_ISINF 1
 #define HAVE_ISNAN 1
 #define HAVE_LDEXPF 1
@@ -247,6 +257,7 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
+#define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
@@ -255,6 +266,7 @@
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
+#define HAVE_MOVEFILEEXA 1
 #define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
@@ -278,13 +290,13 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_W32THREADS 1
 #define HAVE_AS_DN_DIRECTIVE 0
-#define HAVE_AS_FUNC 1
+#define HAVE_AS_FUNC 0
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 0
 #define HAVE_ATTRIBUTE_PACKED 0
 #define HAVE_EBP_AVAILABLE 0
 #define HAVE_EBX_AVAILABLE 0
-#define HAVE_GNU_AS 1
+#define HAVE_GNU_AS 0
 #define HAVE_GNU_WINDRES 0
 #define HAVE_IBM_ASM 0
 #define HAVE_INLINE_ASM_LABELS 0
@@ -297,6 +309,7 @@
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
+#define HAVE_CONDITION_VARIABLE_PTR 1
 #define HAVE_SOCKLEN_T 0
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -318,6 +331,7 @@
 #define HAVE_LIBDC1394_1 0
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 1
+#define HAVE_MAKEINFO_HTML 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 0
@@ -344,6 +358,7 @@
 #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
@@ -375,6 +390,7 @@
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 0
 #define CONFIG_LIBFREETYPE 0
+#define CONFIG_LIBFRIBIDI 0
 #define CONFIG_LIBGME 0
 #define CONFIG_LIBGSM 0
 #define CONFIG_LIBIEC61883 0
@@ -392,6 +408,7 @@
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
+#define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_LIBSOXR 0
 #define CONFIG_LIBSPEEX 0
 #define CONFIG_LIBSSH 0
@@ -410,13 +427,19 @@
 #define CONFIG_LIBX264 0
 #define CONFIG_LIBX265 0
 #define CONFIG_LIBXAVS 0
+#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_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 1
@@ -427,7 +450,6 @@
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 0
 #define CONFIG_SMALL 0
-#define CONFIG_SRAM 0
 #define CONFIG_STATIC 1
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_DXVA2 1
@@ -454,11 +476,13 @@
 #define CONFIG_DCT 1
 #define CONFIG_DWT 1
 #define CONFIG_ERROR_RESILIENCE 1
+#define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
 #define CONFIG_FFT 1
 #define CONFIG_LSP 1
 #define CONFIG_LZO 1
 #define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
 #define CONFIG_NETWORK 0
 #define CONFIG_RDFT 1
 #define CONFIG_FONTCONFIG 0
@@ -474,9 +498,15 @@
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_AUDIO_FRAME_QUEUE 0
+#define CONFIG_AUDIODSP 1
+#define CONFIG_BLOCKDSP 1
+#define CONFIG_BSWAPDSP 1
 #define CONFIG_CABAC 1
-#define CONFIG_DSPUTIL 1
+#define CONFIG_DVPROFILE 1
 #define CONFIG_EXIF 1
+#define CONFIG_FAANDCT 1
+#define CONFIG_FAANIDCT 1
+#define CONFIG_FDCTDSP 1
 #define CONFIG_FRAME_THREAD_ENCODER 0
 #define CONFIG_GCRYPT 0
 #define CONFIG_GOLOMB 1
@@ -490,16 +520,21 @@
 #define CONFIG_HUFFMAN 1
 #define CONFIG_HUFFYUVDSP 1
 #define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IDCTDSP 1
+#define CONFIG_IIRFILTER 0
 #define CONFIG_INTRAX8 1
 #define CONFIG_LGPLV3 0
 #define CONFIG_LLAUDDSP 1
 #define CONFIG_LLVIDDSP 1
 #define CONFIG_LPC 0
+#define CONFIG_ME_CMP 1
+#define CONFIG_MPEG_ER 1
 #define CONFIG_MPEGAUDIO 1
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
-#define CONFIG_MPEGVIDEOENC 0
+#define CONFIG_MPEGVIDEOENC 1
 #define CONFIG_NETTLE 0
+#define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_RANGECODER 1
 #define CONFIG_RIFFDEC 1
@@ -507,9 +542,11 @@
 #define CONFIG_RTPDEC 0
 #define CONFIG_RTPENC_CHAIN 0
 #define CONFIG_SINEWIN 1
+#define CONFIG_STARTCODE 1
 #define CONFIG_TPELDSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
+#define CONFIG_WMA_FREQS 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
@@ -528,6 +565,7 @@
 #define CONFIG_AMV_DECODER 1
 #define CONFIG_ANM_DECODER 1
 #define CONFIG_ANSI_DECODER 1
+#define CONFIG_APNG_DECODER 1
 #define CONFIG_ASV1_DECODER 1
 #define CONFIG_ASV2_DECODER 1
 #define CONFIG_AURA_DECODER 1
@@ -896,6 +934,7 @@
 #define CONFIG_REALTEXT_DECODER 1
 #define CONFIG_SAMI_DECODER 1
 #define CONFIG_SRT_DECODER 1
+#define CONFIG_STL_DECODER 1
 #define CONFIG_SUBRIP_DECODER 1
 #define CONFIG_SUBVIEWER_DECODER 1
 #define CONFIG_SUBVIEWER1_DECODER 1
@@ -936,6 +975,7 @@
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
 #define CONFIG_APE_DEMUXER 1
+#define CONFIG_APNG_DEMUXER 1
 #define CONFIG_AQTITLE_DEMUXER 1
 #define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 1
@@ -981,6 +1021,7 @@
 #define CONFIG_FLAC_DEMUXER 1
 #define CONFIG_FLIC_DEMUXER 1
 #define CONFIG_FLV_DEMUXER 1
+#define CONFIG_LIVE_FLV_DEMUXER 1
 #define CONFIG_FOURXM_DEMUXER 1
 #define CONFIG_FRM_DEMUXER 1
 #define CONFIG_G722_DEMUXER 1
@@ -1015,6 +1056,7 @@
 #define CONFIG_LATM_DEMUXER 1
 #define CONFIG_LMLM4_DEMUXER 1
 #define CONFIG_LOAS_DEMUXER 1
+#define CONFIG_LRC_DEMUXER 1
 #define CONFIG_LVF_DEMUXER 1
 #define CONFIG_LXF_DEMUXER 1
 #define CONFIG_M4V_DEMUXER 1
@@ -1104,8 +1146,10 @@
 #define CONFIG_SPDIF_DEMUXER 1
 #define CONFIG_SRT_DEMUXER 1
 #define CONFIG_STR_DEMUXER 1
+#define CONFIG_STL_DEMUXER 1
 #define CONFIG_SUBVIEWER1_DEMUXER 1
 #define CONFIG_SUBVIEWER_DEMUXER 1
+#define CONFIG_SUP_DEMUXER 1
 #define CONFIG_SWF_DEMUXER 1
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
@@ -1127,6 +1171,7 @@
 #define CONFIG_W64_DEMUXER 1
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 1
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
 #define CONFIG_WEBVTT_DEMUXER 1
 #define CONFIG_WSAUD_DEMUXER 1
 #define CONFIG_WSVQA_DEMUXER 1
@@ -1138,6 +1183,18 @@
 #define CONFIG_XWMA_DEMUXER 1
 #define CONFIG_YOP_DEMUXER 1
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
 #define CONFIG_LIBGME_DEMUXER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
@@ -1307,7 +1364,6 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBAACPLUS_ENCODER 0
-#define CONFIG_ACONVERT_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
 #define CONFIG_AECHO_FILTER 0
 #define CONFIG_AEVAL_FILTER 0
@@ -1347,6 +1403,7 @@
 #define CONFIG_EARWAX_FILTER 0
 #define CONFIG_EBUR128_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
+#define CONFIG_FLANGER_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
 #define CONFIG_JOIN_FILTER 0
 #define CONFIG_LADSPA_FILTER 0
@@ -1355,6 +1412,7 @@
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_SILENCEREMOVE_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
 #define CONFIG_VOLUME_FILTER 0
 #define CONFIG_VOLUMEDETECT_FILTER 0
@@ -1371,6 +1429,7 @@
 #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_COLORMATRIX_FILTER 0
@@ -1405,12 +1464,14 @@
 #define CONFIG_HISTEQ_FILTER 0
 #define CONFIG_HISTOGRAM_FILTER 0
 #define CONFIG_HQDN3D_FILTER 0
+#define CONFIG_HQX_FILTER 0
 #define CONFIG_HUE_FILTER 0
 #define CONFIG_IDET_FILTER 0
 #define CONFIG_IL_FILTER 0
 #define CONFIG_INTERLACE_FILTER 0
 #define CONFIG_INTERLEAVE_FILTER 0
 #define CONFIG_KERNDEINT_FILTER 0
+#define CONFIG_LENSCORRECTION_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
 #define CONFIG_LUTRGB_FILTER 0
@@ -1448,6 +1509,7 @@
 #define CONFIG_SETTB_FILTER 0
 #define CONFIG_SHOWINFO_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
@@ -1467,8 +1529,10 @@
 #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
+#define CONFIG_ZOOMPAN_FILTER 0
 #define CONFIG_CELLAUTO_FILTER 0
 #define CONFIG_COLOR_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
@@ -1513,6 +1577,7 @@
 #define CONFIG_ALSA_INDEV 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
+#define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_DSHOW_INDEV 0
 #define CONFIG_DV1394_INDEV 0
 #define CONFIG_FBDEV_INDEV 0
@@ -1528,6 +1593,7 @@
 #define CONFIG_V4L2_INDEV 0
 #define CONFIG_VFWCAP_INDEV 0
 #define CONFIG_X11GRAB_INDEV 0
+#define CONFIG_X11GRAB_XCB_INDEV 0
 #define CONFIG_LIBCDIO_INDEV 0
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_A64_MUXER 0
@@ -1547,6 +1613,7 @@
 #define CONFIG_CAF_MUXER 0
 #define CONFIG_CAVSVIDEO_MUXER 0
 #define CONFIG_CRC_MUXER 0
+#define CONFIG_DASH_MUXER 0
 #define CONFIG_DATA_MUXER 0
 #define CONFIG_DAUD_MUXER 0
 #define CONFIG_DIRAC_MUXER 0
@@ -1582,6 +1649,7 @@
 #define CONFIG_IVF_MUXER 0
 #define CONFIG_JACOSUB_MUXER 0
 #define CONFIG_LATM_MUXER 0
+#define CONFIG_LRC_MUXER 0
 #define CONFIG_M4V_MUXER 0
 #define CONFIG_MD5_MUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@@ -1644,8 +1712,8 @@
 #define CONFIG_SMJPEG_MUXER 0
 #define CONFIG_SMOOTHSTREAMING_MUXER 0
 #define CONFIG_SOX_MUXER 0
+#define CONFIG_SPX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
-#define CONFIG_SPEEX_MUXER 0
 #define CONFIG_SRT_MUXER 0
 #define CONFIG_SWF_MUXER 0
 #define CONFIG_TEE_MUXER 0
@@ -1660,6 +1728,8 @@
 #define CONFIG_W64_MUXER 0
 #define CONFIG_WAV_MUXER 0
 #define CONFIG_WEBM_MUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
+#define CONFIG_WEBP_MUXER 0
 #define CONFIG_WEBVTT_MUXER 0
 #define CONFIG_WTV_MUXER 0
 #define CONFIG_WV_MUXER 0
@@ -1726,6 +1796,7 @@
 #define CONFIG_HTTP_PROTOCOL 0
 #define CONFIG_HTTPPROXY_PROTOCOL 0
 #define CONFIG_HTTPS_PROTOCOL 0
+#define CONFIG_ICECAST_PROTOCOL 0
 #define CONFIG_MMSH_PROTOCOL 0
 #define CONFIG_MMST_PROTOCOL 0
 #define CONFIG_MD5_PROTOCOL 1
@@ -1743,6 +1814,7 @@
 #define CONFIG_TCP_PROTOCOL 0
 #define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_UDPLITE_PROTOCOL 0
 #define CONFIG_UNIX_PROTOCOL 0
 #define CONFIG_LIBRTMP_PROTOCOL 0
 #define CONFIG_LIBRTMPE_PROTOCOL 0
@@ -1750,4 +1822,5 @@
 #define CONFIG_LIBRTMPT_PROTOCOL 0
 #define CONFIG_LIBRTMPTE_PROTOCOL 0
 #define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
 #endif /* FFMPEG_CONFIG_H */

build/ffmpeg/ffmpeg.vcxproj

@@ -142,7 +142,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audioconvert.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audiodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aura.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avdct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avfft.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpacket.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpicture.c" />
@@ -158,10 +160,13 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bintext.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream_filter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\blockdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp_parser.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\brenderpix.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bswapdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\c93.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cabac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cavs.c" />
@@ -176,7 +181,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cga_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\chomp_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cinepak.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cljr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cljrdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cllc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cngdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\codec_desc.c" />
@@ -206,8 +211,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsddec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinav.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsputil.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dump_extradata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv_profile.c" />
@@ -237,6 +242,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\exr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faanidct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faxcompr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fdctdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_fixed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_fixed_32.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fft_float.c" />
@@ -311,6 +317,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuvdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idcinvideo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idctdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\iff.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imgconvert.c" />
@@ -329,6 +336,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jacosubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dwt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpegls.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeglsdec.c" />
@@ -352,6 +360,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_fixed_32.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_float.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\me_cmp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\microdvddec.c" />
@@ -381,6 +390,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4video.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4video_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4videodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg_er.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudio_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegaudiodata.c" />
@@ -395,6 +405,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo_motion.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideo_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideodsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpegvideoencdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpl2dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqcdec.c" />
@@ -427,14 +439,18 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_silk.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opusdec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\paf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-bluray.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-dvd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pel_template.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pgssubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pictordec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp_template.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pngdec.c" />
@@ -546,14 +562,19 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vble.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_block.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_loopfilter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_mc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1_pred.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vc1dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vcr1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\videodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vima.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdav.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdaudio.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmdvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vmnc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vorbis.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vorbis_data.c" />
@@ -582,6 +603,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\webvttdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma_common.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma_freqs.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmadec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmalosslessdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmaprodec.c" />
@@ -592,14 +614,16 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wnv1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ws-snd1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\cavsdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\constants.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dct_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dirac_dwt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_mmx.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil_mmx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fdctdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fft_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\flacdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fmtconvert_init.c" />
@@ -611,14 +635,16 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hevcdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp_mmx.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idct_mmx_xvid.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idct_sse2_xvid.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegaudiodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideodsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pixblockdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pngdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\proresdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\qpeldsp_init.c" />
@@ -637,6 +663,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp6dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp8dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_mmx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_sse2.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xan.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xbmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xface.c" />
@@ -644,6 +673,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xiph.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xl.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xsubdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xvididct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xwddec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xxan.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\y41pdec.c" />
@@ -668,6 +698,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\apc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ape.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\apetag.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\apngdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\aqtitledec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\asf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\asfcrypt.c" />
@@ -703,7 +734,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\crypto.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\cutils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\data_uri.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavformat\daud.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dauddec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dfa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\diracdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dnxhddec.c" />
@@ -711,6 +742,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dsicin.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dtsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dtshddec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dump.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dxa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\eacdata.c" />
@@ -762,6 +794,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\jvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\lmlm4.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\loasdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lrc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\lrcdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\lvfdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\lxfdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\m4vdec.c" />
@@ -838,6 +872,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rso.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rtpdec_h261.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\rtpdec_hevc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\samidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sauce.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sbgdec.c" />
@@ -856,10 +892,12 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\spdif.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\spdifdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\srtdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\stldec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subfile.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subtitles.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewer1dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewerdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\supdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\swf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\swfdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\takdec.c" />
@@ -914,6 +952,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\blowfish.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\bprint.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\buffer.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\cast5.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\channel_layout.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\cpu.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\crc.c" />
@@ -932,11 +971,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\hash.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\hmac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\imgutils.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\intfloat_readwrite.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\intmath.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\lfg.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls1.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\log.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\log2_tab.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\lzo.c" />
@@ -947,6 +984,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\opt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\parseutils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\pixdesc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\pixelutils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\random_seed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\rational.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\rc4.c" />
@@ -963,15 +1001,21 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\cpu.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\lls_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\xga_font_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\xtea.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\audioconvert.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\dither.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libswresample\log2_tab.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\options.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\rematrix.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\resample.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\resample_dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\swresample.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\swresample_x86.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\swresample_frame.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\rematrix_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\resample_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\hscale_fast_bilinear.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\input.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\options.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\output.c" />
@@ -979,6 +1023,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale_unscaled.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\utils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\hscale_fast_bilinear_simd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\rgb2rgb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\swscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\yuv2rgb.c" />
@@ -990,24 +1035,54 @@
       <Destination>libavutil\</Destination>
     </InstallHeaderTo>
 
-    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\avdevice.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\version.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avformat.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avio.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\version.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\avresample.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\audiodsp.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avcodec.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avdct.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\avfft.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\blockdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\bswapdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dv_profile_internal.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dxva2.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\fdctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\idctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\me_cmp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\mpeg_er.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\mpegvideodsp.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\old_codec_ids.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vaapi.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vc1_common.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vc1_pred.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vda.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vdpau.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vorbis_parser_internal.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\wma_freqs.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\fdct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\simple_idct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\xvididct.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\xvmc.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/swscale.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\avdevice.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_common.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_common_c.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\decklink_dec.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\oss_audio.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavdevice\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\generate_wave_table.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\interlace.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\tinterlace.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\vf_idet.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavfilter\vf_noise.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\apng.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avformat.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\avio.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\lrc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavformat\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\avresample.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavresample\version.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\adler32.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\aes.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\attributes.h" />
@@ -1021,10 +1096,12 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\bprint.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\bswap.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\buffer.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\cast5.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\channel_layout.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\common.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\cpu.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\crc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\dict.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\downmix_info.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\error.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\eval.h" />
@@ -1034,46 +1111,57 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\hmac.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\imgutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intfloat.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intfloat_readwrite.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intreadwrite.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lfg.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lls.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\log.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lzo.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\macros.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mathematics.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\md5.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mem.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\motion_vector.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\murmur3.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\dict.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\old_pix_fmts.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\opt.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\parseutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixdesc.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixelutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixfmt.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\random_seed.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\replaygain.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\rational.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\replaygain.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\ripemd.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\samplefmt.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\sha.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\sha512.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\stereo3d.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\thread.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\time.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\time_internal.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\timecode.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\timestamp.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\version.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\wchar_filename.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\xtea.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lzo.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswresample\resample.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/swscale.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libswscale/version.h" />
   </ItemGroup>
 
   <ItemGroup>
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dct32.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\deinterlace.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_yasm.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dsputil.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dwt_yasm.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fft.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\flac_dsp_gpl.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\flacdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fmtconvert.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fpel.asm" />
@@ -1091,12 +1179,19 @@
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight_10bit.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_deblock.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_idct.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_mc.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_res_add.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\imdct36.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\pixblockdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\pngdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\proresdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\qpel.asm" />
@@ -1117,6 +1212,8 @@
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9itxfm.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9lpf.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9mc.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavfilter\x86\vf_idet.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavfilter\x86\vf_interlace.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\audio_convert.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\audio_mix.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavresample\x86\dither.asm" />
@@ -1124,6 +1221,8 @@
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\emms.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\lls.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\pixelutils.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\resample.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\rematrix.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\input.asm" />

build/git_version.h

@@ -0,0 +1,3 @@
+#define BUILD_GIT_VERSION_NUMBER 8635
+#define BUILD_GIT_VERSION_STRING "3.2.2"
+#define TAGGED_RELEASE 1

build/wx/setup-build.h

@@ -87,6 +87,7 @@
 #define wxUSE_PROPGRID 0
 #define wxUSE_STC 1
 #define wxUSE_GRAPHICS_CONTEXT 1
+#define wxUSE_GRAPHICS_GDIPLUS 1
 #define wxUSE_CONTROLS 1
 #define wxUSE_POPUPWIN 1
 #define wxUSE_TIPWINDOW 0
@@ -253,4 +254,6 @@
 #define wxUSE_RICHTOOLTIP 0
 #define wxUSE_COMPILER_TLS 2
 #define wxUSE_PREFERENCES_EDITOR 0
+#define wxUSE_STD_CONTAINERS_COMPATIBLY 0
+#define wxUSE_TASKBARBUTTON 0
 #endif

config.guess

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2012-08-14'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-08-14'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -306,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -811,7 +826,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -859,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -886,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -957,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1237,19 +1256,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1340,154 +1371,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 

config.sub

@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2012-08-18'
+timestamp='2014-05-01'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-08-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,10 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -270,10 +265,11 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -287,20 +283,22 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -328,7 +326,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -370,13 +368,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -385,11 +383,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -403,18 +403,22 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -788,7 +792,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw64)
@@ -796,7 +800,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -832,7 +836,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1023,7 +1027,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1350,7 +1358,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1372,7 +1380,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1496,9 +1504,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1547,6 +1552,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;

configure.ac

@@ -50,7 +50,7 @@ AC_SUBST(build_darwin)
 # On OS X everything goes in an app bundle so no point in versioning the executable
 AS_IF([test x$build_darwin = xyes],
       [AEGISUB_COMMAND="aegisub"],
-      [AEGISUB_COMMAND="aegisub-3.1"])
+      [AEGISUB_COMMAND="aegisub-3.2"])
 AC_SUBST(AEGISUB_COMMAND)
 AC_DEFINE_UNQUOTED([AEGISUB_COMMAND], ["${AEGISUB_COMMAND}"], [Name of the Aegisub executable])
 
@@ -58,7 +58,7 @@ AC_DEFINE_UNQUOTED([AEGISUB_COMMAND], ["${AEGISUB_COMMAND}"], [Name of the Aegis
 # On OS X everything goes in an app bundle so no point in versioning the executable
 AS_IF([test x$build_darwin = xyes],
       [AEGISUB_CATALOG="aegisub"],
-      [AEGISUB_CATALOG="aegisub-31"])
+      [AEGISUB_CATALOG="aegisub-32"])
 AC_SUBST(AEGISUB_CATALOG)
 AC_DEFINE_UNQUOTED([AEGISUB_CATALOG], ["${AEGISUB_CATALOG}"], [Name of the Aegisub gettext catalog])
 

libaegisub/include/libaegisub/background_runner.h

@@ -68,13 +68,12 @@ namespace agi {
 
 		/// @brief Run a function on a background thread
 		/// @param task Function to run
-		/// @param priority Thread priority or -1 for default
 		/// @throws agi::UserCancelException on cancel
 		///
 		/// Blocks the calling thread until the task completes or is canceled.
 		/// Progress updates sent to the progress sink passed to the task should
 		/// be displayed to the user in some way, along with some way for the
 		/// user to cancel the task.
-		virtual void Run(std::function<void(ProgressSink *)> task, int priority=-1)=0;
+		virtual void Run(std::function<void(ProgressSink *)> task)=0;
 	};
 }

libaegisub/include/libaegisub/lua/utils.h

@@ -16,21 +16,27 @@
 
 #include <libaegisub/fs.h>
 
-#include <boost/exception/detail/attribute_noreturn.hpp>
 #include <lua.hpp>
 #include <string>
 #include <vector>
 #include <type_traits>
 
+#include <boost/config.hpp>
+
+#ifndef BOOST_NORETURN
+#include <boost/exception/detail/attribute_noreturn.hpp>
+#define BOOST_NORETURN BOOST_ATTRIBUTE_NORETURN
+#endif
+
 namespace agi { namespace lua {
 // Exception type for errors where the error details are on the lua stack
 struct error_tag {};
 
 // Below are functionally equivalent to the luaL_ functions, but using a C++
 // exception for stack unwinding
-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...);
-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg);
-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname);
+int BOOST_NORETURN error(lua_State *L, const char *fmt, ...);
+int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg);
+int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname);
 void argcheck(lua_State *L, bool cond, int narg, const char *msg);
 
 inline void push_value(lua_State *L, bool value) { lua_pushboolean(L, value); }

libaegisub/lua/utils.cpp

@@ -181,7 +181,7 @@ int add_stack_trace(lua_State *L) {
 	return 1;
 }
 
-int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) {
+int BOOST_NORETURN error(lua_State *L, const char *fmt, ...) {
 	va_list argp;
 	va_start(argp, fmt);
 	luaL_where(L, 1);
@@ -191,7 +191,7 @@ int BOOST_ATTRIBUTE_NORETURN error(lua_State *L, const char *fmt, ...) {
 	throw error_tag();
 }
 
-int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extramsg) {
+int BOOST_NORETURN argerror(lua_State *L, int narg, const char *extramsg) {
 	lua_Debug ar;
 	if (!lua_getstack(L, 0, &ar))
 		error(L, "bad argument #%d (%s)", narg, extramsg);
@@ -203,7 +203,7 @@ int BOOST_ATTRIBUTE_NORETURN argerror(lua_State *L, int narg, const char *extram
 		narg, ar.name, extramsg);
 }
 
-int BOOST_ATTRIBUTE_NORETURN typerror(lua_State *L, int narg, const char *tname) {
+int BOOST_NORETURN typerror(lua_State *L, int narg, const char *tname) {
 	const char *msg = lua_pushfstring(L, "%s expected, got %s",
 		tname, luaL_typename(L, narg));
 	argerror(L, narg, msg);

libaegisub/osx/dispatch.mm

@@ -17,19 +17,71 @@
 #include "libaegisub/dispatch.h"
 
 #include <dispatch/dispatch.h>
+#include <mutex>
 
 namespace {
-std::function<void (agi::dispatch::Thunk)> invoke_main;
+using namespace agi::dispatch;
+std::function<void (Thunk)> invoke_main;
 
-struct GCDQueue : agi::dispatch::Queue {
-    dispatch_queue_t queue;
-    GCDQueue(dispatch_queue_t queue) : queue(queue) { }
-    void DoInvoke(agi::dispatch::Thunk) override final { }
+struct OSXQueue : Queue {
+    virtual void DoSync(Thunk thunk)=0;
 };
 
-struct OwningQueue final : GCDQueue {
-    using GCDQueue::GCDQueue;
-    ~OwningQueue() { dispatch_release(queue); }
+struct MainQueue final : OSXQueue {
+    void DoInvoke(Thunk thunk) override { invoke_main(thunk); }
+
+    void DoSync(Thunk thunk) {
+        std::mutex m;
+        std::condition_variable cv;
+        std::unique_lock<std::mutex> l(m);
+        std::exception_ptr e;
+        bool done = false;
+        invoke_main([&]{
+            std::unique_lock<std::mutex> l(m);
+            try {
+                thunk();
+            }
+            catch (...) {
+                e = std::current_exception();
+            }
+            done = true;
+            cv.notify_all();
+        });
+        cv.wait(l, [&]{ return done; });
+        if (e) std::rethrow_exception(e);
+    }
+};
+
+struct GCDQueue final : OSXQueue {
+    dispatch_queue_t queue;
+    GCDQueue(dispatch_queue_t queue) : queue(queue) { }
+    ~GCDQueue() { dispatch_release(queue); }
+
+    void DoInvoke(Thunk thunk) override {
+        dispatch_async(queue, ^{
+            try {
+                thunk();
+            }
+            catch (...) {
+                auto e = std::current_exception();
+                invoke_main([=] { std::rethrow_exception(e); });
+            }
+        });
+    }
+
+    void DoSync(Thunk thunk) override {
+        std::exception_ptr e;
+        std::exception_ptr *e_ptr = &e;
+        dispatch_sync(queue, ^{
+            try {
+                thunk();
+            }
+            catch (...) {
+                *e_ptr = std::current_exception();
+            }
+        });
+        if (e) std::rethrow_exception(e);
+    }
 };
 }
 
@@ -38,34 +90,11 @@ void Init(std::function<void (Thunk)> invoke_main) {
     ::invoke_main = std::move(invoke_main);
 }
 
-void Queue::Async(Thunk thunk) {
-    dispatch_async(static_cast<GCDQueue *>(this)->queue, ^{
-        try {
-            thunk();
-        }
-        catch (...) {
-            auto e = std::current_exception();
-            invoke_main([=] { std::rethrow_exception(e); });
-        }
-    });
-}
-
-void Queue::Sync(Thunk thunk) {
-    std::exception_ptr e;
-    std::exception_ptr *e_ptr = &e;
-    dispatch_sync(static_cast<GCDQueue *>(this)->queue, ^{
-        try {
-            thunk();
-        }
-        catch (...) {
-            *e_ptr = std::current_exception();
-        }
-    });
-    if (e) std::rethrow_exception(e);
-}
+void Queue::Async(Thunk thunk) { DoInvoke(std::move(thunk)); }
+void Queue::Sync(Thunk thunk) { static_cast<OSXQueue *>(this)->DoSync(std::move(thunk)); }
 
 Queue& Main() {
-    static GCDQueue q(dispatch_get_main_queue());
+    static MainQueue q;
     return q;
 }
 
@@ -75,7 +104,7 @@ Queue& Background() {
 }
 
 std::unique_ptr<Queue> Create() {
-    return std::unique_ptr<Queue>(new OwningQueue(dispatch_queue_create("Aegisub worker queue",
-                                                                        DISPATCH_QUEUE_SERIAL)));
+    return std::unique_ptr<Queue>(new GCDQueue(dispatch_queue_create("Aegisub worker queue",
+                                                                     DISPATCH_QUEUE_SERIAL)));
 }
 } }

packages/win_installer/fragment_setupbase.iss

@@ -90,6 +90,7 @@ Name: "pt_PT"; MessagesFile: "compiler:Languages\Portuguese.isl"
 Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "sr_RS"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
 Name: "sr_RS_latin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+Name: "uk_UA"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
 

packages/win_installer/fragment_strings.iss

@@ -1,29 +1,44 @@
 [CustomMessages]
 InstallRuntime=Installing runtime libraries...
 el.InstallRuntime=Εγκατάσταση βιβλιοθηκών...
+eu.InstallRuntime=Runtime liburutegiak ezartzen...
+id.InstallRuntime=Memasang runtime libraries...
 pt_PT.InstallRuntime=A instalar livrarias de runtime...
+uk_UA.InstallRuntime=Встановлюю бібліотеки реального часу...
 zh_CN.InstallRuntime=正在安装运行库……
 zh_TW.InstallRuntime=正在安裝運行庫……
 StartMenuIcon=Create a start menu icon
 el.StartMenuIcon=Δημιουργία εικονιδίου στο μενού έναρξης
+eu.StartMenuIcon=Sortu hasiera menuko ikur bat
+id.StartMenuIcon=Buat ikon di menu awal
 pt_PT.StartMenuIcon=Criar ícone no menu iniciar
+uk_UA.StartMenuIcon=Створити піктограму в меню Запустити
 zh_CN.StartMenuIcon=创建开始菜单图标
 zh_TW.StartMenuIcon=創建開始功能表圖示
 CheckForUpdates=Automatically check for new versions of Aegisub
 el.CheckForUpdates=Αυτόματος έλεγχος για καινούριες εκδόσεις του Aegisub
+eu.CheckForUpdates=Berezgaitasunez egiaztatu Aegisub-ren bertsio berririk dagoen
+id.CheckForUpdates=Otomatis cek versi terbaru Aegisub
 pt_PT.CheckForUpdates=Verifica automaticamente a existência de novas versões do Aegisub
+uk_UA.CheckForUpdates=Автоматично перевіряти Aegisub на нові версії
 zh_CN.CheckForUpdates=自动检查Aegisub的新版本
-zh_TW.CheckForUpdates=更新檢查器：
+zh_TW.CheckForUpdates=自動檢查Aegisub的新版本
 UpdatesGroup=Update Checker:
 el.UpdatesGroup=Έλεγχος Ενημερώσεων:
+eu.UpdatesGroup=Eguneraketa Egiaztatzailea:
+id.UpdatesGroup=Pemeriksa Pembaharuan
 pt_PT.UpdatesGroup=Verificar Actualizações:
-zh_CN.UpdatesGroup=更新检查器：
-zh_TW.UpdatesGroup=自動檢查Aegisub的新版本
+uk_UA.UpdatesGroup=Модуль Перевірки на Оновлення:
+zh_CN.UpdatesGroup=自动更新：
+zh_TW.UpdatesGroup=自動更新：
 
 ; Replacement for License page, no need to bother the user with legal mumbo-jumbo
 [Messages]
 WelcomeLabel2=This will install Aegisub {#BUILD_GIT_VERSION_STRING} on your computer.%n%nAegisub is covered by the GNU General Public License version 2. This means you may use the application for any purpose without charge, but that no warranties of any kind are given either.%n%nSee the Aegisub website for information on obtaining the source code.
 el.WelcomeLabel2=Αυτό θα εγκαταστήσει το Aegisub {#BUILD_GIT_VERSION_STRING} στον υπολογιστή σας.%n%nΤο Aegisub καλύπτεται από τον άδεια GNU General Public License version 2. Αυτό σημαίνει ότι μπορείτε να χρησιμοποιήσετε την εφαρμογή για κάθε σκοπό χωρίς χρέωση, αλλά δεν υπάρχουν εγγυήσεις καμίας φύσης.%n%nΔείτε την ιστοσελίδα του Aegisub για πληροφορίες σχετικά με την απόκτηση του πηγαίου κώδικα.
+eu.WelcomeLabel2=Honek Aegisub {#BUILD_GIT_VERSION_STRING} ezarriko du zure ordenagailuan.%n%nAegisub GNU Baimen Publiko Orokorra 2. bertsioa Baimenak estalia dago. Honek esanahi du aplikazio hau edozein asmotarako erabili dezakezula ordaindu behar izan gabe, baina ez da inolako berme motarik ematen.%n%nIkusi Aegisub webgunea iturburu kodea lortzeko argibideetarako.
+id.WelcomeLabel2=Ini akan memasang Aegisub {#BUILD_GIT_VERSION_STRING} di komputer Anda.%n%nAegisub dilindungi oleh Lisensi Publik Umum GNU versi 2. Artinya Anda bisa menggunakan aplikasi ini untuk tujuan apa pun tanpad dipungut biaya, tapi tidak ada jaminan yang bisa diberikan.%n%nLihat laman situs Aegisub untuk memperoleh informasi sumber kode.
 pt_PT.WelcomeLabel2=Irá ser instalado no seu computador a versão {#BUILD_GIT_VERSION_STRING} do Aegisub.%n%nO Aegisub está protegido sob a Licença Pública Geral GNU (GPL version 2). O que significa que poderá fazer uso da aplicação para qualquer propósito, sem que seja cobrado, mas não serão dadas quaisquer tipos de garantias.%n%nVeja a página do Aegisub para mais informações sobre como obter o código-fonte.
+uk_UA.WelcomeLabel2=Зараз буде встанвлено Aegisub {#BUILD_GIT_VERSION_STRING} на ваш комп'ютер.%n%nAegisub захищено універсальною громадською ліцензією GNU, версія 2. Це означає, що ви можете використосувати цю програму для будь яких цілей безкоштовно, але, в будь-якому випадку, ми не даємо жодних гарантій.%n%nДивіться сайт Aegisub для інформації щодо отримання вихідного коду.
 zh_CN.WelcomeLabel2=将会在您的电脑上安装Aegisub {#BUILD_GIT_VERSION_STRING} 。%n%n Aegisub适用于GNU通用公共许可证第二版(GPLv2)，这意味着您可以将该应用程序用于任何目的而不需要支付费用，但同时也不会得到任何形式的担保。%n%n您可以到Aegisub官网获取源代码信息。
 zh_TW.WelcomeLabel2=將會在您的電腦上安裝Aegisub {#BUILD_GIT_VERSION_STRING} 。%n%n Aegisub適用於GNU通用公共許可證第二版(GPLv2)，這意味著您可以將該應用程式用於任何目的而不需要支付費用，但同時也不會得到任何形式的擔保。%n%n您可以到Aegisub官網獲取原始程式碼資訊。

packages/win_installer/fragment_translations.iss

@@ -87,6 +87,8 @@ Source: src\mo\wxstd-ru.mo;      DestDir: {app}\locale\ru;    DestName: wxstd.mo
 Source: ..\..\po\sr_RS.mo;       DestDir: {app}\locale\sr_RS; DestName: aegisub.mo; Flags: ignoreversion
 Source: ..\..\po\sr_RS@latin.mo; DestDir: {app}\locale\sr_RS@latin; DestName: aegisub.mo; Flags: ignoreversion
 ; Missing wxstd for Serbian
+Source: ..\..\po\uk_UA.mo;       DestDir: {app}\locale\uk_UA; DestName: aegisub.mo; Flags: ignoreversion
+Source: src\mo\wxstd-uk_UA.mo;   DestDir: {app}\locale\uk_UA; DestName: wxstd.mo;   Flags: ignoreversion
 Source: ..\..\po\vi.mo;          DestDir: {app}\locale\vi;    DestName: aegisub.mo; Flags: ignoreversion
 Source: src\mo\wxstd-vi.mo;      DestDir: {app}\locale\vi;    DestName: wxstd.mo;   Flags: ignoreversion
 Source: ..\..\po\zh_CN.mo;       DestDir: {app}\locale\zh_CN; DestName: aegisub.mo; Flags: ignoreversion

packages/win_installer/portable/portable-comment.txt

@@ -1,8 +1,8 @@
 Path=.\Aegisub portable
-Title=Aegisub 3.1.0 Portable
+Title=Aegisub 3.2.2 Portable
 Text
 {
-<h1 style="font-family: Tahoma; font-size: 20px; text-align: center;">Aegisub 3.1.0 Portable</h1>
+<h1 style="font-family: Tahoma; font-size: 20px; text-align: center;">Aegisub 3.2.2 Portable</h1>
 <p style="font-family: Tahoma; font-size: 12px;">This archive contains a
 "portable" version of Aegisub, suitable for running from USB pen drives or on
 machines which you cannot install software on. To reduce the size several

po/ar.po

@@ -2107,7 +2107,7 @@ msgstr "ينهي التطبيق"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "الل&غة..."
+msgstr "الل&غة... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/bg.po

@@ -2289,7 +2289,7 @@ msgstr "Изход от приложението"
 
 #: ../src/command/app.cpp:159
 msgid "&Language..."
-msgstr "&Езици"
+msgstr "&Езици (Language)"
 
 #: ../src/command/app.cpp:160
 msgid "Language"

po/cs.po

@@ -2050,7 +2050,7 @@ msgstr "Ukončí aplikaci"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "Jazyk..."
+msgstr "Jazyk... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/de.po

@@ -1137,7 +1137,7 @@ msgstr "Beendet Aegisub"
 
 #: ../src/command/app.cpp:180
 msgid "&Language..."
-msgstr "&Sprache..."
+msgstr "&Sprache... (Language)"
 
 #: ../src/command/app.cpp:181
 msgid "Language"

po/el.po

@@ -2273,7 +2273,7 @@ msgstr "Έξοδος από την εφαρμογή"
 
 #: ../src/command/app.cpp:160
 msgid "&Language..."
-msgstr "&Γλώσσα..."
+msgstr "&Γλώσσα... (Language)"
 
 #: ../src/command/app.cpp:161
 msgid "Language"

po/eu.po

@@ -2253,7 +2253,7 @@ msgstr "Irten aplikaziotik"
 
 #: ../src/command/app.cpp:157
 msgid "&Language..."
-msgstr "&Hizkuntza..."
+msgstr "&Hizkuntza... (Language)"
 
 #: ../src/command/app.cpp:158
 msgid "Language"

po/fr_FR.po

@@ -2015,7 +2015,7 @@ msgstr "Quitter l'application"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Langue..."
+msgstr "&Langue... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/gl.po

@@ -2016,7 +2016,7 @@ msgstr "Saír do programa"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Lingua..."
+msgstr "&Lingua... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/id.po

@@ -2246,7 +2246,7 @@ msgstr "Keluar dari aplikasi"
 
 #: ../src/command/app.cpp:157
 msgid "&Language..."
-msgstr "&Bahasa..."
+msgstr "&Bahasa... (Language)"
 
 #: ../src/command/app.cpp:158
 msgid "Language"

po/it.po

@@ -2047,7 +2047,7 @@ msgstr "Chiude l'applicazione"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Lingua..."
+msgstr "&Lingua... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/nl.po

@@ -2029,7 +2029,7 @@ msgstr "De toepassing afsluiten"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "Taal..."
+msgstr "Taal... (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/pt_PT.po

@@ -2247,7 +2247,7 @@ msgstr "Fecha o programa"
 
 #: ../src/command/app.cpp:160
 msgid "&Language..."
-msgstr "&Idioma..."
+msgstr "&Idioma... (Language)"
 
 #: ../src/command/app.cpp:161
 msgid "Language"

po/ru.po

@@ -2000,7 +2000,7 @@ msgstr "Выход из приложения"
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Язык"
+msgstr "&Язык (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/sr_RS.po

@@ -1996,7 +1996,7 @@ msgstr "Изађите из програма."
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Језик…"
+msgstr "&Језик… (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/sr_RS@latin.po

@@ -1996,7 +1996,7 @@ msgstr "Izađite iz programa."
 
 #: ../src/command/app.cpp:182
 msgid "&Language..."
-msgstr "&Jezik…"
+msgstr "&Jezik… (Language)"
 
 #: ../src/command/app.cpp:183
 msgid "Language"

po/zh_CN.po

@@ -2190,7 +2190,7 @@ msgstr "退出程序"
 
 #: ../src/command/app.cpp:157
 msgid "&Language..."
-msgstr "语言(&L)…"
+msgstr "语言(&L)… (Language)"
 
 #: ../src/command/app.cpp:158
 msgid "Language"

po/zh_TW.po

@@ -2196,7 +2196,7 @@ msgstr "退出程式"
 
 #: ../src/command/app.cpp:157
 msgid "&Language..."
-msgstr "語言(&L)…"
+msgstr "語言(&L)… (Language)"
 
 #: ../src/command/app.cpp:158
 msgid "Language"

src/ass_dialogue.h

@@ -129,13 +129,13 @@ struct AssDialogueBase {
 	/// Layer number
 	int Layer = 0;
 	/// Margins: 0 = Left, 1 = Right, 2 = Top (Vertical)
-	std::array<int, 3> Margin = {{0, 0, 0}};
+	std::array<int, 3> Margin = std::array<int, 3>{{ 0, 0, 0 }};
 	/// Starting time
 	agi::Time Start = 0;
 	/// Ending time
 	agi::Time End = 5000;
 	/// Style name
-	boost::flyweight<std::string> Style{ "Default" };
+	boost::flyweight<std::string> Style = boost::flyweight<std::string>("Default");
 	/// Actor name
 	boost::flyweight<std::string> Actor;
 	/// Effect name

src/ass_exporter.cpp

@@ -91,7 +91,7 @@ void AssExporter::Export(agi::fs::path const& filename, std::string const& chars
 	if (!writer)
 		throw agi::InvalidInputException("Unknown file type.");
 
-	writer->WriteFile(&subs, filename, c->project->Timecodes(), charset);
+	writer->ExportFile(&subs, filename, c->project->Timecodes(), charset);
 }
 
 wxSizer *AssExporter::GetSettingsSizer(std::string const& name) {

src/ass_file.cpp

@@ -28,6 +28,8 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/path.hpp>
 #include <cassert>
+#include <unordered_map>
+#include <unordered_set>
 
 AssFile::AssFile() { }
 
@@ -229,56 +231,82 @@ void AssFile::Sort(EntryList<AssDialogue> &lst, CompFunc comp, std::set<AssDialo
 	}
 }
 
-
 uint32_t AssFile::AddExtradata(std::string const& key, std::string const& value) {
-	// next_extradata_id must not exist
-	assert(Extradata.find(next_extradata_id) == Extradata.end());
-	Extradata[next_extradata_id] = {key, value};
+	for (auto const& data : Extradata) {
+		// perform brute-force deduplication by simple key and value comparison
+		if (key == data.key && value == data.value) {
+			return data.id;
+		}
+	}
+	Extradata.push_back(ExtradataEntry{next_extradata_id, key, value});
 	return next_extradata_id++; // return old value, then post-increment
 }
 
-std::map<std::string, std::string> AssFile::GetExtradata(std::vector<uint32_t> const& id_list) const {
-	// If multiple IDs have the same key name, the last ID wins
-	std::map<std::string, std::string> result;
-	for (auto id : id_list) {
-		auto it = Extradata.find(id);
-		if (it != Extradata.end())
-			result[it->second.first] = it->second.second;
+namespace {
+struct extradata_id_cmp {
+	bool operator()(ExtradataEntry const& e, uint32_t id) {
+		return e.id < id;
 	}
+	bool operator()(uint32_t id, ExtradataEntry const& e) {
+		return id < e.id;
+	}
+};
+
+template<typename ExtradataType, typename Func>
+void enumerate_extradata(ExtradataType&& extradata, std::vector<uint32_t> const& id_list, Func&& f) {
+	auto begin = extradata.begin(), end = extradata.end();
+	for (auto id : id_list) {
+		auto it = lower_bound(begin, end, id, extradata_id_cmp{});
+		if (it != end) {
+			f(*it);
+			begin = it;
+		}
+	}
+}
+
+template<typename K, typename V>
+using reference_map = std::unordered_map<std::reference_wrapper<const K>, V, std::hash<K>, std::equal_to<K>>;
+}
+
+std::vector<ExtradataEntry> AssFile::GetExtradata(std::vector<uint32_t> const& id_list) const {
+	std::vector<ExtradataEntry> result;
+	enumerate_extradata(Extradata, id_list, [&](ExtradataEntry const& e) {
+		result.push_back(e);
+	});
 	return result;
 }
 
 void AssFile::CleanExtradata() {
-	// Collect all IDs existing in the database
-	// Then remove all IDs found to be in use from this list
-	// Remaining is then all garbage IDs
-	std::vector<uint32_t> ids;
-	for (auto& it : Extradata)
-		ids.push_back(it.first);
-	if (ids.empty()) return;
+	if (Extradata.empty()) return;
 
-	// For each line, find which IDs it actually uses and remove them from the unused-list
+	std::unordered_set<uint32_t> ids_used;
 	for (auto& line : Events) {
+		if (line.ExtradataIds.get().empty()) continue;
+
 		// Find the ID for each unique key in the line
-		std::map<std::string, uint32_t> key_ids;
-		for (auto id : line.ExtradataIds.get()) {
-			auto ed_it = Extradata.find(id);
-			if (ed_it == Extradata.end())
-				continue;
-			key_ids[ed_it->second.first] = id;
+		reference_map<std::string, uint32_t> keys_used;
+		enumerate_extradata(Extradata, line.ExtradataIds.get(), [&](ExtradataEntry const& e) {
+			keys_used[e.key] = e.id;
+		});
+
+		for (auto const& used : keys_used)
+			ids_used.insert(used.second);
+
+		// If any keys were duplicated or missing, update the id list
+		if (keys_used.size() != line.ExtradataIds.get().size()) {
+			std::vector<uint32_t> ids;
+			ids.reserve(keys_used.size());
+			for (auto const& used : keys_used)
+				ids.push_back(used.second);
+			std::sort(begin(ids), end(ids));
+			line.ExtradataIds = std::move(ids);
 		}
-		// Update the line's ID list to only contain the actual ID for any duplicate keys
-		// Also mark found IDs as used in the cleaning list
-		std::vector<uint32_t> new_ids;
-		for (auto& keyid : key_ids) {
-			new_ids.push_back(keyid.second);
-			ids.erase(remove(begin(ids), end(ids), keyid.second), end(ids));
-		}
-		line.ExtradataIds = new_ids;
 	}
 
-	// The ids list should contain only unused IDs now
-	for (auto id : ids) {
-		Extradata.erase(id);
+	if (ids_used.size() != Extradata.size()) {
+		// Erase all no-longer-used extradata entries
+		Extradata.erase(std::remove_if(begin(Extradata), end(Extradata), [&](ExtradataEntry const& e) {
+			return !ids_used.count(e.id);
+		}), end(Extradata));
 	}
 }

src/ass_file.h

@@ -33,6 +33,7 @@
 #include <libaegisub/signal.h>
 
 #include <boost/intrusive/list.hpp>
+#include <map>
 #include <set>
 #include <vector>
 
@@ -45,7 +46,11 @@ class wxString;
 template<typename T>
 using EntryList = typename boost::intrusive::make_list<T, boost::intrusive::constant_time_size<false>, boost::intrusive::base_hook<AssEntryListHook>>::type;
 
-using AegisubExtradataMap = std::map<uint32_t, std::pair<std::string, std::string>>;
+struct ExtradataEntry {
+	uint32_t id;
+	std::string key;
+	std::string value;
+};
 
 struct AssFileCommit {
 	wxString const& message;
@@ -83,7 +88,7 @@ public:
 	EntryList<AssStyle> Styles;
 	EntryList<AssDialogue> Events;
 	std::vector<AssAttachment> Attachments;
-	AegisubExtradataMap Extradata;
+	std::vector<ExtradataEntry> Extradata;
 	ProjectProperties Properties;
 
 	uint32_t next_extradata_id = 0;
@@ -127,7 +132,7 @@ public:
 	/// @return ID of the created entry
 	uint32_t AddExtradata(std::string const& key, std::string const& value);
 	/// Fetch all extradata entries from a list of IDs
-	std::map<std::string, std::string> GetExtradata(std::vector<uint32_t> const& id_list) const;
+	std::vector<ExtradataEntry> GetExtradata(std::vector<uint32_t> const& id_list) const;
 	/// Remove unreferenced extradata entries
 	void CleanExtradata();
 
@@ -199,4 +204,3 @@ public:
 	/// @param limit If non-empty, only lines in this set are sorted
 	static void Sort(EntryList<AssDialogue>& lst, CompFunc comp = CompStart, std::set<AssDialogue*> const& limit = std::set<AssDialogue*>());
 };
-

src/ass_parser.cpp

@@ -219,7 +219,7 @@ void AssParser::ParseExtradataLine(std::string const &data) {
 
 		// ensure next_extradata_id is always at least 1 more than the largest existing id
 		target->next_extradata_id = std::max(id+1, target->next_extradata_id);
-		target->Extradata[id] = {key, value};
+		target->Extradata.push_back(ExtradataEntry{id, std::move(key), std::move(value)});
 	}
 }
 

src/auto4_base.cpp

@@ -239,16 +239,10 @@ namespace Automation4 {
 
 	void BackgroundScriptRunner::Run(std::function<void (ProgressSink*)> task)
 	{
-		int prio = OPT_GET("Automation/Thread Priority")->GetInt();
-		if (prio == 0) prio = 50; // normal
-		else if (prio == 1) prio = 30; // below normal
-		else if (prio == 2) prio = 10; // lowest
-		else prio = 50; // fallback normal
-
 		impl->Run([&](agi::ProgressSink *ps) {
 			ProgressSink aps(ps, this);
 			task(&aps);
-		}, prio);
+		});
 	}
 
 	wxWindow *BackgroundScriptRunner::GetParentWindow() const

src/auto4_lua_assfile.cpp

@@ -179,8 +179,8 @@ namespace Automation4 {
 			// create extradata table
 			lua_newtable(L);
 			for (auto const& ed : ass->GetExtradata(dia->ExtradataIds)) {
-				push_value(L, ed.first);
-				push_value(L, ed.second);
+				push_value(L, ed.key);
+				push_value(L, ed.value);
 				lua_settable(L, -3);
 			}
 			lua_setfield(L, -2, "extra");
@@ -309,7 +309,8 @@ namespace Automation4 {
 					get_string_or_default(L, -2),
 					get_string_or_default(L, -1)));
 			});
-			dia->ExtradataIds = new_ids;
+			std::sort(begin(new_ids), end(new_ids));
+			dia->ExtradataIds = std::move(new_ids);
 		}
 		else {
 			error(L, "Found line with unknown class: %s", lclass.c_str());

src/auto4_lua_progresssink.cpp

@@ -175,7 +175,7 @@ namespace Automation4 {
 				luaL_where(L, 1);
 				lua_insert(L, 1);
 				lua_concat(L, 2);
-				lua_error(L);
+				throw error_tag{};
 			}
 		}
 

src/base_grid.cpp

@@ -54,39 +54,6 @@
 #include <wx/scrolbar.h>
 #include <wx/sizer.h>
 
-namespace {
-#ifdef __WXMSW__
-class PaintDC : public wxBufferedDC {
-	wxPaintDC dc;
-
-public:
-	PaintDC(wxWindow *window) : dc(window) {
-		dc.SetLayoutDirection(wxLayout_LeftToRight);
-		Init(&dc, window->GetClientSize(), 0);
-		if (window->GetLayoutDirection() == wxLayout_RightToLeft) {
-			SetLayoutDirection(wxLayout_RightToLeft);
-			SetLogicalOrigin(GetSize().GetWidth(), 0);
-		}
-	}
-
-	~PaintDC() {
-		SetLayoutDirection(wxLayout_LeftToRight);
-		SetLogicalOrigin(0, 0);
-		UnMask();
-	}
-
-	void Clear() {
-		auto origin = GetLogicalOrigin();
-		SetLogicalOrigin(0, 0);
-		wxBufferedDC::Clear();
-		SetLogicalOrigin(origin.x, origin.y);
-	}
-};
-#else
-typedef wxAutoBufferedPaintDC PaintDC;
-#endif
-}
-
 enum {
 	GRID_SCROLLBAR = 1730,
 	MENU_SHOW_COL = 1250 // Needs 15 IDs after this
@@ -319,7 +286,7 @@ void BaseGrid::OnPaint(wxPaintEvent &) {
 	GetClientSize(&w,&h);
 	w -= scrollBar->GetSize().GetWidth();
 
-	PaintDC dc(this);
+	wxAutoBufferedPaintDC dc(this);
 	dc.SetFont(font);
 
 	dc.SetBackground(row_colors.Default);

src/command/subtitle.cpp

@@ -286,7 +286,7 @@ struct subtitle_open_video final : public Command {
 
 	void operator()(agi::Context *c) override {
 		if (c->subsController->TryToClose() == wxCANCEL) return;
-		c->subsController->Load(c->project->VideoName(), "binary");
+		c->project->LoadSubtitles(c->project->VideoName(), "binary", false);
 	}
 
 	bool Validate(const agi::Context *c) override {

src/dialog_progress.cpp

@@ -143,7 +143,7 @@ DialogProgress::DialogProgress(wxWindow *parent, wxString const& title_text, wxS
 	Bind(wxEVT_TIMER, [=](wxTimerEvent&) { gauge->Pulse(); });
 }
 
-void DialogProgress::Run(std::function<void(agi::ProgressSink*)> task, int priority) {
+void DialogProgress::Run(std::function<void(agi::ProgressSink*)> task) {
 	DialogProgressSink ps(this);
 	this->ps = &ps;
 

src/dialog_progress.h

@@ -64,5 +64,5 @@ public:
 	DialogProgress(wxWindow *parent, wxString const& title="", wxString const& message="");
 
 	/// BackgroundWorker implementation
-	void Run(std::function<void(agi::ProgressSink *)> task, int priority=-1) override;
+	void Run(std::function<void(agi::ProgressSink *)> task) override;
 };

src/dialog_shift_times.cpp

@@ -109,8 +109,10 @@ static wxString get_history_string(json::Object &obj) {
 	int64_t sel_mode = obj["mode"];
 	if (sel_mode == 0)
 		lines = _("all");
-	else if (sel_mode == 2)
-		lines = fmt_tl("from %d onward", (int64_t)static_cast<json::Object&>(sel.front())["start"]);
+	else if (sel_mode == 2) {
+		if (!sel.empty())
+			lines = fmt_tl("from %d onward", (int64_t)static_cast<json::Object&>(sel.front())["start"]);
+	}
 	else {
 		lines += _("sel ");
 		for (auto it = sel.begin(); it != sel.end(); ++it) {
@@ -344,6 +346,9 @@ void DialogShiftTimes::LoadHistory() {
 	catch (agi::fs::FileSystemError const& e) {
 		LOG_D("dialog_shift_times/load_history") << "Cannot load shift times history: " << e.GetMessage();
 	}
+	catch (json::Exception const& e) {
+		LOG_D("dialog_shift_times/load_history") << "Cannot load shift times history: " << e.what();
+	}
 	catch (...) {
 		history_box->Thaw();
 		throw;

src/fft.cpp

@@ -43,7 +43,7 @@
 
 void FFT::DoTransform (size_t n_samples,float *input,float *output_r,float *output_i,bool inverse) {
 	if (!IsPowerOfTwo(n_samples))
-		agi::InternalError(throw "FFT requires power of two input.");
+		throw agi::InternalError("FFT requires power of two input.");
 
 	// Inverse transform
 	float angle_num = 2.0f * 3.1415926535897932384626433832795f;

src/libresrc/default_config.json

@@ -94,7 +94,6 @@
 
 	"Automation" : {
 		"Autoreload Mode" : 1,
-		"Thread Priority" : 1,
 		"Trace Level" : 3
 	},
 

src/libresrc/osx/default_config.json

@@ -94,7 +94,6 @@
 
 	"Automation" : {
 		"Autoreload Mode" : 1,
-		"Thread Priority" : 1,
 		"Trace Level" : 3
 	},
 

src/mkv_wrap.cpp

@@ -237,10 +237,10 @@ void MatroskaWrapper::GetSubtitles(agi::fs::path const& filename, AssFile *targe
 			parser.AddLine(cur);
 	}
 	// Load default if it's SRT
-	else {
+	else
 		target->LoadDefault(false, OPT_GET("Subtitle Format/SRT/Default Style Catalog")->GetString());
-		parser.AddLine("[Events]");
-	}
+
+	parser.AddLine("[Events]");
 
 	// Read timecode scale
 	auto segInfo = mkv_GetFileInfo(file);

src/preferences.cpp

@@ -324,10 +324,6 @@ void Automation(wxTreebook *book, Preferences *parent) {
 	wxArrayString tl_choice(6, tl_arr);
 	p->OptionChoice(general, _("Trace level"), tl_choice, "Automation/Trace Level");
 
-	const wxString tp_arr[3] = { _("Normal"), _("Below Normal (recommended)"), _("Lowest") };
-	wxArrayString tp_choice(3, tp_arr);
-	p->OptionChoice(general, _("Thread priority"), tp_choice, "Automation/Thread Priority");
-
 	const wxString ar_arr[4] = { _("No scripts"), _("Subtitle-local scripts"), _("Global autoload scripts"), _("All scripts") };
 	wxArrayString ar_choice(4, ar_arr);
 	p->OptionChoice(general, _("Autoreload on Export"), ar_choice, "Automation/Autoreload Mode");

src/project.cpp

@@ -158,9 +158,9 @@ bool Project::DoLoadSubtitles(agi::fs::path const& path, std::string encoding, P
 	return true;
 }
 
-void Project::LoadSubtitles(agi::fs::path path, std::string encoding) {
+void Project::LoadSubtitles(agi::fs::path path, std::string encoding, bool load_linked) {
 	ProjectProperties properties;
-	if (DoLoadSubtitles(path, encoding, properties))
+	if (DoLoadSubtitles(path, encoding, properties) && load_linked)
 		LoadUnloadFiles(properties);
 }
 

src/project.h

@@ -69,7 +69,7 @@ public:
 	Project(agi::Context *context);
 	~Project();
 
-	void LoadSubtitles(agi::fs::path path, std::string encoding="");
+	void LoadSubtitles(agi::fs::path path, std::string encoding="", bool load_linked=true);
 	void CloseSubtitles();
 	bool CanLoadSubtitlesFromVideo() const { return video_has_subtitles; }
 

src/resolution_resampler.cpp

@@ -283,7 +283,8 @@ void ResampleResolution(AssFile *ass, ResampleSettings settings) {
 
 	ass->SetScriptInfo("PlayResX", std::to_string(settings.dest_x));
 	ass->SetScriptInfo("PlayResY", std::to_string(settings.dest_y));
-	ass->SetScriptInfo("YCbCr Matrix", MatrixToString(settings.dest_matrix));
+	if (resample_colors)
+		ass->SetScriptInfo("YCbCr Matrix", MatrixToString(settings.dest_matrix));
 
 	ass->Commit(_("resolution resampling"), AssFile::COMMIT_SCRIPTINFO | AssFile::COMMIT_DIAG_FULL);
 }

src/subs_controller.cpp

@@ -57,7 +57,7 @@ struct SubsController::UndoInfo {
 	std::vector<AssStyle> styles;
 	std::vector<AssDialogueBase> events;
 	std::vector<AssAttachment> attachments;
-	AegisubExtradataMap extradata;
+	std::vector<ExtradataEntry> extradata;
 
 	mutable std::vector<int> selection;
 	int active_line_id = 0;

src/subtitle_format.cpp

@@ -44,6 +44,7 @@
 #include "subtitle_format_microdvd.h"
 #include "subtitle_format_mkv.h"
 #include "subtitle_format_srt.h"
+#include "subtitle_format_ssa.h"
 #include "subtitle_format_transtation.h"
 #include "subtitle_format_ttxt.h"
 #include "subtitle_format_txt.h"
@@ -267,6 +268,7 @@ void SubtitleFormat::LoadFormats() {
 		formats.emplace_back(agi::make_unique<MKVSubtitleFormat>());
 		formats.emplace_back(agi::make_unique<MicroDVDSubtitleFormat>());
 		formats.emplace_back(agi::make_unique<SRTSubtitleFormat>());
+		formats.emplace_back(agi::make_unique<SsaSubtitleFormat>());
 		formats.emplace_back(agi::make_unique<TTXTSubtitleFormat>());
 		formats.emplace_back(agi::make_unique<TXTSubtitleFormat>());
 		formats.emplace_back(agi::make_unique<TranStationSubtitleFormat>());

src/subtitle_format.h

@@ -106,6 +106,15 @@ public:
 	/// @param forceEncoding Encoding to use or empty string for default
 	virtual void WriteFile(const AssFile *src, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding="") const { }
 
+	/// Export a subtitle file
+	///
+	/// This is used when saving via Export As..., for subtitle formats which
+	/// want to distinguish between exporting a final version of a script and
+	/// saving a project.
+	virtual void ExportFile(const AssFile *src, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding="") const {
+		WriteFile(src, filename, fps, encoding);
+	}
+
 	/// Get the wildcards for a save or load dialog
 	/// @param mode 0: load 1: save
 	static std::string GetWildcards(int mode);

src/subtitle_format_ass.cpp

@@ -122,8 +122,8 @@ struct Writer {
 			file.WriteLineToFile(key + std::to_string(n));
 	}
 
-	void WriteExtradata(AegisubExtradataMap const& extradata) {
-		if (extradata.size() == 0)
+	void WriteExtradata(std::vector<ExtradataEntry> const& extradata) {
+		if (extradata.empty())
 			return;
 
 		group = AssEntryGroup::EXTRADATA;
@@ -131,16 +131,16 @@ struct Writer {
 		file.WriteLineToFile("[Aegisub Extradata]");
 		for (auto const& edi : extradata) {
 			std::string line = "Data: ";
-			line += std::to_string(edi.first);
+			line += std::to_string(edi.id);
 			line += ",";
-			line += inline_string_encode(edi.second.first);
+			line += inline_string_encode(edi.key);
 			line += ",";
-			std::string encoded_data = inline_string_encode(edi.second.second);
-			if (4*edi.second.second.size() < 3*encoded_data.size()) {
+			std::string encoded_data = inline_string_encode(edi.value);
+			if (4*edi.value.size() < 3*encoded_data.size()) {
 				// the inline_string encoding grew the data by more than uuencoding would
 				// so base64 encode it instead
 				line += "u"; // marker for uuencoding
-				line += agi::ass::UUEncode(edi.second.second, false);
+				line += agi::ass::UUEncode(edi.value, false);
 			} else {
 				line += "e"; // marker for inline_string encoding (escaping)
 				line += encoded_data;
@@ -160,3 +160,11 @@ void AssSubtitleFormat::WriteFile(const AssFile *src, agi::fs::path const& filen
 	writer.Write(src->Events);
 	writer.WriteExtradata(src->Extradata);
 }
+
+void AssSubtitleFormat::ExportFile(const AssFile *src, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding) const {
+	Writer writer(filename, encoding);
+	writer.Write(src->Info);
+	writer.Write(src->Styles);
+	writer.Write(src->Attachments);
+	writer.Write(src->Events);
+}

src/subtitle_format_ass.h

@@ -28,4 +28,7 @@ public:
 
 	void ReadFile(AssFile *target, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& forceEncoding) const override;
 	void WriteFile(const AssFile *src, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding) const override;
+
+	// Does not write [Aegisub Project Garbage] and [Aegisub Extradata] sections when exporting
+	void ExportFile(const AssFile *src, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding) const override;
 };

vendor/boost

@@ -1 +1 @@
-Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35
+Subproject commit c038171a340eac748b2d14882f6f79e803d292f4

vendor/ffmpeg

@@ -1 +1 @@
-Subproject commit 049b20b287397b68804649673da32043d3908b77
+Subproject commit 79440651149c89fba9ef5563c9b8a4b3a59acdf5

vendor/ffms2

@@ -1 +1 @@
-Subproject commit 30adccf938ab076319bbbb311daa83d98e9fda44
+Subproject commit 7bffd502e2f139c15ac8be11afee136d54791ba0

vendor/freetype2

@@ -1 +1 @@
-Subproject commit ed372b712fa698da24c21746135f2c2c8d738c6e
+Subproject commit aaffbf85df8b02b469eb76e22354c2bab6759ae6

vendor/libass

@@ -1 +1 @@
-Subproject commit 042a22af3cb47a3320083a6b3ca8dbd8e255678d
+Subproject commit 507ae26358a491c7f665d32a3e07c2f176d152e9

vendor/wxWidgets

@@ -1 +1 @@
-Subproject commit be35fb7a15e8817ecd898ae9558e222ed63e572b
+Subproject commit 54e23e4593decf90ec474e89e733f358973a212a