projects: Update for recent upstream merge.

ShiftMediaProject · Jul 31, 2016 · 5001129 · 5001129
1 parent d965ca5
commit 5001129
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -1142,6 +1142,7 @@
 %define CONFIG_BINTEXT_DECODER 1
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
+%define CONFIG_LIBOPENH264_DECODER 0
 %define CONFIG_H264_CUVID_DECODER 0
 %define CONFIG_HEVC_CUVID_DECODER 0
 %define CONFIG_VC1_CUVID_DECODER 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -1192,6 +1192,7 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_LIBOPENH264_DECODER 0
 #define CONFIG_H264_CUVID_DECODER 0
 #define CONFIG_HEVC_CUVID_DECODER 0
 #define CONFIG_VC1_CUVID_DECODER 0

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -471,7 +471,7 @@
     <ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
     <ClCompile Include="..\libavcodec\ituh263enc.c" />
     <ClCompile Include="..\libavcodec\flvenc.c" />
-    <ClCompile Include="..\libavcodec\h264.c" />
+    <ClCompile Include="..\libavcodec\h264dec.c" />
     <ClCompile Include="..\libavcodec\h264_cabac.c" />
     <ClCompile Include="..\libavcodec\h264_cavlc.c" />
     <ClCompile Include="..\libavcodec\h264_direct.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -1233,7 +1233,7 @@
     <ClCompile Include="..\libavcodec\flvenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\h264.c">
+    <ClCompile Include="..\libavcodec\h264dec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
     <ClCompile Include="..\libavcodec\h264_cabac.c">