projects: Update for recent upstream merge.

SMP/config.asm

@@ -867,7 +867,6 @@
 %define CONFIG_PNG_DECODER 1
 %define CONFIG_PPM_DECODER 1
 %define CONFIG_PRORES_DECODER 1
-%define CONFIG_PRORES_LGPL_DECODER 1
 %define CONFIG_PSD_DECODER 1
 %define CONFIG_PTX_DECODER 1
 %define CONFIG_QDRAW_DECODER 1
@@ -1861,6 +1860,7 @@
 %define CONFIG_TILE_FILTER 1
 %define CONFIG_TINTERLACE_FILTER 1
 %define CONFIG_TLUT2_FILTER 1
+%define CONFIG_TMIX_FILTER 1
 %define CONFIG_TONEMAP_FILTER 1
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRIM_FILTER 1

SMP/config.h

@@ -932,7 +932,6 @@
 #define CONFIG_PNG_DECODER 1
 #define CONFIG_PPM_DECODER 1
 #define CONFIG_PRORES_DECODER 1
-#define CONFIG_PRORES_LGPL_DECODER 1
 #define CONFIG_PSD_DECODER 1
 #define CONFIG_PTX_DECODER 1
 #define CONFIG_QDRAW_DECODER 1
@@ -1947,6 +1946,7 @@
 #define CONFIG_TILE_FILTER 1
 #define CONFIG_TINTERLACE_FILTER 1
 #define CONFIG_TLUT2_FILTER 1
+#define CONFIG_TMIX_FILTER 1
 #define CONFIG_TONEMAP_FILTER 1
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRIM_FILTER 1

SMP/libavcodec.vcxproj

@@ -653,7 +653,6 @@
     <ClCompile Include="..\libavcodec\textdec.c" />
     <ClCompile Include="..\libavcodec\proresdec2.c" />
     <ClCompile Include="..\libavcodec\proresdata.c" />
-    <ClCompile Include="..\libavcodec\proresdec_lgpl.c" />
     <ClCompile Include="..\libavcodec\proresenc_anatoliy.c" />
     <ClCompile Include="..\libavcodec\proresenc_kostya.c" />
     <ClCompile Include="..\libavcodec\psd.c" />

SMP/libavcodec.vcxproj.filters

@@ -1782,9 +1782,6 @@
     <ClCompile Include="..\libavcodec\proresdata.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\proresdec_lgpl.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\proresenc_anatoliy.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavcodec/codec_list.c

@@ -332,7 +332,6 @@ static const AVCodec *codec_list[] = {
     &ff_png_decoder,
     &ff_ppm_decoder,
     &ff_prores_decoder,
-    &ff_prores_lgpl_decoder,
     &ff_psd_decoder,
     &ff_ptx_decoder,
     &ff_qdraw_decoder,

SMP/libavfilter.vcxproj

@@ -274,6 +274,7 @@
     <ClCompile Include="..\libavfilter\vf_hwupload.c" />
     <ClCompile Include="..\libavfilter\vf_hysteresis.c" />
     <ClCompile Include="..\libavfilter\vf_il.c" />
+    <ClCompile Include="..\libavfilter\vf_tinterlace.c" />
     <ClCompile Include="..\libavfilter\vf_kerndeint.c" />
     <ClCompile Include="..\libavfilter\vf_lenscorrection.c" />
     <ClCompile Include="..\libavfilter\vf_lumakey.c" />
@@ -337,7 +338,6 @@
     <ClCompile Include="..\libavfilter\vf_telecine.c" />
     <ClCompile Include="..\libavfilter\vf_thumbnail.c" />
     <ClCompile Include="..\libavfilter\vf_tile.c" />
-    <ClCompile Include="..\libavfilter\vf_tinterlace.c" />
     <ClCompile Include="..\libavfilter\vf_tonemap.c" />
     <ClCompile Include="..\libavfilter\vf_transpose.c" />
     <ClCompile Include="..\libavfilter\vf_unsharp.c" />
@@ -379,7 +379,7 @@
     <ClCompile Include="..\libavfilter\x86\vf_hflip_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_hqdn3d_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_idet_init.c" />
-    <ClCompile Include="..\libavfilter\x86\vf_interlace_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_limiter_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_pp7_init.c" />
@@ -390,7 +390,6 @@
     <ClCompile Include="..\libavfilter\x86\vf_ssim_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_stereo3d_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_threshold_init.c" />
-    <ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c" />
     <ClCompile Include="..\libavfilter\x86\af_volume_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_w3fdif_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_yadif_init.c" />
@@ -429,9 +428,6 @@
     <ClCompile Include="..\libavfilter\vf_idet.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_idet.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_interlace.c">
-      <ObjectFileName>$(IntDir)\libavfilter_vf_interlace.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_limiter.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_limiter.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -645,6 +645,9 @@
     <ClCompile Include="..\libavfilter\vf_il.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_tinterlace.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_kerndeint.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -834,9 +837,6 @@
     <ClCompile Include="..\libavfilter\vf_tile.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_tinterlace.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_tonemap.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -960,7 +960,7 @@
     <ClCompile Include="..\libavfilter\x86\vf_idet_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\x86\vf_interlace_init.c">
+    <ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_limiter_init.c">
@@ -993,9 +993,6 @@
     <ClCompile Include="..\libavfilter\x86\vf_threshold_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c">
-      <Filter>Source Files\libavfilter\x86</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\af_volume_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -1044,9 +1041,6 @@
     <ClCompile Include="..\libavfilter\vf_idet.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_interlace.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_limiter.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -304,6 +304,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_tile,
     &ff_vf_tinterlace,
     &ff_vf_tlut2,
+    &ff_vf_tmix,
     &ff_vf_tonemap,
     &ff_vf_transpose,
     &ff_vf_trim,

SMP/libavutil.def

@@ -461,6 +461,7 @@ EXPORTS
     av_thread_message_flush
     av_thread_message_queue_alloc
     av_thread_message_queue_free
+    av_thread_message_queue_nb_elems
     av_thread_message_queue_recv
     av_thread_message_queue_send
     av_thread_message_queue_set_err_recv