Skip to content

Commit

Permalink
projects: Update for recent upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Nov 10, 2018
1 parent cccbe91 commit b77d350
Show file tree
Hide file tree
Showing 13 changed files with 83 additions and 29 deletions.
18 changes: 16 additions & 2 deletions SMP/config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
%define CONFIG_LIBFDK_AAC 0
%define CONFIG_OPENSSL 0
%define CONFIG_LIBTLS 0
%define CONFIG_GMP 1
%define CONFIG_GMP 0
%define CONFIG_LIBLENSFUN 0
%define CONFIG_LIBOPENCORE_AMRNB 0
%define CONFIG_LIBOPENCORE_AMRWB 0
Expand All @@ -450,7 +450,7 @@
%define CONFIG_RKMPP 0
%define CONFIG_LIBSMBCLIENT 0
%define CONFIG_CHROMAPRINT 0
%define CONFIG_GCRYPT 0
%define CONFIG_GCRYPT 1
%define CONFIG_GNUTLS 1
%define CONFIG_JNI 0
%define CONFIG_LADSPA 0
Expand All @@ -461,6 +461,7 @@
%define CONFIG_LIBCACA 0
%define CONFIG_LIBCELT 0
%define CONFIG_LIBCODEC2 0
%define CONFIG_LIBDAV1D 0
%define CONFIG_LIBDC1394 0
%define CONFIG_LIBDRM 0
%define CONFIG_LIBFLITE 0
Expand Down Expand Up @@ -1111,6 +1112,7 @@
%define CONFIG_PCM_U24LE_DECODER 1
%define CONFIG_PCM_U32BE_DECODER 1
%define CONFIG_PCM_U32LE_DECODER 1
%define CONFIG_PCM_VIDC_DECODER 1
%define CONFIG_PCM_ZORK_DECODER 1
%define CONFIG_GREMLIN_DPCM_DECODER 1
%define CONFIG_INTERPLAY_DPCM_DECODER 1
Expand Down Expand Up @@ -1198,6 +1200,7 @@
%define CONFIG_LIBAOM_AV1_DECODER 0
%define CONFIG_LIBCELT_DECODER 0
%define CONFIG_LIBCODEC2_DECODER 0
%define CONFIG_LIBDAV1D_DECODER 0
%define CONFIG_LIBDAVS2_DECODER 0
%define CONFIG_LIBFDK_AAC_DECODER 0
%define CONFIG_LIBGSM_DECODER 0
Expand Down Expand Up @@ -1364,6 +1367,7 @@
%define CONFIG_PCM_U24LE_ENCODER 1
%define CONFIG_PCM_U32BE_ENCODER 1
%define CONFIG_PCM_U32LE_ENCODER 1
%define CONFIG_PCM_VIDC_ENCODER 1
%define CONFIG_ROQ_DPCM_ENCODER 1
%define CONFIG_ADPCM_ADX_ENCODER 1
%define CONFIG_ADPCM_G722_ENCODER 1
Expand Down Expand Up @@ -1704,6 +1708,7 @@
%define CONFIG_BOXBLUR_FILTER 1
%define CONFIG_BOXBLUR_OPENCL_FILTER 0
%define CONFIG_BWDIF_FILTER 1
%define CONFIG_CHROMAHOLD_FILTER 1
%define CONFIG_CHROMAKEY_FILTER 1
%define CONFIG_CIESCOPE_FILTER 1
%define CONFIG_CODECVIEW_FILTER 1
Expand Down Expand Up @@ -1774,6 +1779,7 @@
%define CONFIG_GBLUR_FILTER 1
%define CONFIG_GEQ_FILTER 1
%define CONFIG_GRADFUN_FILTER 1
%define CONFIG_GRAPHMONITOR_FILTER 1
%define CONFIG_GREYEDGE_FILTER 1
%define CONFIG_HALDCLUT_FILTER 1
%define CONFIG_HFLIP_FILTER 1
Expand Down Expand Up @@ -1874,6 +1880,7 @@
%define CONFIG_SEPARATEFIELDS_FILTER 1
%define CONFIG_SETDAR_FILTER 1
%define CONFIG_SETFIELD_FILTER 1
%define CONFIG_SETPARAMS_FILTER 1
%define CONFIG_SETPTS_FILTER 1
%define CONFIG_SETRANGE_FILTER 1
%define CONFIG_SETSAR_FILTER 1
Expand Down Expand Up @@ -1910,6 +1917,7 @@
%define CONFIG_TMIX_FILTER 1
%define CONFIG_TONEMAP_FILTER 1
%define CONFIG_TONEMAP_OPENCL_FILTER 0
%define CONFIG_TPAD_FILTER 1
%define CONFIG_TRANSPOSE_FILTER 1
%define CONFIG_TRANSPOSE_NPP_FILTER 0
%define CONFIG_TRIM_FILTER 1
Expand All @@ -1921,6 +1929,7 @@
%define CONFIG_VECTORSCOPE_FILTER 1
%define CONFIG_VFLIP_FILTER 1
%define CONFIG_VFRDET_FILTER 1
%define CONFIG_VIBRANCE_FILTER 1
%define CONFIG_VIDSTABDETECT_FILTER 0
%define CONFIG_VIDSTABTRANSFORM_FILTER 0
%define CONFIG_VIGNETTE_FILTER 1
Expand All @@ -1931,7 +1940,9 @@
%define CONFIG_WAVEFORM_FILTER 1
%define CONFIG_WEAVE_FILTER 1
%define CONFIG_XBR_FILTER 1
%define CONFIG_XSTACK_FILTER 1
%define CONFIG_YADIF_FILTER 1
%define CONFIG_YADIF_CUDA_FILTER 0
%define CONFIG_ZMQ_FILTER 0
%define CONFIG_ZOOMPAN_FILTER 1
%define CONFIG_ZSCALE_FILTER 0
Expand All @@ -1958,6 +1969,7 @@
%define CONFIG_NULLSINK_FILTER 1
%define CONFIG_ABITSCOPE_FILTER 1
%define CONFIG_ADRAWGRAPH_FILTER 1
%define CONFIG_AGRAPHMONITOR_FILTER 1
%define CONFIG_AHISTOGRAM_FILTER 1
%define CONFIG_APHASEMETER_FILTER 1
%define CONFIG_AVECTORSCOPE_FILTER 1
Expand Down Expand Up @@ -2135,6 +2147,7 @@
%define CONFIG_PAF_DEMUXER 1
%define CONFIG_PCM_ALAW_DEMUXER 1
%define CONFIG_PCM_MULAW_DEMUXER 1
%define CONFIG_PCM_VIDC_DEMUXER 1
%define CONFIG_PCM_F64BE_DEMUXER 1
%define CONFIG_PCM_F64LE_DEMUXER 1
%define CONFIG_PCM_F32BE_DEMUXER 1
Expand Down Expand Up @@ -2368,6 +2381,7 @@
%define CONFIG_OPUS_MUXER 1
%define CONFIG_PCM_ALAW_MUXER 1
%define CONFIG_PCM_MULAW_MUXER 1
%define CONFIG_PCM_VIDC_MUXER 1
%define CONFIG_PCM_F64BE_MUXER 1
%define CONFIG_PCM_F64LE_MUXER 1
%define CONFIG_PCM_F32BE_MUXER 1
Expand Down
20 changes: 17 additions & 3 deletions SMP/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#ifndef SMP_CONFIG_H
#define SMP_CONFIG_H
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc"
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
#define FFMPEG_LICENSE "GPL version 3 or later"
#define CONFIG_THIS_YEAR 2018
#define FFMPEG_DATADIR "."
Expand Down Expand Up @@ -490,7 +490,7 @@
#define CONFIG_LIBFDK_AAC 0
#define CONFIG_OPENSSL 0
#define CONFIG_LIBTLS 0
#define CONFIG_GMP 1
#define CONFIG_GMP 0
#define CONFIG_LIBLENSFUN 0
#define CONFIG_LIBOPENCORE_AMRNB 0
#define CONFIG_LIBOPENCORE_AMRWB 0
Expand All @@ -500,7 +500,7 @@
#define CONFIG_RKMPP 0
#define CONFIG_LIBSMBCLIENT 0
#define CONFIG_CHROMAPRINT 0
#define CONFIG_GCRYPT 0
#define CONFIG_GCRYPT 1
#define CONFIG_GNUTLS 1
#define CONFIG_JNI 0
#define CONFIG_LADSPA 0
Expand All @@ -511,6 +511,7 @@
#define CONFIG_LIBCACA 0
#define CONFIG_LIBCELT 0
#define CONFIG_LIBCODEC2 0
#define CONFIG_LIBDAV1D 0
#define CONFIG_LIBDC1394 0
#define CONFIG_LIBDRM 0
#define CONFIG_LIBFLITE 0
Expand Down Expand Up @@ -1176,6 +1177,7 @@
#define CONFIG_PCM_U24LE_DECODER 1
#define CONFIG_PCM_U32BE_DECODER 1
#define CONFIG_PCM_U32LE_DECODER 1
#define CONFIG_PCM_VIDC_DECODER 1
#define CONFIG_PCM_ZORK_DECODER 1
#define CONFIG_GREMLIN_DPCM_DECODER 1
#define CONFIG_INTERPLAY_DPCM_DECODER 1
Expand Down Expand Up @@ -1263,6 +1265,7 @@
#define CONFIG_LIBAOM_AV1_DECODER 0
#define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBCODEC2_DECODER 0
#define CONFIG_LIBDAV1D_DECODER 0
#define CONFIG_LIBDAVS2_DECODER 0
#define CONFIG_LIBFDK_AAC_DECODER 0
#define CONFIG_LIBGSM_DECODER 0
Expand Down Expand Up @@ -1429,6 +1432,7 @@
#define CONFIG_PCM_U24LE_ENCODER 1
#define CONFIG_PCM_U32BE_ENCODER 1
#define CONFIG_PCM_U32LE_ENCODER 1
#define CONFIG_PCM_VIDC_ENCODER 1
#define CONFIG_ROQ_DPCM_ENCODER 1
#define CONFIG_ADPCM_ADX_ENCODER 1
#define CONFIG_ADPCM_G722_ENCODER 1
Expand Down Expand Up @@ -1790,6 +1794,7 @@
#define CONFIG_BOXBLUR_FILTER 1
#define CONFIG_BOXBLUR_OPENCL_FILTER 0
#define CONFIG_BWDIF_FILTER 1
#define CONFIG_CHROMAHOLD_FILTER 1
#define CONFIG_CHROMAKEY_FILTER 1
#define CONFIG_CIESCOPE_FILTER 1
#define CONFIG_CODECVIEW_FILTER 1
Expand Down Expand Up @@ -1860,6 +1865,7 @@
#define CONFIG_GBLUR_FILTER 1
#define CONFIG_GEQ_FILTER 1
#define CONFIG_GRADFUN_FILTER 1
#define CONFIG_GRAPHMONITOR_FILTER 1
#define CONFIG_GREYEDGE_FILTER 1
#define CONFIG_HALDCLUT_FILTER 1
#define CONFIG_HFLIP_FILTER 1
Expand Down Expand Up @@ -1960,6 +1966,7 @@
#define CONFIG_SEPARATEFIELDS_FILTER 1
#define CONFIG_SETDAR_FILTER 1
#define CONFIG_SETFIELD_FILTER 1
#define CONFIG_SETPARAMS_FILTER 1
#define CONFIG_SETPTS_FILTER 1
#define CONFIG_SETRANGE_FILTER 1
#define CONFIG_SETSAR_FILTER 1
Expand Down Expand Up @@ -1996,6 +2003,7 @@
#define CONFIG_TMIX_FILTER 1
#define CONFIG_TONEMAP_FILTER 1
#define CONFIG_TONEMAP_OPENCL_FILTER 0
#define CONFIG_TPAD_FILTER 1
#define CONFIG_TRANSPOSE_FILTER 1
#define CONFIG_TRANSPOSE_NPP_FILTER 0
#define CONFIG_TRIM_FILTER 1
Expand All @@ -2007,6 +2015,7 @@
#define CONFIG_VECTORSCOPE_FILTER 1
#define CONFIG_VFLIP_FILTER 1
#define CONFIG_VFRDET_FILTER 1
#define CONFIG_VIBRANCE_FILTER 1
#define CONFIG_VIDSTABDETECT_FILTER 0
#define CONFIG_VIDSTABTRANSFORM_FILTER 0
#define CONFIG_VIGNETTE_FILTER 1
Expand All @@ -2017,7 +2026,9 @@
#define CONFIG_WAVEFORM_FILTER 1
#define CONFIG_WEAVE_FILTER 1
#define CONFIG_XBR_FILTER 1
#define CONFIG_XSTACK_FILTER 1
#define CONFIG_YADIF_FILTER 1
#define CONFIG_YADIF_CUDA_FILTER 0
#define CONFIG_ZMQ_FILTER 0
#define CONFIG_ZOOMPAN_FILTER 1
#define CONFIG_ZSCALE_FILTER 0
Expand All @@ -2044,6 +2055,7 @@
#define CONFIG_NULLSINK_FILTER 1
#define CONFIG_ABITSCOPE_FILTER 1
#define CONFIG_ADRAWGRAPH_FILTER 1
#define CONFIG_AGRAPHMONITOR_FILTER 1
#define CONFIG_AHISTOGRAM_FILTER 1
#define CONFIG_APHASEMETER_FILTER 1
#define CONFIG_AVECTORSCOPE_FILTER 1
Expand Down Expand Up @@ -2221,6 +2233,7 @@
#define CONFIG_PAF_DEMUXER 1
#define CONFIG_PCM_ALAW_DEMUXER 1
#define CONFIG_PCM_MULAW_DEMUXER 1
#define CONFIG_PCM_VIDC_DEMUXER 1
#define CONFIG_PCM_F64BE_DEMUXER 1
#define CONFIG_PCM_F64LE_DEMUXER 1
#define CONFIG_PCM_F32BE_DEMUXER 1
Expand Down Expand Up @@ -2454,6 +2467,7 @@
#define CONFIG_OPUS_MUXER 1
#define CONFIG_PCM_ALAW_MUXER 1
#define CONFIG_PCM_MULAW_MUXER 1
#define CONFIG_PCM_VIDC_MUXER 1
#define CONFIG_PCM_F64BE_MUXER 1
#define CONFIG_PCM_F64LE_MUXER 1
#define CONFIG_PCM_F32BE_MUXER 1
Expand Down
2 changes: 2 additions & 0 deletions SMP/libavcodec/codec_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ static const AVCodec *codec_list[] = {
&ff_pcm_u24le_encoder,
&ff_pcm_u32be_encoder,
&ff_pcm_u32le_encoder,
&ff_pcm_vidc_encoder,
&ff_roq_dpcm_encoder,
&ff_adpcm_adx_encoder,
&ff_adpcm_g722_encoder,
Expand Down Expand Up @@ -555,6 +556,7 @@ static const AVCodec *codec_list[] = {
&ff_pcm_u24le_decoder,
&ff_pcm_u32be_decoder,
&ff_pcm_u32le_decoder,
&ff_pcm_vidc_decoder,
&ff_pcm_zork_decoder,
&ff_gremlin_dpcm_decoder,
&ff_interplay_dpcm_decoder,
Expand Down
5 changes: 4 additions & 1 deletion SMP/libavfilter.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
<ClCompile Include="..\libavfilter\vf_framestep.c" />
<ClCompile Include="..\libavfilter\vf_gblur.c" />
<ClCompile Include="..\libavfilter\vf_geq.c" />
<ClCompile Include="..\libavfilter\f_graphmonitor.c" />
<ClCompile Include="..\libavfilter\vf_colorconstancy.c" />
<ClCompile Include="..\libavfilter\vf_lut3d.c" />
<ClCompile Include="..\libavfilter\vf_histeq.c" />
Expand Down Expand Up @@ -337,7 +338,6 @@
<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_setparams.c" />
<ClCompile Include="..\libavfilter\vf_showinfo.c" />
<ClCompile Include="..\libavfilter\vf_showpalette.c" />
Expand All @@ -355,18 +355,21 @@
<ClCompile Include="..\libavfilter\vf_thumbnail.c" />
<ClCompile Include="..\libavfilter\vf_tile.c" />
<ClCompile Include="..\libavfilter\vf_tonemap.c" />
<ClCompile Include="..\libavfilter\vf_tpad.c" />
<ClCompile Include="..\libavfilter\vf_transpose.c" />
<ClCompile Include="..\libavfilter\vf_unsharp.c" />
<ClCompile Include="..\libavfilter\vf_uspp.c" />
<ClCompile Include="..\libavfilter\vf_vaguedenoiser.c" />
<ClCompile Include="..\libavfilter\vf_vectorscope.c" />
<ClCompile Include="..\libavfilter\vf_vflip.c" />
<ClCompile Include="..\libavfilter\vf_vfrdet.c" />
<ClCompile Include="..\libavfilter\vf_vibrance.c" />
<ClCompile Include="..\libavfilter\vf_vignette.c" />
<ClCompile Include="..\libavfilter\vf_vmafmotion.c" />
<ClCompile Include="..\libavfilter\vf_vpp_qsv.c" />
<ClCompile Include="..\libavfilter\vf_waveform.c" />
<ClCompile Include="..\libavfilter\vf_xbr.c" />
<ClCompile Include="..\libavfilter\yadif_common.c" />
<ClCompile Include="..\libavfilter\vf_zoompan.c" />
<ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
<ClCompile Include="..\libavfilter\vsrc_cellauto.c" />
Expand Down
15 changes: 12 additions & 3 deletions SMP/libavfilter.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,9 @@
<ClCompile Include="..\libavfilter\vf_geq.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\f_graphmonitor.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_colorconstancy.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down Expand Up @@ -834,9 +837,6 @@
<ClCompile Include="..\libavfilter\vf_aspect.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_setfield.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_setparams.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down Expand Up @@ -888,6 +888,9 @@
<ClCompile Include="..\libavfilter\vf_tonemap.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_tpad.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_transpose.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand All @@ -909,6 +912,9 @@
<ClCompile Include="..\libavfilter\vf_vfrdet.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_vibrance.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_vignette.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand All @@ -924,6 +930,9 @@
<ClCompile Include="..\libavfilter\vf_xbr.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\yadif_common.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_zoompan.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down
Loading

0 comments on commit b77d350

Please sign in to comment.