projects: Update for recent merge.

SMP/libavutil.def

@@ -48,6 +48,9 @@ EXPORTS
     av_buffer_ref
     av_buffer_unref
     av_calloc
+    av_camellia_alloc
+    av_camellia_crypt
+    av_camellia_init
     av_cast5_alloc
     av_cast5_crypt
     av_cast5_crypt2
@@ -447,6 +450,7 @@ EXPORTS
     avutil_license
     avutil_version
     av_aes_size DATA
+    av_camellia_size DATA
     av_cast5_size DATA
     av_md5_size DATA
     av_pix_fmt_descriptors DATA

SMP/libavutil.vcxproj

@@ -92,6 +92,8 @@
     </ClCompile>
     <ClCompile Include="..\libavutil\cast5.c">
     </ClCompile>
+    <ClCompile Include="..\libavutil\camellia.c">
+    </ClCompile>
     <ClCompile Include="..\libavutil\channel_layout.c">
     </ClCompile>
     <ClCompile Include="..\libavutil\cpu.c">
@@ -218,6 +220,7 @@
     <ClInclude Include="..\libavutil\bswap.h" />
     <ClInclude Include="..\libavutil\buffer.h" />
     <ClInclude Include="..\libavutil\cast5.h" />
+    <ClInclude Include="..\libavutil\camellia.h" />
     <ClInclude Include="..\libavutil\channel_layout.h" />
     <ClInclude Include="..\libavutil\common.h" />
     <ClInclude Include="..\libavutil\cpu.h" />
@@ -528,6 +531,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -649,6 +653,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -777,6 +782,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -908,6 +914,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1041,6 +1048,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1172,6 +1180,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1307,6 +1316,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1436,6 +1446,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1572,6 +1583,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1706,6 +1718,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1842,6 +1855,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -1976,6 +1990,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -2105,6 +2120,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil
@@ -2233,6 +2249,7 @@ copy ..\libavutil\bprint.h $(OutDir)\include\libavutil
 copy ..\libavutil\bswap.h $(OutDir)\include\libavutil
 copy ..\libavutil\buffer.h $(OutDir)\include\libavutil
 copy ..\libavutil\cast5.h $(OutDir)\include\libavutil
+copy ..\libavutil\camellia.h $(OutDir)\include\libavutil
 copy ..\libavutil\channel_layout.h $(OutDir)\include\libavutil
 copy ..\libavutil\common.h $(OutDir)\include\libavutil
 copy ..\libavutil\cpu.h $(OutDir)\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -83,6 +83,9 @@
     <ClCompile Include="..\libavutil\cast5.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\camellia.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\channel_layout.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -286,6 +289,9 @@
     <ClInclude Include="..\libavutil\cast5.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\camellia.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\channel_layout.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>