From 0dfad4f88138ab31e4f48a295b433d7f48a71b02 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 23 Nov 2015 17:19:46 +1100 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/config.asm | 2 ++ SMP/config.h | 2 ++ SMP/libavformat.def | 1 + SMP/libavformat.vcxproj | 1 + SMP/libavformat.vcxproj.filters | 3 +++ SMP/libavutil.def | 2 ++ 6 files changed, 11 insertions(+) diff --git a/SMP/config.asm b/SMP/config.asm index ef0efa4eda..49219798f2 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -272,6 +272,7 @@ %define HAVE_EXP2 1 %define HAVE_EXP2F 1 %define HAVE_EXPF 1 +%define HAVE_HYPOT 1 %define HAVE_ISINF 1 %define HAVE_ISNAN 1 %define HAVE_LDEXPF 1 @@ -1156,6 +1157,7 @@ %define CONFIG_LIVE_FLV_DEMUXER 1 %define CONFIG_FOURXM_DEMUXER 1 %define CONFIG_FRM_DEMUXER 1 +%define CONFIG_FSB_DEMUXER 1 %define CONFIG_G722_DEMUXER 1 %define CONFIG_G723_1_DEMUXER 1 %define CONFIG_G729_DEMUXER 1 diff --git a/SMP/config.h b/SMP/config.h index 4849fde51f..e8c4f90aca 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -302,6 +302,7 @@ #define HAVE_EXP2 1 #define HAVE_EXP2F 1 #define HAVE_EXPF 1 +#define HAVE_HYPOT 1 #define HAVE_ISINF 1 #define HAVE_ISNAN 1 #define HAVE_LDEXPF 1 @@ -1206,6 +1207,7 @@ #define CONFIG_LIVE_FLV_DEMUXER 1 #define CONFIG_FOURXM_DEMUXER 1 #define CONFIG_FRM_DEMUXER 1 +#define CONFIG_FSB_DEMUXER 1 #define CONFIG_G722_DEMUXER 1 #define CONFIG_G723_1_DEMUXER 1 #define CONFIG_G729_DEMUXER 1 diff --git a/SMP/libavformat.def b/SMP/libavformat.def index 1f90d1ce32..6b3b2af4cf 100644 --- a/SMP/libavformat.def +++ b/SMP/libavformat.def @@ -68,6 +68,7 @@ EXPORTS av_stream_get_r_frame_rate av_stream_get_recommended_encoder_configuration av_stream_get_side_data + av_stream_new_side_data av_stream_set_r_frame_rate av_stream_set_recommended_encoder_configuration av_url_split diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index d5d4a0a794..54f7c467c1 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -232,6 +232,7 @@ + diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index b1dcab3f19..082d7faa9d 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -517,6 +517,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat diff --git a/SMP/libavutil.def b/SMP/libavutil.def index e3f93af6b4..e269347498 100644 --- a/SMP/libavutil.def +++ b/SMP/libavutil.def @@ -414,6 +414,8 @@ EXPORTS av_xtea_alloc av_xtea_crypt av_xtea_init + av_xtea_le_crypt + av_xtea_le_init avpriv_alloc_fixed_dsp avpriv_emms_yasm avpriv_float_dsp_alloc -- GitLab