projects: Update for recent upstream merge.

ShiftMediaProject · Jan 22, 2017 · 3ae660c · 3ae660c
1 parent f997ab5
commit 3ae660c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -2213,12 +2213,14 @@
 %define CONFIG_PNM_PARSER 1
 %define CONFIG_RV30_PARSER 1
 %define CONFIG_RV40_PARSER 1
+%define CONFIG_SIPR_PARSER 1
 %define CONFIG_TAK_PARSER 1
 %define CONFIG_VC1_PARSER 1
 %define CONFIG_VORBIS_PARSER 1
 %define CONFIG_VP3_PARSER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
+%define CONFIG_XMA_PARSER 1
 %define CONFIG_ASYNC_PROTOCOL 1
 %define CONFIG_BLURAY_PROTOCOL 1
 %define CONFIG_CACHE_PROTOCOL 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -2273,12 +2273,14 @@
 #define CONFIG_PNM_PARSER 1
 #define CONFIG_RV30_PARSER 1
 #define CONFIG_RV40_PARSER 1
+#define CONFIG_SIPR_PARSER 1
 #define CONFIG_TAK_PARSER 1
 #define CONFIG_VC1_PARSER 1
 #define CONFIG_VORBIS_PARSER 1
 #define CONFIG_VP3_PARSER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
+#define CONFIG_XMA_PARSER 1
 #define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 1
 #define CONFIG_CACHE_PROTOCOL 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -859,11 +859,13 @@
     <ClCompile Include="..\libavcodec\opus_parser.c" />
     <ClCompile Include="..\libavcodec\pnm_parser.c" />
     <ClCompile Include="..\libavcodec\rv34_parser.c" />
+    <ClCompile Include="..\libavcodec\sipr_parser.c" />
     <ClCompile Include="..\libavcodec\tak_parser.c" />
     <ClCompile Include="..\libavcodec\vc1_parser.c" />
     <ClCompile Include="..\libavcodec\vp3_parser.c" />
     <ClCompile Include="..\libavcodec\vp8_parser.c" />
     <ClCompile Include="..\libavcodec\vp9_parser.c" />
+    <ClCompile Include="..\libavcodec\xma_parser.c" />
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
     <ClCompile Include="..\libavcodec\chomp_bsf.c" />
     <ClCompile Include="..\libavcodec\dump_extradata_bsf.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -2400,6 +2400,9 @@
     <ClCompile Include="..\libavcodec\rv34_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\sipr_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\tak_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2415,6 +2418,9 @@
     <ClCompile Include="..\libavcodec\vp9_parser.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\xma_parser.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavutil.def b/SMP/libavutil.def
@@ -258,6 +258,7 @@ EXPORTS
     av_int2i
     av_int_list_length_for_size
     av_lfg_init
+    av_lfg_init_from_data
     av_log
     av_log2
     av_log2_16bit