projects: Update for recent upstream merge.

ShiftMediaProject · Aug 21, 2016 · 5e791e3 · 5e791e3
1 parent a7937ec
commit 5e791e3
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 41 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -1034,6 +1034,8 @@
 %define CONFIG_PCM_S32BE_DECODER 1
 %define CONFIG_PCM_S32LE_DECODER 1
 %define CONFIG_PCM_S32LE_PLANAR_DECODER 1
+%define CONFIG_PCM_S64BE_DECODER 1
+%define CONFIG_PCM_S64LE_DECODER 1
 %define CONFIG_PCM_U8_DECODER 1
 %define CONFIG_PCM_U16BE_DECODER 1
 %define CONFIG_PCM_U16LE_DECODER 1
@@ -1534,6 +1536,8 @@
 %define CONFIG_PCM_S32BE_ENCODER 1
 %define CONFIG_PCM_S32LE_ENCODER 1
 %define CONFIG_PCM_S32LE_PLANAR_ENCODER 1
+%define CONFIG_PCM_S64BE_ENCODER 1
+%define CONFIG_PCM_S64LE_ENCODER 1
 %define CONFIG_PCM_U8_ENCODER 1
 %define CONFIG_PCM_U16BE_ENCODER 1
 %define CONFIG_PCM_U16LE_ENCODER 1
@@ -1698,10 +1702,11 @@
 %define CONFIG_ANULLSINK_FILTER 1
 %define CONFIG_ALPHAEXTRACT_FILTER 1
 %define CONFIG_ALPHAMERGE_FILTER 1
-%define CONFIG_ATADENOISE_FILTER 1
 %define CONFIG_ASS_FILTER 1
-%define CONFIG_BENCH_FILTER 1
+%define CONFIG_ATADENOISE_FILTER 1
 %define CONFIG_BBOX_FILTER 1
+%define CONFIG_BENCH_FILTER 1
+%define CONFIG_BITPLANENOISE_FILTER 1
 %define CONFIG_BLACKDETECT_FILTER 1
 %define CONFIG_BLACKFRAME_FILTER 1
 %define CONFIG_BLEND_FILTER 1
@@ -1765,11 +1770,11 @@
 %define CONFIG_HISTOGRAM_FILTER 1
 %define CONFIG_HQDN3D_FILTER 1
 %define CONFIG_HQX_FILTER 1
+%define CONFIG_HSTACK_FILTER 1
+%define CONFIG_HUE_FILTER 1
 %define CONFIG_HWDOWNLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_CUDA_FILTER 0
-%define CONFIG_HSTACK_FILTER 1
-%define CONFIG_HUE_FILTER 1
 %define CONFIG_IDET_FILTER 1
 %define CONFIG_IL_FILTER 1
 %define CONFIG_INFLATE_FILTER 1
@@ -1778,8 +1783,8 @@
 %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_LUT3D_FILTER 1
 %define CONFIG_LUTRGB_FILTER 1
 %define CONFIG_LUTYUV_FILTER 1
 %define CONFIG_MASKEDMERGE_FILTER 1
@@ -1819,9 +1824,9 @@
 %define CONFIG_ROTATE_FILTER 1
 %define CONFIG_SAB_FILTER 1
 %define CONFIG_SCALE_FILTER 1
-%define CONFIG_SCALE2REF_FILTER 1
 %define CONFIG_SCALE_NPP_FILTER 0
 %define CONFIG_SCALE_VAAPI_FILTER 0
+%define CONFIG_SCALE2REF_FILTER 1
 %define CONFIG_SELECT_FILTER 1
 %define CONFIG_SELECTIVECOLOR_FILTER 1
 %define CONFIG_SENDCMD_FILTER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -1084,6 +1084,8 @@
 #define CONFIG_PCM_S32BE_DECODER 1
 #define CONFIG_PCM_S32LE_DECODER 1
 #define CONFIG_PCM_S32LE_PLANAR_DECODER 1
+#define CONFIG_PCM_S64BE_DECODER 1
+#define CONFIG_PCM_S64LE_DECODER 1
 #define CONFIG_PCM_U8_DECODER 1
 #define CONFIG_PCM_U16BE_DECODER 1
 #define CONFIG_PCM_U16LE_DECODER 1
@@ -1584,6 +1586,8 @@
 #define CONFIG_PCM_S32BE_ENCODER 1
 #define CONFIG_PCM_S32LE_ENCODER 1
 #define CONFIG_PCM_S32LE_PLANAR_ENCODER 1
+#define CONFIG_PCM_S64BE_ENCODER 1
+#define CONFIG_PCM_S64LE_ENCODER 1
 #define CONFIG_PCM_U8_ENCODER 1
 #define CONFIG_PCM_U16BE_ENCODER 1
 #define CONFIG_PCM_U16LE_ENCODER 1
@@ -1748,10 +1752,11 @@
 #define CONFIG_ANULLSINK_FILTER 1
 #define CONFIG_ALPHAEXTRACT_FILTER 1
 #define CONFIG_ALPHAMERGE_FILTER 1
-#define CONFIG_ATADENOISE_FILTER 1
 #define CONFIG_ASS_FILTER 1
-#define CONFIG_BENCH_FILTER 1
+#define CONFIG_ATADENOISE_FILTER 1
 #define CONFIG_BBOX_FILTER 1
+#define CONFIG_BENCH_FILTER 1
+#define CONFIG_BITPLANENOISE_FILTER 1
 #define CONFIG_BLACKDETECT_FILTER 1
 #define CONFIG_BLACKFRAME_FILTER 1
 #define CONFIG_BLEND_FILTER 1
@@ -1815,11 +1820,11 @@
 #define CONFIG_HISTOGRAM_FILTER 1
 #define CONFIG_HQDN3D_FILTER 1
 #define CONFIG_HQX_FILTER 1
+#define CONFIG_HSTACK_FILTER 1
+#define CONFIG_HUE_FILTER 1
 #define CONFIG_HWDOWNLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_CUDA_FILTER 0
-#define CONFIG_HSTACK_FILTER 1
-#define CONFIG_HUE_FILTER 1
 #define CONFIG_IDET_FILTER 1
 #define CONFIG_IL_FILTER 1
 #define CONFIG_INFLATE_FILTER 1
@@ -1828,8 +1833,8 @@
 #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_LUT3D_FILTER 1
 #define CONFIG_LUTRGB_FILTER 1
 #define CONFIG_LUTYUV_FILTER 1
 #define CONFIG_MASKEDMERGE_FILTER 1
@@ -1869,9 +1874,9 @@
 #define CONFIG_ROTATE_FILTER 1
 #define CONFIG_SAB_FILTER 1
 #define CONFIG_SCALE_FILTER 1
-#define CONFIG_SCALE2REF_FILTER 1
 #define CONFIG_SCALE_NPP_FILTER 0
 #define CONFIG_SCALE_VAAPI_FILTER 0
+#define CONFIG_SCALE2REF_FILTER 1
 #define CONFIG_SELECT_FILTER 1
 #define CONFIG_SELECTIVECOLOR_FILTER 1
 #define CONFIG_SENDCMD_FILTER 1

diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def
@@ -13,7 +13,14 @@ EXPORTS
     av_bsf_free
     av_bsf_get_by_name
     av_bsf_get_class
+    av_bsf_get_null_filter
     av_bsf_init
+    av_bsf_list_alloc
+    av_bsf_list_append
+    av_bsf_list_append2
+    av_bsf_list_finalize
+    av_bsf_list_free
+    av_bsf_list_parse_str
     av_bsf_next
     av_bsf_receive_packet
     av_bsf_send_packet

diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
@@ -115,10 +115,9 @@
     <ClCompile Include="..\libavfilter\af_adelay.c" />
     <ClCompile Include="..\libavfilter\af_aecho.c" />
     <ClCompile Include="..\libavfilter\af_aemphasis.c" />
+    <ClCompile Include="..\libavfilter\aeval.c" />
     <ClCompile Include="..\libavfilter\af_afftfilt.c" />
     <ClCompile Include="..\libavfilter\window_func.c" />
-    <ClCompile Include="..\libavfilter\af_anequalizer.c" />
-    <ClCompile Include="..\libavfilter\aeval.c" />
     <ClCompile Include="..\libavfilter\af_aformat.c" />
     <ClCompile Include="..\libavfilter\af_agate.c" />
     <ClCompile Include="..\libavfilter\f_interleave.c" />
@@ -128,6 +127,7 @@
     <ClCompile Include="..\libavfilter\af_amerge.c" />
     <ClCompile Include="..\libavfilter\f_metadata.c" />
     <ClCompile Include="..\libavfilter\af_amix.c" />
+    <ClCompile Include="..\libavfilter\af_anequalizer.c" />
     <ClCompile Include="..\libavfilter\af_anull.c" />
     <ClCompile Include="..\libavfilter\af_apad.c" />
     <ClCompile Include="..\libavfilter\f_perms.c" />
@@ -162,6 +162,7 @@
     <ClCompile Include="..\libavfilter\af_extrastereo.c" />
     <ClCompile Include="..\libavfilter\af_firequalizer.c" />
     <ClCompile Include="..\libavfilter\af_flanger.c" />
+    <ClCompile Include="..\libavfilter\af_hdcd.c" />
     <ClCompile Include="..\libavfilter\af_join.c" />
     <ClCompile Include="..\libavfilter\af_pan.c" />
     <ClCompile Include="..\libavfilter\af_replaygain.c" />
@@ -172,17 +173,17 @@
     <ClCompile Include="..\libavfilter\af_tremolo.c" />
     <ClCompile Include="..\libavfilter\af_vibrato.c" />
     <ClCompile Include="..\libavfilter\af_volumedetect.c" />
-    <ClCompile Include="..\libavfilter\af_hdcd.c" />
     <ClCompile Include="..\libavfilter\asrc_anoisesrc.c" />
     <ClCompile Include="..\libavfilter\asrc_sine.c" />
     <ClCompile Include="..\libavfilter\asink_anullsink.c" />
     <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
-    <ClCompile Include="..\libavfilter\vf_subtitles.c" />
     <ClCompile Include="..\libavfilter\vf_extractplanes.c" />
     <ClCompile Include="..\libavfilter\vf_alphamerge.c" />
+    <ClCompile Include="..\libavfilter\vf_subtitles.c" />
     <ClCompile Include="..\libavfilter\vf_atadenoise.c" />
     <ClCompile Include="..\libavfilter\bbox.c" />
     <ClCompile Include="..\libavfilter\vf_bbox.c" />
+    <ClCompile Include="..\libavfilter\vf_bitplanenoise.c" />
     <ClCompile Include="..\libavfilter\vf_blackdetect.c" />
     <ClCompile Include="..\libavfilter\vf_blackframe.c" />
     <ClCompile Include="..\libavfilter\dualinput.c" />
@@ -217,8 +218,8 @@
     <ClCompile Include="..\libavfilter\vf_drawbox.c" />
     <ClCompile Include="..\libavfilter\f_drawgraph.c" />
     <ClCompile Include="..\libavfilter\vf_drawtext.c" />
-    <ClCompile Include="..\libavfilter\vf_elbg.c" />
     <ClCompile Include="..\libavfilter\vf_edgedetect.c" />
+    <ClCompile Include="..\libavfilter\vf_elbg.c" />
     <ClCompile Include="..\libavfilter\vf_eq.c" />
     <ClCompile Include="..\libavfilter\vf_fade.c" />
     <ClCompile Include="..\libavfilter\vf_fftfilt.c" />
@@ -238,10 +239,10 @@
     <ClCompile Include="..\libavfilter\vf_histeq.c" />
     <ClCompile Include="..\libavfilter\vf_histogram.c" />
     <ClCompile Include="..\libavfilter\vf_hqx.c" />
-    <ClCompile Include="..\libavfilter\vf_hwdownload.c" />
-    <ClCompile Include="..\libavfilter\vf_hwupload.c" />
     <ClCompile Include="..\libavfilter\vf_stack.c" />
     <ClCompile Include="..\libavfilter\vf_hue.c" />
+    <ClCompile Include="..\libavfilter\vf_hwdownload.c" />
+    <ClCompile Include="..\libavfilter\vf_hwupload.c" />
     <ClCompile Include="..\libavfilter\vf_il.c" />
     <ClCompile Include="..\libavfilter\vf_kerndeint.c" />
     <ClCompile Include="..\libavfilter\vf_lenscorrection.c" />
@@ -269,10 +270,10 @@
     <ClCompile Include="..\libavfilter\vf_removelogo.c" />
     <ClCompile Include="..\libavfilter\vf_repeatfields.c" />
     <ClCompile Include="..\libavfilter\vf_rotate.c" />
-    <ClCompile Include="..\libavfilter\vf_separatefields.c" />
     <ClCompile Include="..\libavfilter\vf_sab.c" />
     <ClCompile Include="..\libavfilter\vf_scale.c" />
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c" />
+    <ClCompile Include="..\libavfilter\vf_separatefields.c" />
     <ClCompile Include="..\libavfilter\vf_aspect.c" />
     <ClCompile Include="..\libavfilter\vf_setfield.c" />
     <ClCompile Include="..\libavfilter\vf_showinfo.c" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -165,16 +165,13 @@
     <ClCompile Include="..\libavfilter\af_aemphasis.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\af_afftfilt.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavfilter\window_func.c">
+    <ClCompile Include="..\libavfilter\aeval.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\af_anequalizer.c">
+    <ClCompile Include="..\libavfilter\af_afftfilt.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\aeval.c">
+    <ClCompile Include="..\libavfilter\window_func.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\af_aformat.c">
@@ -204,6 +201,9 @@
     <ClCompile Include="..\libavfilter\af_amix.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_anequalizer.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_anull.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -306,6 +306,9 @@
     <ClCompile Include="..\libavfilter\af_flanger.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_hdcd.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_join.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -336,9 +339,6 @@
     <ClCompile Include="..\libavfilter\af_volumedetect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\af_hdcd.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\asrc_anoisesrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -351,15 +351,15 @@
     <ClCompile Include="..\libavfilter\asrc_anullsrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_subtitles.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_extractplanes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_alphamerge.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_subtitles.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_atadenoise.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -369,6 +369,9 @@
     <ClCompile Include="..\libavfilter\vf_bbox.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_bitplanenoise.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_blackdetect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -471,10 +474,10 @@
     <ClCompile Include="..\libavfilter\vf_drawtext.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_elbg.c">
+    <ClCompile Include="..\libavfilter\vf_edgedetect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_edgedetect.c">
+    <ClCompile Include="..\libavfilter\vf_elbg.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_eq.c">
@@ -534,16 +537,16 @@
     <ClCompile Include="..\libavfilter\vf_hqx.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_hwdownload.c">
+    <ClCompile Include="..\libavfilter\vf_stack.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_hwupload.c">
+    <ClCompile Include="..\libavfilter\vf_hue.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_stack.c">
+    <ClCompile Include="..\libavfilter\vf_hwdownload.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_hue.c">
+    <ClCompile Include="..\libavfilter\vf_hwupload.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_il.c">
@@ -627,9 +630,6 @@
     <ClCompile Include="..\libavfilter\vf_rotate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_separatefields.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_sab.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -639,6 +639,9 @@
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_separatefields.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_aspect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

diff --git a/SMP/libavutil.def b/SMP/libavutil.def
@@ -455,6 +455,7 @@ EXPORTS
     av_xtea_le_crypt
     av_xtea_le_init
     avpriv_alloc_fixed_dsp
+    avpriv_dict_set_timestamp
     avpriv_emms_yasm
     avpriv_float_dsp_alloc
     avpriv_frame_get_metadatap