Skip to content

Commit 7a2699e

Browse files
SibrasSibras
committed
projects: Update for upstream merge.
1 parent 976da1e commit 7a2699e

File tree

12 files changed

+34
-7
lines changed

12 files changed

+34
-7
lines changed

‎SMP/config.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,7 @@
18931893
%define CONFIG_DILATION_FILTER 1
18941894
%define CONFIG_DILATION_OPENCL_FILTER 0
18951895
%define CONFIG_DISPLACE_FILTER 1
1896+
%define CONFIG_DNN_DETECT_FILTER 1
18961897
%define CONFIG_DNN_PROCESSING_FILTER 1
18971898
%define CONFIG_DOUBLEWEAVE_FILTER 1
18981899
%define CONFIG_DRAWBOX_FILTER 1
@@ -2643,7 +2644,6 @@
26432644
%define CONFIG_SEGAFILM_MUXER 1
26442645
%define CONFIG_SEGMENT_MUXER 1
26452646
%define CONFIG_STREAM_SEGMENT_MUXER 1
2646-
%define CONFIG_SINGLEJPEG_MUXER 1
26472647
%define CONFIG_SMJPEG_MUXER 1
26482648
%define CONFIG_SMOOTHSTREAMING_MUXER 1
26492649
%define CONFIG_SOX_MUXER 1

‎SMP/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2016,6 +2016,7 @@
20162016
#define CONFIG_DILATION_FILTER 1
20172017
#define CONFIG_DILATION_OPENCL_FILTER 0
20182018
#define CONFIG_DISPLACE_FILTER 1
2019+
#define CONFIG_DNN_DETECT_FILTER 1
20192020
#define CONFIG_DNN_PROCESSING_FILTER 1
20202021
#define CONFIG_DOUBLEWEAVE_FILTER 1
20212022
#define CONFIG_DRAWBOX_FILTER 1
@@ -2766,7 +2767,6 @@
27662767
#define CONFIG_SEGAFILM_MUXER 1
27672768
#define CONFIG_SEGMENT_MUXER 1
27682769
#define CONFIG_STREAM_SEGMENT_MUXER 1
2769-
#define CONFIG_SINGLEJPEG_MUXER 1
27702770
#define CONFIG_SMJPEG_MUXER 1
27712771
#define CONFIG_SMOOTHSTREAMING_MUXER 1
27722772
#define CONFIG_SOX_MUXER 1

‎SMP/libavcodec.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@
342342
<ClCompile Include="..\libavcodec\amrwbdec.c" />
343343
<ClCompile Include="..\libavcodec\mjpegenc.c" />
344344
<ClCompile Include="..\libavcodec\mjpegenc_common.c" />
345-
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
346345
<ClCompile Include="..\libavcodec\anm.c" />
347346
<ClCompile Include="..\libavcodec\ansi.c" />
348347
<ClCompile Include="..\libavcodec\cga_data.c" />
@@ -608,6 +607,7 @@
608607
<ClCompile Include="..\libavcodec\microdvddec.c" />
609608
<ClCompile Include="..\libavcodec\mimic.c" />
610609
<ClCompile Include="..\libavcodec\mjpegdec.c" />
610+
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
611611
<ClCompile Include="..\libavcodec\mjpegbdec.c" />
612612
<ClCompile Include="..\libavcodec\qsvenc_jpeg.c" />
613613
<ClCompile Include="..\libavcodec\mlpdec.c" />

‎SMP/libavcodec.vcxproj.filters‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -876,9 +876,6 @@
876876
<ClCompile Include="..\libavcodec\mjpegenc_common.c">
877877
<Filter>Source Files\libavcodec</Filter>
878878
</ClCompile>
879-
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c">
880-
<Filter>Source Files\libavcodec</Filter>
881-
</ClCompile>
882879
<ClCompile Include="..\libavcodec\anm.c">
883880
<Filter>Source Files\libavcodec</Filter>
884881
</ClCompile>
@@ -1674,6 +1671,9 @@
16741671
<ClCompile Include="..\libavcodec\mjpegdec.c">
16751672
<Filter>Source Files\libavcodec</Filter>
16761673
</ClCompile>
1674+
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c">
1675+
<Filter>Source Files\libavcodec</Filter>
1676+
</ClCompile>
16771677
<ClCompile Include="..\libavcodec\mjpegbdec.c">
16781678
<Filter>Source Files\libavcodec</Filter>
16791679
</ClCompile>

‎SMP/libavfilter.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@
276276
<ClCompile Include="..\libavfilter\vf_despill.c" />
277277
<ClCompile Include="..\libavfilter\vf_detelecine.c" />
278278
<ClCompile Include="..\libavfilter\vf_displace.c" />
279+
<ClCompile Include="..\libavfilter\vf_dnn_detect.c" />
279280
<ClCompile Include="..\libavfilter\vf_dnn_processing.c" />
280281
<ClCompile Include="..\libavfilter\vf_weave.c" />
281282
<ClCompile Include="..\libavfilter\vf_drawbox.c" />

‎SMP/libavfilter.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,9 @@
681681
<ClCompile Include="..\libavfilter\vf_displace.c">
682682
<Filter>Source Files\libavfilter</Filter>
683683
</ClCompile>
684+
<ClCompile Include="..\libavfilter\vf_dnn_detect.c">
685+
<Filter>Source Files\libavfilter</Filter>
686+
</ClCompile>
684687
<ClCompile Include="..\libavfilter\vf_dnn_processing.c">
685688
<Filter>Source Files\libavfilter</Filter>
686689
</ClCompile>

‎SMP/libavfilter/filter_list.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ static const AVFilter *filter_list[] = {
203203
&ff_vf_detelecine,
204204
&ff_vf_dilation,
205205
&ff_vf_displace,
206+
&ff_vf_dnn_detect,
206207
&ff_vf_dnn_processing,
207208
&ff_vf_doubleweave,
208209
&ff_vf_drawbox,

‎SMP/libavformat.def‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ EXPORTS
9494
avformat_get_mov_video_tags
9595
avformat_get_riff_audio_tags
9696
avformat_get_riff_video_tags
97+
avformat_index_get_entries_count
98+
avformat_index_get_entry
99+
avformat_index_get_entry_from_timestamp
97100
avformat_init_output
98101
avformat_license
99102
avformat_match_stream_specifier

‎SMP/libavformat/muxer_list.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ static const AVOutputFormat *muxer_list[] = {
157157
&ff_segafilm_muxer,
158158
&ff_segment_muxer,
159159
&ff_stream_segment_muxer,
160-
&ff_singlejpeg_muxer,
161160
&ff_smjpeg_muxer,
162161
&ff_smoothstreaming_muxer,
163162
&ff_sox_muxer,

‎SMP/libavutil.def‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ EXPORTS
102102
av_des_crypt
103103
av_des_init
104104
av_des_mac
105+
av_detection_bbox_alloc
106+
av_detection_bbox_create_side_data
105107
av_dict_copy
106108
av_dict_count
107109
av_dict_free

0 commit comments

Comments
 (0)