project: Update for recent upstream merge.

Author: Sibras

SMP/SMP.patch

@@ -1,5 +1,5 @@
 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index 379c167e6f..64a470ab6d 100644
+index 0f886713e3..66cfa854e9 100644
 --- a/libavcodec/libx264.c
 +++ b/libavcodec/libx264.c
 @@ -33,10 +33,6 @@

SMP/config.asm

@@ -450,7 +450,6 @@
 %define CONFIG_LIBXVID 1
 %define CONFIG_DECKLINK 0
 %define CONFIG_LIBFDK_AAC 0
-%define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
 %define CONFIG_GMP 0
 %define CONFIG_LIBARIBB24 0
@@ -529,6 +528,7 @@
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENGL 1
+%define CONFIG_OPENSSL 0
 %define CONFIG_POCKETSPHINX 0
 %define CONFIG_VAPOURSYNTH 0
 %define CONFIG_ALSA 0
@@ -1994,6 +1994,7 @@
 %define CONFIG_MINTERPOLATE_FILTER 1
 %define CONFIG_MIX_FILTER 1
 %define CONFIG_MONOCHROME_FILTER 1
+%define CONFIG_MORPHO_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1
 %define CONFIG_MSAD_FILTER 1
 %define CONFIG_NEGATE_FILTER 1

SMP/config.h

@@ -509,7 +509,6 @@
 #define CONFIG_LIBXVID 1
 #define CONFIG_DECKLINK 0
 #define CONFIG_LIBFDK_AAC 0
-#define CONFIG_OPENSSL 0
 #define CONFIG_LIBTLS 0
 #define CONFIG_GMP 0
 #define CONFIG_LIBARIBB24 0
@@ -588,6 +587,7 @@
 #define CONFIG_MEDIACODEC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENGL 1
+#define CONFIG_OPENSSL 0
 #define CONFIG_POCKETSPHINX 0
 #define CONFIG_VAPOURSYNTH 0
 #define CONFIG_ALSA 0
@@ -2117,6 +2117,7 @@
 #define CONFIG_MINTERPOLATE_FILTER 1
 #define CONFIG_MIX_FILTER 1
 #define CONFIG_MONOCHROME_FILTER 1
+#define CONFIG_MORPHO_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_MSAD_FILTER 1
 #define CONFIG_NEGATE_FILTER 1

SMP/libavcodec.def

@@ -149,15 +149,15 @@ EXPORTS
     avpriv_dnxhd_get_frame_size
     avpriv_dnxhd_get_hr_frame_size
     avpriv_dnxhd_get_interlaced
-    avpriv_do_elbg
+    avpriv_elbg_do
+    avpriv_elbg_free
     avpriv_exif_decode_ifd
     avpriv_find_pix_fmt
     avpriv_find_start_code
     avpriv_fits_header_init
     avpriv_fits_header_parse_line
     avpriv_get_raw_pix_fmt_tags
     avpriv_h264_has_num_reorder_frames
-    avpriv_init_elbg
     avpriv_mpeg4audio_get_config2
     avpriv_mpegaudio_decode_header
     avpriv_packet_list_free

SMP/libavfilter.vcxproj

@@ -347,6 +347,7 @@
     <ClCompile Include="..\libavfilter\vf_minterpolate.c" />
     <ClCompile Include="..\libavfilter\vf_mix.c" />
     <ClCompile Include="..\libavfilter\vf_monochrome.c" />
+    <ClCompile Include="..\libavfilter\vf_morpho.c" />
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c" />
     <ClCompile Include="..\libavfilter\vf_nlmeans.c" />
     <ClCompile Include="..\libavfilter\vf_nnedi.c" />

SMP/libavfilter.vcxproj.filters

@@ -894,6 +894,9 @@
     <ClCompile Include="..\libavfilter\vf_monochrome.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_morpho.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -298,6 +298,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_minterpolate,
     &ff_vf_mix,
     &ff_vf_monochrome,
+    &ff_vf_morpho,
     &ff_vf_mpdecimate,
     &ff_vf_msad,
     &ff_vf_negate,

SMP/libavformat.vcxproj

@@ -63,6 +63,7 @@
     <ClCompile Include="..\libavformat\allformats.c" />
     <ClCompile Include="..\libavformat\avio.c" />
     <ClCompile Include="..\libavformat\aviobuf.c" />
+    <ClCompile Include="..\libavformat\demux.c" />
     <ClCompile Include="..\libavformat\dump.c" />
     <ClCompile Include="..\libavformat\format.c" />
     <ClCompile Include="..\libavformat\id3v1.c" />
@@ -74,6 +75,7 @@
     <ClCompile Include="..\libavformat\protocols.c" />
     <ClCompile Include="..\libavformat\riff.c" />
     <ClCompile Include="..\libavformat\sdp.c" />
+    <ClCompile Include="..\libavformat\seek.c" />
     <ClCompile Include="..\libavformat\url.c" />
     <ClCompile Include="..\libavformat\utils.c" />
     <ClCompile Include="..\libavformat\file_open.c" />

SMP/libavformat.vcxproj.filters

@@ -40,6 +40,9 @@
     <ClCompile Include="..\libavformat\aviobuf.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\demux.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\dump.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -73,6 +76,9 @@
     <ClCompile Include="..\libavformat\sdp.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\seek.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\url.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>