projects: Update for recent upstream merge.

SMP/config.asm

@@ -1152,6 +1152,7 @@
 %define CONFIG_DTSHD_DEMUXER 1
 %define CONFIG_DV_DEMUXER 1
 %define CONFIG_DVBSUB_DEMUXER 1
+%define CONFIG_DVBTXT_DEMUXER 1
 %define CONFIG_DXA_DEMUXER 1
 %define CONFIG_EA_DEMUXER 1
 %define CONFIG_EA_CDATA_DEMUXER 1
@@ -1545,6 +1546,7 @@
 %define CONFIG_AINTERLEAVE_FILTER 1
 %define CONFIG_ALIMITER_FILTER 1
 %define CONFIG_ALLPASS_FILTER 1
+%define CONFIG_ALOOP_FILTER 1
 %define CONFIG_AMERGE_FILTER 1
 %define CONFIG_AMETADATA_FILTER 1
 %define CONFIG_AMIX_FILTER 1
@@ -1623,6 +1625,7 @@
 %define CONFIG_BLACKFRAME_FILTER 1
 %define CONFIG_BLEND_FILTER 1
 %define CONFIG_BOXBLUR_FILTER 1
+%define CONFIG_BWDIF_FILTER 1
 %define CONFIG_CHROMAKEY_FILTER 1
 %define CONFIG_CODECVIEW_FILTER 1
 %define CONFIG_COLORBALANCE_FILTER 1
@@ -1658,6 +1661,7 @@
 %define CONFIG_FADE_FILTER 1
 %define CONFIG_FFTFILT_FILTER 1
 %define CONFIG_FIELD_FILTER 1
+%define CONFIG_FIELDHINT_FILTER 1
 %define CONFIG_FIELDMATCH_FILTER 1
 %define CONFIG_FIELDORDER_FILTER 1
 %define CONFIG_FIND_RECT_FILTER 1
@@ -1685,6 +1689,7 @@
 %define CONFIG_INTERLEAVE_FILTER 1
 %define CONFIG_KERNDEINT_FILTER 1
 %define CONFIG_LENSCORRECTION_FILTER 1
+%define CONFIG_LOOP_FILTER 1
 %define CONFIG_LUT3D_FILTER 1
 %define CONFIG_LUT_FILTER 1
 %define CONFIG_LUTRGB_FILTER 1

SMP/config.h

@@ -1202,6 +1202,7 @@
 #define CONFIG_DTSHD_DEMUXER 1
 #define CONFIG_DV_DEMUXER 1
 #define CONFIG_DVBSUB_DEMUXER 1
+#define CONFIG_DVBTXT_DEMUXER 1
 #define CONFIG_DXA_DEMUXER 1
 #define CONFIG_EA_DEMUXER 1
 #define CONFIG_EA_CDATA_DEMUXER 1
@@ -1595,6 +1596,7 @@
 #define CONFIG_AINTERLEAVE_FILTER 1
 #define CONFIG_ALIMITER_FILTER 1
 #define CONFIG_ALLPASS_FILTER 1
+#define CONFIG_ALOOP_FILTER 1
 #define CONFIG_AMERGE_FILTER 1
 #define CONFIG_AMETADATA_FILTER 1
 #define CONFIG_AMIX_FILTER 1
@@ -1673,6 +1675,7 @@
 #define CONFIG_BLACKFRAME_FILTER 1
 #define CONFIG_BLEND_FILTER 1
 #define CONFIG_BOXBLUR_FILTER 1
+#define CONFIG_BWDIF_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
 #define CONFIG_CODECVIEW_FILTER 1
 #define CONFIG_COLORBALANCE_FILTER 1
@@ -1708,6 +1711,7 @@
 #define CONFIG_FADE_FILTER 1
 #define CONFIG_FFTFILT_FILTER 1
 #define CONFIG_FIELD_FILTER 1
+#define CONFIG_FIELDHINT_FILTER 1
 #define CONFIG_FIELDMATCH_FILTER 1
 #define CONFIG_FIELDORDER_FILTER 1
 #define CONFIG_FIND_RECT_FILTER 1
@@ -1735,6 +1739,7 @@
 #define CONFIG_INTERLEAVE_FILTER 1
 #define CONFIG_KERNDEINT_FILTER 1
 #define CONFIG_LENSCORRECTION_FILTER 1
+#define CONFIG_LOOP_FILTER 1
 #define CONFIG_LUT3D_FILTER 1
 #define CONFIG_LUT_FILTER 1
 #define CONFIG_LUTRGB_FILTER 1

SMP/libavfilter.vcxproj

@@ -118,6 +118,7 @@
     <ClCompile Include="..\libavfilter\f_interleave.c" />
     <ClCompile Include="..\libavfilter\af_alimiter.c" />
     <ClCompile Include="..\libavfilter\af_biquads.c" />
+    <ClCompile Include="..\libavfilter\f_loop.c" />
     <ClCompile Include="..\libavfilter\af_amerge.c" />
     <ClCompile Include="..\libavfilter\f_metadata.c" />
     <ClCompile Include="..\libavfilter\af_amix.c" />
@@ -184,6 +185,7 @@
     <ClCompile Include="..\libavfilter\dualinput.c" />
     <ClCompile Include="..\libavfilter\framesync.c" />
     <ClCompile Include="..\libavfilter\vf_boxblur.c" />
+    <ClCompile Include="..\libavfilter\vf_bwdif.c" />
     <ClCompile Include="..\libavfilter\vf_chromakey.c" />
     <ClCompile Include="..\libavfilter\vf_codecview.c" />
     <ClCompile Include="..\libavfilter\vf_colorbalance.c" />
@@ -216,6 +218,7 @@
     <ClCompile Include="..\libavfilter\vf_fade.c" />
     <ClCompile Include="..\libavfilter\vf_fftfilt.c" />
     <ClCompile Include="..\libavfilter\vf_field.c" />
+    <ClCompile Include="..\libavfilter\vf_fieldhint.c" />
     <ClCompile Include="..\libavfilter\vf_fieldmatch.c" />
     <ClCompile Include="..\libavfilter\vf_fieldorder.c" />
     <ClCompile Include="..\libavfilter\vf_find_rect.c" />

SMP/libavfilter.vcxproj.filters

@@ -174,6 +174,9 @@
     <ClCompile Include="..\libavfilter\af_biquads.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_loop.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_amerge.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -360,6 +363,9 @@
     <ClCompile Include="..\libavfilter\vf_boxblur.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_bwdif.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_chromakey.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -456,6 +462,9 @@
     <ClCompile Include="..\libavfilter\vf_field.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_fieldhint.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fieldmatch.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -165,6 +165,7 @@
     <ClCompile Include="..\libavformat\avidec.c" />
     <ClCompile Include="..\libavformat\avienc.c" />
     <ClCompile Include="..\libavformat\mpegtsenc.c" />
+    <ClCompile Include="..\libavformat\rawutils.c" />
     <ClCompile Include="..\libavformat\avisynth.c" />
     <ClCompile Include="..\libavformat\swfenc.c" />
     <ClCompile Include="..\libavformat\swf.c" />
@@ -206,6 +207,7 @@
     <ClCompile Include="..\libavformat\dv.c" />
     <ClCompile Include="..\libavformat\dvenc.c" />
     <ClCompile Include="..\libavformat\dvbsub.c" />
+    <ClCompile Include="..\libavformat\dvbtxt.c" />
     <ClCompile Include="..\libavformat\dxa.c" />
     <ClCompile Include="..\libavformat\eacdata.c" />
     <ClCompile Include="..\libavformat\electronicarts.c" />

SMP/libavformat.vcxproj.filters

@@ -316,6 +316,9 @@
     <ClCompile Include="..\libavformat\mpegtsenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\rawutils.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\avisynth.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -439,6 +442,9 @@
     <ClCompile Include="..\libavformat\dvbsub.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\dvbtxt.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\dxa.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/libavutil.def

@@ -20,6 +20,7 @@ EXPORTS
     av_audio_fifo_drain
     av_audio_fifo_free
     av_audio_fifo_peek
+    av_audio_fifo_peek_at
     av_audio_fifo_read
     av_audio_fifo_realloc
     av_audio_fifo_reset
@@ -55,6 +56,7 @@ EXPORTS
     av_buffer_make_writable
     av_buffer_pool_get
     av_buffer_pool_init
+    av_buffer_pool_init2
     av_buffer_pool_uninit
     av_buffer_realloc
     av_buffer_ref
@@ -227,6 +229,13 @@ EXPORTS
     av_hmac_free
     av_hmac_init
     av_hmac_update
+    av_hwdevice_ctx_alloc
+    av_hwdevice_ctx_init
+    av_hwframe_ctx_alloc
+    av_hwframe_ctx_init
+    av_hwframe_get_buffer
+    av_hwframe_transfer_data
+    av_hwframe_transfer_get_formats
     av_i2int
     av_image_alloc
     av_image_check_sar

SMP/libavutil.vcxproj

@@ -109,6 +109,7 @@
     <ClCompile Include="..\libavutil\frame.c" />
     <ClCompile Include="..\libavutil\hash.c" />
     <ClCompile Include="..\libavutil\hmac.c" />
+    <ClCompile Include="..\libavutil\hwcontext.c" />
     <ClCompile Include="..\libavutil\imgutils.c" />
     <ClCompile Include="..\libavutil\integer.c" />
     <ClCompile Include="..\libavutil\intmath.c" />
@@ -190,6 +191,8 @@
     <ClInclude Include="..\libavutil\frame.h" />
     <ClInclude Include="..\libavutil\hash.h" />
     <ClInclude Include="..\libavutil\hmac.h" />
+    <ClInclude Include="..\libavutil\hwcontext.h" />
+    <ClInclude Include="..\libavutil\hwcontext_vdpau.h" />
     <ClInclude Include="..\libavutil\imgutils.h" />
     <ClInclude Include="..\libavutil\intfloat.h" />
     <ClInclude Include="..\libavutil\intreadwrite.h" />
@@ -531,6 +534,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -666,6 +671,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -807,6 +814,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -952,6 +961,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1098,6 +1109,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1243,6 +1256,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1389,6 +1404,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1530,6 +1547,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1677,6 +1696,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1823,6 +1844,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -1970,6 +1993,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -2116,6 +2141,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -2257,6 +2284,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil
@@ -2398,6 +2427,8 @@ copy ..\libavutil\file.h $(OutDir)\include\libavutil
 copy ..\libavutil\frame.h $(OutDir)\include\libavutil
 copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
 copy ..\libavutil\intreadwrite.h $(OutDir)\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -141,6 +141,9 @@
     <ClCompile Include="..\libavutil\hmac.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\hwcontext.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\imgutils.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -362,6 +365,12 @@
     <ClInclude Include="..\libavutil\hmac.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_vdpau.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\imgutils.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>

SMP/libavutil/ffversion.h

@@ -21,5 +21,5 @@
 
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "2.8.git"
+#define FFMPEG_VERSION "3.0.git"
 #endif /* AVUTIL_FFVERSION_H */