projects :Update for recent upstream merge.

ShiftMediaProject · Oct 2, 2016 · e29df8f · e29df8f
1 parent 20b6546
commit e29df8f
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 20 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -435,14 +435,15 @@
 %define CONFIG_MANPAGES 0
 %define CONFIG_PODPAGES 0
 %define CONFIG_TXTPAGES 0
-%define CONFIG_AVIO_READING_EXAMPLE 0
 %define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
+%define CONFIG_AVIO_READING_EXAMPLE 0
 %define CONFIG_DECODING_ENCODING_EXAMPLE 0
 %define CONFIG_DEMUXING_DECODING_EXAMPLE 0
 %define CONFIG_EXTRACT_MVS_EXAMPLE 0
 %define CONFIG_FILTER_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 %define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
 %define CONFIG_METADATA_EXAMPLE 0
 %define CONFIG_MUXING_EXAMPLE 0
 %define CONFIG_QSVDEC_EXAMPLE 0
@@ -471,7 +472,6 @@
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBEBUR128 0
-%define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 1
@@ -1579,7 +1579,6 @@
 %define CONFIG_ILBC_AT_ENCODER 0
 %define CONFIG_PCM_ALAW_AT_ENCODER 0
 %define CONFIG_PCM_MULAW_AT_ENCODER 0
-%define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
 %define CONFIG_LIBGSM_MS_ENCODER 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -477,14 +477,15 @@
 #define CONFIG_MANPAGES 0
 #define CONFIG_PODPAGES 0
 #define CONFIG_TXTPAGES 0
-#define CONFIG_AVIO_READING_EXAMPLE 0
 #define CONFIG_AVIO_DIR_CMD_EXAMPLE 0
+#define CONFIG_AVIO_READING_EXAMPLE 0
 #define CONFIG_DECODING_ENCODING_EXAMPLE 0
 #define CONFIG_DEMUXING_DECODING_EXAMPLE 0
 #define CONFIG_EXTRACT_MVS_EXAMPLE 0
 #define CONFIG_FILTER_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_AUDIO_EXAMPLE 0
 #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
+#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
 #define CONFIG_METADATA_EXAMPLE 0
 #define CONFIG_MUXING_EXAMPLE 0
 #define CONFIG_QSVDEC_EXAMPLE 0
@@ -513,7 +514,6 @@
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBEBUR128 0
-#define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 1
@@ -1629,7 +1629,6 @@
 #define CONFIG_ILBC_AT_ENCODER 0
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
-#define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
 #define CONFIG_LIBGSM_MS_ENCODER 0

diff --git a/SMP/libavformat.def b/SMP/libavformat.def
@@ -66,6 +66,7 @@ EXPORTS
     av_register_output_format
     av_sdp_create
     av_seek_frame
+    av_stream_get_codec_timebase
     av_stream_get_end_pts
     av_stream_get_parser
     av_stream_get_r_frame_rate