Skip to content

Commit

Permalink
projects: Update for upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed May 9, 2020
1 parent f9aed23 commit 18e5814
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 5 deletions.
2 changes: 1 addition & 1 deletion SMP/SMP.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a08fe0ce76..4fb960aac9 100644
index 4121b2807a..53f847a0fe 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -30,10 +30,6 @@
Expand Down
4 changes: 4 additions & 0 deletions SMP/config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,8 @@
%define CONFIG_MOV2TEXTSUB_BSF 1
%define CONFIG_NOISE_BSF 1
%define CONFIG_NULL_BSF 1
%define CONFIG_OPUS_METADATA_BSF 1
%define CONFIG_PCM_RECHUNK_BSF 1
%define CONFIG_PRORES_METADATA_BSF 1
%define CONFIG_REMOVE_EXTRADATA_BSF 1
%define CONFIG_TEXT2MOVSUB_BSF 1
Expand Down Expand Up @@ -1688,6 +1690,7 @@
%define CONFIG_ASR_FILTER 0
%define CONFIG_ASTATS_FILTER 1
%define CONFIG_ASTREAMSELECT_FILTER 1
%define CONFIG_ASUBBOOST_FILTER 1
%define CONFIG_ATEMPO_FILTER 1
%define CONFIG_ATRIM_FILTER 1
%define CONFIG_AXCORRELATE_FILTER 1
Expand Down Expand Up @@ -2282,6 +2285,7 @@
%define CONFIG_PCM_U8_DEMUXER 1
%define CONFIG_PJS_DEMUXER 1
%define CONFIG_PMP_DEMUXER 1
%define CONFIG_PP_BNK_DEMUXER 1
%define CONFIG_PVA_DEMUXER 1
%define CONFIG_PVF_DEMUXER 1
%define CONFIG_QCP_DEMUXER 1
Expand Down
4 changes: 4 additions & 0 deletions SMP/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,8 @@
#define CONFIG_MOV2TEXTSUB_BSF 1
#define CONFIG_NOISE_BSF 1
#define CONFIG_NULL_BSF 1
#define CONFIG_OPUS_METADATA_BSF 1
#define CONFIG_PCM_RECHUNK_BSF 1
#define CONFIG_PRORES_METADATA_BSF 1
#define CONFIG_REMOVE_EXTRADATA_BSF 1
#define CONFIG_TEXT2MOVSUB_BSF 1
Expand Down Expand Up @@ -1810,6 +1812,7 @@
#define CONFIG_ASR_FILTER 0
#define CONFIG_ASTATS_FILTER 1
#define CONFIG_ASTREAMSELECT_FILTER 1
#define CONFIG_ASUBBOOST_FILTER 1
#define CONFIG_ATEMPO_FILTER 1
#define CONFIG_ATRIM_FILTER 1
#define CONFIG_AXCORRELATE_FILTER 1
Expand Down Expand Up @@ -2404,6 +2407,7 @@
#define CONFIG_PCM_U8_DEMUXER 1
#define CONFIG_PJS_DEMUXER 1
#define CONFIG_PMP_DEMUXER 1
#define CONFIG_PP_BNK_DEMUXER 1
#define CONFIG_PVA_DEMUXER 1
#define CONFIG_PVF_DEMUXER 1
#define CONFIG_QCP_DEMUXER 1
Expand Down
2 changes: 2 additions & 0 deletions SMP/libavcodec.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,8 @@
<ClCompile Include="..\libavcodec\mpeg2_metadata_bsf.c" />
<ClCompile Include="..\libavcodec\noise_bsf.c" />
<ClCompile Include="..\libavcodec\null_bsf.c" />
<ClCompile Include="..\libavcodec\opus_metadata_bsf.c" />
<ClCompile Include="..\libavcodec\pcm_rechunk_bsf.c" />
<ClCompile Include="..\libavcodec\prores_metadata_bsf.c" />
<ClCompile Include="..\libavcodec\remove_extradata_bsf.c" />
<ClCompile Include="..\libavcodec\trace_headers_bsf.c" />
Expand Down
6 changes: 6 additions & 0 deletions SMP/libavcodec.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -2760,6 +2760,12 @@
<ClCompile Include="..\libavcodec\null_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\opus_metadata_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\pcm_rechunk_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\prores_metadata_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
Expand Down
2 changes: 2 additions & 0 deletions SMP/libavcodec/bsf_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ static const AVBitStreamFilter *bitstream_filters[] = {
&ff_mov2textsub_bsf,
&ff_noise_bsf,
&ff_null_bsf,
&ff_opus_metadata_bsf,
&ff_pcm_rechunk_bsf,
&ff_prores_metadata_bsf,
&ff_remove_extradata_bsf,
&ff_text2movsub_bsf,
Expand Down
1 change: 1 addition & 0 deletions SMP/libavfilter.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<ClCompile Include="..\libavfilter\af_astats.c" />
<ClCompile Include="..\libavfilter\f_streamselect.c" />
<ClCompile Include="..\libavfilter\framesync.c" />
<ClCompile Include="..\libavfilter\af_asubboost.c" />
<ClCompile Include="..\libavfilter\af_atempo.c" />
<ClCompile Include="..\libavfilter\trim.c" />
<ClCompile Include="..\libavfilter\af_axcorrelate.c" />
Expand Down
3 changes: 3 additions & 0 deletions SMP/libavfilter.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@
<ClCompile Include="..\libavfilter\framesync.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_asubboost.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_atempo.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions SMP/libavfilter/filter_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ static const AVFilter *filter_list[] = {
&ff_af_asplit,
&ff_af_astats,
&ff_af_astreamselect,
&ff_af_asubboost,
&ff_af_atempo,
&ff_af_atrim,
&ff_af_axcorrelate,
Expand Down
2 changes: 1 addition & 1 deletion SMP/libavformat.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
<ClCompile Include="..\libavformat\gsmdec.c" />
<ClCompile Include="..\libavformat\gxf.c" />
<ClCompile Include="..\libavformat\gxfenc.c" />
<ClCompile Include="..\libavformat\audiointerleave.c" />
<ClCompile Include="..\libavformat\g722.c" />
<ClCompile Include="..\libavformat\g723_1.c" />
<ClCompile Include="..\libavformat\g726.c" />
Expand Down Expand Up @@ -373,6 +372,7 @@
<ClCompile Include="..\libavformat\pcmenc.c" />
<ClCompile Include="..\libavformat\pjsdec.c" />
<ClCompile Include="..\libavformat\pmpdec.c" />
<ClCompile Include="..\libavformat\pp_bnk.c" />
<ClCompile Include="..\libavformat\pva.c" />
<ClCompile Include="..\libavformat\pvfdec.c" />
<ClCompile Include="..\libavformat\qcp.c" />
Expand Down
6 changes: 3 additions & 3 deletions SMP/libavformat.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -598,9 +598,6 @@
<ClCompile Include="..\libavformat\gxfenc.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\audiointerleave.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\g722.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
Expand Down Expand Up @@ -970,6 +967,9 @@
<ClCompile Include="..\libavformat\pmpdec.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\pp_bnk.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\pva.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions SMP/libavformat/demuxer_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_pcm_u8_demuxer,
&ff_pjs_demuxer,
&ff_pmp_demuxer,
&ff_pp_bnk_demuxer,
&ff_pva_demuxer,
&ff_pvf_demuxer,
&ff_qcp_demuxer,
Expand Down

0 comments on commit 18e5814

Please sign in to comment.