Skip to content

Commit 37034cc

Browse files
SibrasSibras
committed
project: Update for upstream merge.
1 parent dcbbbe3 commit 37034cc

File tree

10 files changed

+70
-37
lines changed

10 files changed

+70
-37
lines changed

‎SMP/config.asm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,6 +1608,7 @@
16081608
%define CONFIG_DCA_PARSER 1
16091609
%define CONFIG_DIRAC_PARSER 1
16101610
%define CONFIG_DNXHD_PARSER 1
1611+
%define CONFIG_DOLBY_E_PARSER 1
16111612
%define CONFIG_DPX_PARSER 1
16121613
%define CONFIG_DVAUDIO_PARSER 1
16131614
%define CONFIG_DVBSUB_PARSER 1
@@ -1843,6 +1844,7 @@
18431844
%define CONFIG_COLORLEVELS_FILTER 1
18441845
%define CONFIG_COLORMATRIX_FILTER 1
18451846
%define CONFIG_COLORSPACE_FILTER 1
1847+
%define CONFIG_COLORTEMPERATURE_FILTER 1
18461848
%define CONFIG_CONVOLUTION_FILTER 1
18471849
%define CONFIG_CONVOLUTION_OPENCL_FILTER 0
18481850
%define CONFIG_CONVOLVE_FILTER 1
@@ -1885,9 +1887,11 @@
18851887
%define CONFIG_EDGEDETECT_FILTER 1
18861888
%define CONFIG_ELBG_FILTER 1
18871889
%define CONFIG_ENTROPY_FILTER 1
1890+
%define CONFIG_EPX_FILTER 1
18881891
%define CONFIG_EQ_FILTER 1
18891892
%define CONFIG_EROSION_FILTER 1
18901893
%define CONFIG_EROSION_OPENCL_FILTER 0
1894+
%define CONFIG_ESTDIF_FILTER 1
18911895
%define CONFIG_EXTRACTPLANES_FILTER 1
18921896
%define CONFIG_FADE_FILTER 1
18931897
%define CONFIG_FFTDNOIZ_FILTER 1
@@ -1932,6 +1936,7 @@
19321936
%define CONFIG_INTERLACE_FILTER 1
19331937
%define CONFIG_INTERLEAVE_FILTER 1
19341938
%define CONFIG_KERNDEINT_FILTER 1
1939+
%define CONFIG_KIRSCH_FILTER 1
19351940
%define CONFIG_LAGFUN_FILTER 1
19361941
%define CONFIG_LENSCORRECTION_FILTER 1
19371942
%define CONFIG_LENSFUN_FILTER 0
@@ -2033,6 +2038,7 @@
20332038
%define CONFIG_SETSAR_FILTER 1
20342039
%define CONFIG_SETTB_FILTER 1
20352040
%define CONFIG_SHARPNESS_VAAPI_FILTER 0
2041+
%define CONFIG_SHEAR_FILTER 1
20362042
%define CONFIG_SHOWINFO_FILTER 1
20372043
%define CONFIG_SHOWPALETTE_FILTER 1
20382044
%define CONFIG_SHUFFLEFRAMES_FILTER 1

‎SMP/config.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,7 @@
17301730
#define CONFIG_DCA_PARSER 1
17311731
#define CONFIG_DIRAC_PARSER 1
17321732
#define CONFIG_DNXHD_PARSER 1
1733+
#define CONFIG_DOLBY_E_PARSER 1
17331734
#define CONFIG_DPX_PARSER 1
17341735
#define CONFIG_DVAUDIO_PARSER 1
17351736
#define CONFIG_DVBSUB_PARSER 1
@@ -1965,6 +1966,7 @@
19651966
#define CONFIG_COLORLEVELS_FILTER 1
19661967
#define CONFIG_COLORMATRIX_FILTER 1
19671968
#define CONFIG_COLORSPACE_FILTER 1
1969+
#define CONFIG_COLORTEMPERATURE_FILTER 1
19681970
#define CONFIG_CONVOLUTION_FILTER 1
19691971
#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
19701972
#define CONFIG_CONVOLVE_FILTER 1
@@ -2007,9 +2009,11 @@
20072009
#define CONFIG_EDGEDETECT_FILTER 1
20082010
#define CONFIG_ELBG_FILTER 1
20092011
#define CONFIG_ENTROPY_FILTER 1
2012+
#define CONFIG_EPX_FILTER 1
20102013
#define CONFIG_EQ_FILTER 1
20112014
#define CONFIG_EROSION_FILTER 1
20122015
#define CONFIG_EROSION_OPENCL_FILTER 0
2016+
#define CONFIG_ESTDIF_FILTER 1
20132017
#define CONFIG_EXTRACTPLANES_FILTER 1
20142018
#define CONFIG_FADE_FILTER 1
20152019
#define CONFIG_FFTDNOIZ_FILTER 1
@@ -2054,6 +2058,7 @@
20542058
#define CONFIG_INTERLACE_FILTER 1
20552059
#define CONFIG_INTERLEAVE_FILTER 1
20562060
#define CONFIG_KERNDEINT_FILTER 1
2061+
#define CONFIG_KIRSCH_FILTER 1
20572062
#define CONFIG_LAGFUN_FILTER 1
20582063
#define CONFIG_LENSCORRECTION_FILTER 1
20592064
#define CONFIG_LENSFUN_FILTER 0
@@ -2155,6 +2160,7 @@
21552160
#define CONFIG_SETSAR_FILTER 1
21562161
#define CONFIG_SETTB_FILTER 1
21572162
#define CONFIG_SHARPNESS_VAAPI_FILTER 0
2163+
#define CONFIG_SHEAR_FILTER 1
21582164
#define CONFIG_SHOWINFO_FILTER 1
21592165
#define CONFIG_SHOWPALETTE_FILTER 1
21602166
#define CONFIG_SHUFFLEFRAMES_FILTER 1

‎SMP/libavcodec.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,10 @@
196196
<ClCompile Include="..\libavcodec\atsc_a53.c" />
197197
<ClCompile Include="..\libavcodec\cabac.c" />
198198
<ClCompile Include="..\libavcodec\cbs.c" />
199+
<ClCompile Include="..\libavcodec\cbs_bsf.c" />
199200
<ClCompile Include="..\libavcodec\cbs_av1.c" />
200201
<ClCompile Include="..\libavcodec\cbs_h2645.c" />
202+
<ClCompile Include="..\libavcodec\cbs_sei.c" />
201203
<ClCompile Include="..\libavcodec\h2645_parse.c" />
202204
<ClCompile Include="..\libavcodec\cbs_jpeg.c" />
203205
<ClCompile Include="..\libavcodec\cbs_mpeg2.c" />
@@ -214,7 +216,6 @@
214216
<ClCompile Include="..\libavcodec\jfdctfst.c" />
215217
<ClCompile Include="..\libavcodec\jfdctint.c" />
216218
<ClCompile Include="..\libavcodec\avfft.c" />
217-
<ClCompile Include="..\libavcodec\fft_fixed.c" />
218219
<ClCompile Include="..\libavcodec\fft_float.c" />
219220
<ClCompile Include="..\libavcodec\fft_fixed_32.c" />
220221
<ClCompile Include="..\libavcodec\fft_init_table.c" />
@@ -243,7 +244,6 @@
243244
<ClCompile Include="..\libavcodec\lpc.c" />
244245
<ClCompile Include="..\libavcodec\lsp.c" />
245246
<ClCompile Include="..\libavcodec\lzf.c" />
246-
<ClCompile Include="..\libavcodec\mdct_fixed.c" />
247247
<ClCompile Include="..\libavcodec\mdct_float.c" />
248248
<ClCompile Include="..\libavcodec\mdct_fixed_32.c" />
249249
<ClCompile Include="..\libavcodec\mpeg_er.c" />
@@ -437,6 +437,7 @@
437437
<ClCompile Include="..\libavcodec\dnxhddec.c" />
438438
<ClCompile Include="..\libavcodec\dnxhddata.c" />
439439
<ClCompile Include="..\libavcodec\dolby_e.c" />
440+
<ClCompile Include="..\libavcodec\dolby_e_parse.c" />
440441
<ClCompile Include="..\libavcodec\dpx.c" />
441442
<ClCompile Include="..\libavcodec\dpxenc.c" />
442443
<ClCompile Include="..\libavcodec\dsddec.c" />
@@ -486,11 +487,12 @@
486487
<ClCompile Include="..\libavcodec\flacdata.c" />
487488
<ClCompile Include="..\libavcodec\flac.c" />
488489
<ClCompile Include="..\libavcodec\flacenc.c" />
489-
<ClCompile Include="..\libavcodec\vorbis_data.c" />
490490
<ClCompile Include="..\libavcodec\flashsv.c" />
491491
<ClCompile Include="..\libavcodec\flashsvenc.c" />
492492
<ClCompile Include="..\libavcodec\flashsv2enc.c" />
493493
<ClCompile Include="..\libavcodec\flicvideo.c" />
494+
<ClCompile Include="..\libavcodec\flvdec.c" />
495+
<ClCompile Include="..\libavcodec\flvenc.c" />
494496
<ClCompile Include="..\libavcodec\fmvc.c" />
495497
<ClCompile Include="..\libavcodec\4xm.c" />
496498
<ClCompile Include="..\libavcodec\fraps.c" />
@@ -517,12 +519,9 @@
517519
<ClCompile Include="..\libavcodec\ituh263dec.c" />
518520
<ClCompile Include="..\libavcodec\mpeg4video.c" />
519521
<ClCompile Include="..\libavcodec\mpeg4videodec.c" />
520-
<ClCompile Include="..\libavcodec\flvdec.c" />
521-
<ClCompile Include="..\libavcodec\intelh263dec.c" />
522522
<ClCompile Include="..\libavcodec\h263data.c" />
523-
<ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
523+
<ClCompile Include="..\libavcodec\intelh263dec.c" />
524524
<ClCompile Include="..\libavcodec\ituh263enc.c" />
525-
<ClCompile Include="..\libavcodec\flvenc.c" />
526525
<ClCompile Include="..\libavcodec\h264dec.c" />
527526
<ClCompile Include="..\libavcodec\h264_cabac.c" />
528527
<ClCompile Include="..\libavcodec\h264_cavlc.c" />
@@ -536,7 +535,6 @@
536535
<ClCompile Include="..\libavcodec\h264data.c" />
537536
<ClCompile Include="..\libavcodec\amfenc_h264.c" />
538537
<ClCompile Include="..\libavcodec\nvenc_h264.c" />
539-
<ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
540538
<ClCompile Include="..\libavcodec\qsvenc_h264.c" />
541539
<ClCompile Include="..\libavcodec\hapdec.c" />
542540
<ClCompile Include="..\libavcodec\hap.c" />
@@ -605,7 +603,6 @@
605603
<ClCompile Include="..\libavcodec\twinvq.c" />
606604
<ClCompile Include="..\libavcodec\microdvddec.c" />
607605
<ClCompile Include="..\libavcodec\mimic.c" />
608-
<ClCompile Include="..\libavcodec\qsvdec_other.c" />
609606
<ClCompile Include="..\libavcodec\mjpegbdec.c" />
610607
<ClCompile Include="..\libavcodec\qsvenc_jpeg.c" />
611608
<ClCompile Include="..\libavcodec\mlpdec.c" />
@@ -626,6 +623,7 @@
626623
<ClCompile Include="..\libavcodec\mpc8.c" />
627624
<ClCompile Include="..\libavcodec\mpeg12enc.c" />
628625
<ClCompile Include="..\libavcodec\qsvenc_mpeg2.c" />
626+
<ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
629627
<ClCompile Include="..\libavcodec\mpl2dec.c" />
630628
<ClCompile Include="..\libavcodec\mss3.c" />
631629
<ClCompile Include="..\libavcodec\mscc.c" />
@@ -664,6 +662,7 @@
664662
<ClCompile Include="..\libavcodec\opus_pvq.c" />
665663
<ClCompile Include="..\libavcodec\opus_silk.c" />
666664
<ClCompile Include="..\libavcodec\opustab.c" />
665+
<ClCompile Include="..\libavcodec\vorbis_data.c" />
667666
<ClCompile Include="..\libavcodec\opusenc.c" />
668667
<ClCompile Include="..\libavcodec\opusenc_psy.c" />
669668
<ClCompile Include="..\libavcodec\pafaudio.c" />
@@ -930,6 +929,7 @@
930929
<ClCompile Include="..\libavcodec\dca_parser.c" />
931930
<ClCompile Include="..\libavcodec\dirac_parser.c" />
932931
<ClCompile Include="..\libavcodec\dnxhd_parser.c" />
932+
<ClCompile Include="..\libavcodec\dolby_e_parser.c" />
933933
<ClCompile Include="..\libavcodec\dpx_parser.c" />
934934
<ClCompile Include="..\libavcodec\dvaudio_parser.c" />
935935
<ClCompile Include="..\libavcodec\dvbsub_parser.c" />

‎SMP/libavcodec.vcxproj.filters‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,18 @@
438438
<ClCompile Include="..\libavcodec\cbs.c">
439439
<Filter>Source Files\libavcodec</Filter>
440440
</ClCompile>
441+
<ClCompile Include="..\libavcodec\cbs_bsf.c">
442+
<Filter>Source Files\libavcodec</Filter>
443+
</ClCompile>
441444
<ClCompile Include="..\libavcodec\cbs_av1.c">
442445
<Filter>Source Files\libavcodec</Filter>
443446
</ClCompile>
444447
<ClCompile Include="..\libavcodec\cbs_h2645.c">
445448
<Filter>Source Files\libavcodec</Filter>
446449
</ClCompile>
450+
<ClCompile Include="..\libavcodec\cbs_sei.c">
451+
<Filter>Source Files\libavcodec</Filter>
452+
</ClCompile>
447453
<ClCompile Include="..\libavcodec\h2645_parse.c">
448454
<Filter>Source Files\libavcodec</Filter>
449455
</ClCompile>
@@ -492,9 +498,6 @@
492498
<ClCompile Include="..\libavcodec\avfft.c">
493499
<Filter>Source Files\libavcodec</Filter>
494500
</ClCompile>
495-
<ClCompile Include="..\libavcodec\fft_fixed.c">
496-
<Filter>Source Files\libavcodec</Filter>
497-
</ClCompile>
498501
<ClCompile Include="..\libavcodec\fft_float.c">
499502
<Filter>Source Files\libavcodec</Filter>
500503
</ClCompile>
@@ -579,9 +582,6 @@
579582
<ClCompile Include="..\libavcodec\lzf.c">
580583
<Filter>Source Files\libavcodec</Filter>
581584
</ClCompile>
582-
<ClCompile Include="..\libavcodec\mdct_fixed.c">
583-
<Filter>Source Files\libavcodec</Filter>
584-
</ClCompile>
585585
<ClCompile Include="..\libavcodec\mdct_float.c">
586586
<Filter>Source Files\libavcodec</Filter>
587587
</ClCompile>
@@ -1161,6 +1161,9 @@
11611161
<ClCompile Include="..\libavcodec\dolby_e.c">
11621162
<Filter>Source Files\libavcodec</Filter>
11631163
</ClCompile>
1164+
<ClCompile Include="..\libavcodec\dolby_e_parse.c">
1165+
<Filter>Source Files\libavcodec</Filter>
1166+
</ClCompile>
11641167
<ClCompile Include="..\libavcodec\dpx.c">
11651168
<Filter>Source Files\libavcodec</Filter>
11661169
</ClCompile>
@@ -1308,9 +1311,6 @@
13081311
<ClCompile Include="..\libavcodec\flacenc.c">
13091312
<Filter>Source Files\libavcodec</Filter>
13101313
</ClCompile>
1311-
<ClCompile Include="..\libavcodec\vorbis_data.c">
1312-
<Filter>Source Files\libavcodec</Filter>
1313-
</ClCompile>
13141314
<ClCompile Include="..\libavcodec\flashsv.c">
13151315
<Filter>Source Files\libavcodec</Filter>
13161316
</ClCompile>
@@ -1323,6 +1323,12 @@
13231323
<ClCompile Include="..\libavcodec\flicvideo.c">
13241324
<Filter>Source Files\libavcodec</Filter>
13251325
</ClCompile>
1326+
<ClCompile Include="..\libavcodec\flvdec.c">
1327+
<Filter>Source Files\libavcodec</Filter>
1328+
</ClCompile>
1329+
<ClCompile Include="..\libavcodec\flvenc.c">
1330+
<Filter>Source Files\libavcodec</Filter>
1331+
</ClCompile>
13261332
<ClCompile Include="..\libavcodec\fmvc.c">
13271333
<Filter>Source Files\libavcodec</Filter>
13281334
</ClCompile>
@@ -1401,24 +1407,15 @@
14011407
<ClCompile Include="..\libavcodec\mpeg4videodec.c">
14021408
<Filter>Source Files\libavcodec</Filter>
14031409
</ClCompile>
1404-
<ClCompile Include="..\libavcodec\flvdec.c">
1405-
<Filter>Source Files\libavcodec</Filter>
1406-
</ClCompile>
1407-
<ClCompile Include="..\libavcodec\intelh263dec.c">
1408-
<Filter>Source Files\libavcodec</Filter>
1409-
</ClCompile>
14101410
<ClCompile Include="..\libavcodec\h263data.c">
14111411
<Filter>Source Files\libavcodec</Filter>
14121412
</ClCompile>
1413-
<ClCompile Include="..\libavcodec\mpeg4videoenc.c">
1413+
<ClCompile Include="..\libavcodec\intelh263dec.c">
14141414
<Filter>Source Files\libavcodec</Filter>
14151415
</ClCompile>
14161416
<ClCompile Include="..\libavcodec\ituh263enc.c">
14171417
<Filter>Source Files\libavcodec</Filter>
14181418
</ClCompile>
1419-
<ClCompile Include="..\libavcodec\flvenc.c">
1420-
<Filter>Source Files\libavcodec</Filter>
1421-
</ClCompile>
14221419
<ClCompile Include="..\libavcodec\h264dec.c">
14231420
<Filter>Source Files\libavcodec</Filter>
14241421
</ClCompile>
@@ -1458,9 +1455,6 @@
14581455
<ClCompile Include="..\libavcodec\nvenc_h264.c">
14591456
<Filter>Source Files\libavcodec</Filter>
14601457
</ClCompile>
1461-
<ClCompile Include="..\libavcodec\qsvdec_h2645.c">
1462-
<Filter>Source Files\libavcodec</Filter>
1463-
</ClCompile>
14641458
<ClCompile Include="..\libavcodec\qsvenc_h264.c">
14651459
<Filter>Source Files\libavcodec</Filter>
14661460
</ClCompile>
@@ -1665,9 +1659,6 @@
16651659
<ClCompile Include="..\libavcodec\mimic.c">
16661660
<Filter>Source Files\libavcodec</Filter>
16671661
</ClCompile>
1668-
<ClCompile Include="..\libavcodec\qsvdec_other.c">
1669-
<Filter>Source Files\libavcodec</Filter>
1670-
</ClCompile>
16711662
<ClCompile Include="..\libavcodec\mjpegbdec.c">
16721663
<Filter>Source Files\libavcodec</Filter>
16731664
</ClCompile>
@@ -1728,6 +1719,9 @@
17281719
<ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
17291720
<Filter>Source Files\libavcodec</Filter>
17301721
</ClCompile>
1722+
<ClCompile Include="..\libavcodec\mpeg4videoenc.c">
1723+
<Filter>Source Files\libavcodec</Filter>
1724+
</ClCompile>
17311725
<ClCompile Include="..\libavcodec\mpl2dec.c">
17321726
<Filter>Source Files\libavcodec</Filter>
17331727
</ClCompile>
@@ -1842,6 +1836,9 @@
18421836
<ClCompile Include="..\libavcodec\opustab.c">
18431837
<Filter>Source Files\libavcodec</Filter>
18441838
</ClCompile>
1839+
<ClCompile Include="..\libavcodec\vorbis_data.c">
1840+
<Filter>Source Files\libavcodec</Filter>
1841+
</ClCompile>
18451842
<ClCompile Include="..\libavcodec\opusenc.c">
18461843
<Filter>Source Files\libavcodec</Filter>
18471844
</ClCompile>
@@ -2640,6 +2637,9 @@
26402637
<ClCompile Include="..\libavcodec\dnxhd_parser.c">
26412638
<Filter>Source Files\libavcodec</Filter>
26422639
</ClCompile>
2640+
<ClCompile Include="..\libavcodec\dolby_e_parser.c">
2641+
<Filter>Source Files\libavcodec</Filter>
2642+
</ClCompile>
26432643
<ClCompile Include="..\libavcodec\dpx_parser.c">
26442644
<Filter>Source Files\libavcodec</Filter>
26452645
</ClCompile>

‎SMP/libavcodec/dce_defs.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx,
140140
#if !(ARCH_X86_64)
141141
void ff_fft15_avx(FFTComplex *out, FFTComplex *in, FFTComplex *exptab, ptrdiff_t stride) {return;}
142142
#endif
143-
void ff_fft_fixed_init_arm(FFTContext *s) {return;}
144143
void ff_fft_init_aarch64(FFTContext *s) {return;}
145144
void ff_fft_init_arm(FFTContext *s) {return;}
146145
void ff_fft_init_mips(FFTContext *s) {return;}

‎SMP/libavcodec/parser_list.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ static const AVCodecParser *parser_list[] = {
3232
&ff_dca_parser,
3333
&ff_dirac_parser,
3434
&ff_dnxhd_parser,
35+
&ff_dolby_e_parser,
3536
&ff_dpx_parser,
3637
&ff_dvaudio_parser,
3738
&ff_dvbsub_parser,

‎SMP/libavfilter.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@
246246
<ClCompile Include="..\libavfilter\vf_colormatrix.c" />
247247
<ClCompile Include="..\libavfilter\vf_colorspace.c" />
248248
<ClCompile Include="..\libavfilter\colorspace.c" />
249+
<ClCompile Include="..\libavfilter\vf_colortemperature.c" />
249250
<ClCompile Include="..\libavfilter\vf_convolve.c" />
250251
<ClCompile Include="..\libavfilter\vf_copy.c" />
251252
<ClCompile Include="..\libavfilter\vf_cover_rect.c" />
@@ -278,6 +279,8 @@
278279
<ClCompile Include="..\libavfilter\vf_edgedetect.c" />
279280
<ClCompile Include="..\libavfilter\vf_elbg.c" />
280281
<ClCompile Include="..\libavfilter\vf_entropy.c" />
282+
<ClCompile Include="..\libavfilter\vf_epx.c" />
283+
<ClCompile Include="..\libavfilter\vf_estdif.c" />
281284
<ClCompile Include="..\libavfilter\vf_fade.c" />
282285
<ClCompile Include="..\libavfilter\vf_fftdnoiz.c" />
283286
<ClCompile Include="..\libavfilter\vf_fftfilt.c" />
@@ -364,6 +367,7 @@
364367
<ClCompile Include="..\libavfilter\vf_separatefields.c" />
365368
<ClCompile Include="..\libavfilter\vf_aspect.c" />
366369
<ClCompile Include="..\libavfilter\vf_setparams.c" />
370+
<ClCompile Include="..\libavfilter\vf_shear.c" />
367371
<ClCompile Include="..\libavfilter\vf_showinfo.c" />
368372
<ClCompile Include="..\libavfilter\vf_showpalette.c" />
369373
<ClCompile Include="..\libavfilter\vf_shuffleframes.c" />

0 commit comments

Comments
 (0)