projects: Update for recent upstream merge.

SMP/config.asm

@@ -90,6 +90,7 @@
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
+%define HAVE_MIPS64R2 0
 %define HAVE_MIPS64R6 0
 %define HAVE_MIPSDSP 0
 %define HAVE_MIPSDSPR2 0
@@ -131,6 +132,7 @@
 %define HAVE_I686_EXTERNAL 1
 %define HAVE_MIPSFPU_EXTERNAL 0
 %define HAVE_MIPS32R2_EXTERNAL 0
+%define HAVE_MIPS64R2_EXTERNAL 0
 %define HAVE_MIPS64R6_EXTERNAL 0
 %define HAVE_MIPSDSP_EXTERNAL 0
 %define HAVE_MIPSDSPR2_EXTERNAL 0
@@ -172,6 +174,7 @@
 %define HAVE_I686_INLINE 1
 %define HAVE_MIPSFPU_INLINE 0
 %define HAVE_MIPS32R2_INLINE 0
+%define HAVE_MIPS64R2_INLINE 0
 %define HAVE_MIPS64R6_INLINE 0
 %define HAVE_MIPSDSP_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0

SMP/config.h

@@ -116,6 +116,7 @@
 #define HAVE_I686 1
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
+#define HAVE_MIPS64R2 0
 #define HAVE_MIPS64R6 0
 #define HAVE_MIPSDSP 0
 #define HAVE_MIPSDSPR2 0
@@ -157,6 +158,7 @@
 #define HAVE_I686_EXTERNAL 1
 #define HAVE_MIPSFPU_EXTERNAL 0
 #define HAVE_MIPS32R2_EXTERNAL 0
+#define HAVE_MIPS64R2_EXTERNAL 0
 #define HAVE_MIPS64R6_EXTERNAL 0
 #define HAVE_MIPSDSP_EXTERNAL 0
 #define HAVE_MIPSDSPR2_EXTERNAL 0
@@ -198,6 +200,7 @@
 #define HAVE_I686_INLINE HAVE_INLINE_ASM
 #define HAVE_MIPSFPU_INLINE 0
 #define HAVE_MIPS32R2_INLINE 0
+#define HAVE_MIPS64R2_INLINE 0
 #define HAVE_MIPS64R6_INLINE 0
 #define HAVE_MIPSDSP_INLINE 0
 #define HAVE_MIPSDSPR2_INLINE 0

SMP/libavcodec/dxva2_vp9_wrap.c

-/** dxva2_vp9.c file wrapper for libavcodec
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_VP9_D3D11VA_HWACCEL || CONFIG_VP9_DXVA2_HWACCEL
-#   include "../../libavcodec/dxva2_vp9.c"
+/** dxva2_vp9.c file wrapper for libavcodec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_VP9_D3D11VA_HWACCEL || CONFIG_VP9_DXVA2_HWACCEL
+#   include "../../libavcodec/dxva2_vp9.c"
 #endif
\ No newline at end of file

SMP/libavcodec/log2_tab_wrap.c

-/** log2_tab.c file wrapper for libavcodec
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libavcodec/log2_tab.c"
+/** log2_tab.c file wrapper for libavcodec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavcodec/log2_tab.c"
 #endif
\ No newline at end of file

SMP/libavcodec/reverse_wrap.c

-/** reverse.c file wrapper for libavcodec
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libavcodec/reverse.c"
+/** reverse.c file wrapper for libavcodec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavcodec/reverse.c"
 #endif
\ No newline at end of file

SMP/libavfilter.vcxproj

@@ -98,6 +98,7 @@
     <ClCompile Include="..\libavfilter\drawutils.c" />
     <ClCompile Include="..\libavfilter\fifo.c" />
     <ClCompile Include="..\libavfilter\formats.c" />
+    <ClCompile Include="..\libavfilter\framepool.c" />
     <ClCompile Include="..\libavfilter\graphdump.c" />
     <ClCompile Include="..\libavfilter\graphparser.c" />
     <ClCompile Include="..\libavfilter\opencl_allkernels.c" />

SMP/libavfilter.vcxproj.filters

@@ -114,6 +114,9 @@
     <ClCompile Include="..\libavfilter\formats.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\framepool.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\graphdump.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/log2_tab_wrap.c

-/** log2_tab.c file wrapper for libavfilter
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libavfilter/log2_tab.c"
+/** log2_tab.c file wrapper for libavfilter
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavfilter/log2_tab.c"
 #endif
\ No newline at end of file

SMP/libavformat.vcxproj

@@ -298,6 +298,7 @@
     <ClCompile Include="..\libavformat\mmf.c" />
     <ClCompile Include="..\libavformat\movenc.c" />
     <ClCompile Include="..\libavformat\movenchint.c" />
+    <ClCompile Include="..\libavformat\movenccenc.c" />
     <ClCompile Include="..\libavformat\mp3enc.c" />
     <ClCompile Include="..\libavformat\mp3dec.c" />
     <ClCompile Include="..\libavformat\mpc.c" />

SMP/libavformat.vcxproj.filters

@@ -715,6 +715,9 @@
     <ClCompile Include="..\libavformat\movenchint.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\movenccenc.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\mp3enc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavformat/golomb_tab_wrap.c

-/** golomb_tab.c file wrapper for libavformat
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libavformat/golomb_tab.c"
+/** golomb_tab.c file wrapper for libavformat
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavformat/golomb_tab.c"
 #endif
\ No newline at end of file

SMP/libavformat/log2_tab_wrap.c

-/** log2_tab.c file wrapper for libavformat
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libavformat/log2_tab.c"
+/** log2_tab.c file wrapper for libavformat
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libavformat/log2_tab.c"
 #endif
\ No newline at end of file

SMP/libavutil.def

@@ -5,6 +5,14 @@ EXPORTS
     av_adler32_update
     av_aes_alloc
     av_aes_crypt
+    av_aes_ctr_alloc
+    av_aes_ctr_crypt
+    av_aes_ctr_free
+    av_aes_ctr_get_iv
+    av_aes_ctr_increment_iv
+    av_aes_ctr_init
+    av_aes_ctr_set_iv
+    av_aes_ctr_set_random_iv
     av_aes_init
     av_append_path_component
     av_asprintf

SMP/libavutil.vcxproj

@@ -78,6 +78,7 @@
   <ItemGroup>
     <ClCompile Include="..\libavutil\adler32.c" />
     <ClCompile Include="..\libavutil\aes.c" />
+    <ClCompile Include="..\libavutil\aes_ctr.c" />
     <ClCompile Include="..\libavutil\audio_fifo.c" />
     <ClCompile Include="..\libavutil\avstring.c" />
     <ClCompile Include="..\libavutil\base64.c" />
@@ -157,6 +158,7 @@
   <ItemGroup>
     <ClInclude Include="..\libavutil\adler32.h" />
     <ClInclude Include="..\libavutil\aes.h" />
+    <ClInclude Include="..\libavutil\aes_ctr.h" />
     <ClInclude Include="..\libavutil\attributes.h" />
     <ClInclude Include="..\libavutil\audio_fifo.h" />
     <ClInclude Include="..\libavutil\avassert.h" />
@@ -496,6 +498,7 @@
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -629,6 +632,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -768,6 +772,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -911,6 +916,7 @@ echo            These errors are the result of dead code elimination not being p
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1055,6 +1061,7 @@ echo            These errors are the result of dead code elimination not being p
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1198,6 +1205,7 @@ echo            These errors are the result of dead code elimination not being p
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1342,6 +1350,7 @@ echo            These errors are the result of dead code elimination not being p
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1481,6 +1490,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1626,6 +1636,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1770,6 +1781,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -1915,6 +1927,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -2059,6 +2072,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -2198,6 +2212,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil
@@ -2337,6 +2352,7 @@ cd $(ProjectDir)
 mkdir $(OutDir)\include\libavutil
 copy ..\libavutil\adler32.h $(OutDir)\include\libavutil
 copy ..\libavutil\aes.h $(OutDir)\include\libavutil
+copy ..\libavutil\aes_ctr.h $(OutDir)\include\libavutil
 copy ..\libavutil\attributes.h $(OutDir)\include\libavutil
 copy ..\libavutil\audio_fifo.h $(OutDir)\include\libavutil
 copy ..\libavutil\avassert.h $(OutDir)\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -60,6 +60,9 @@
     <ClCompile Include="..\libavutil\aes.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\aes_ctr.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\audio_fifo.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -269,6 +272,9 @@
     <ClInclude Include="..\libavutil\aes.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\aes_ctr.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\attributes.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>

SMP/libswresample/log2_tab_wrap.c

-/** log2_tab.c file wrapper for libswresample
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libswresample/log2_tab.c"
+/** log2_tab.c file wrapper for libswresample
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libswresample/log2_tab.c"
 #endif
\ No newline at end of file

SMP/libswscale/log2_tab_wrap.c

-/** log2_tab.c file wrapper for libswscale
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"
-#if CONFIG_SHARED
-#   include "../../libswscale/log2_tab.c"
+/** log2_tab.c file wrapper for libswscale
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "config.h"
+#if CONFIG_SHARED
+#   include "../../libswscale/log2_tab.c"
 #endif
\ No newline at end of file