Skip to content

Commit 27d5f7c

Browse files
SibrasSibras
committed
projects: Update for upstream merge.
1 parent 1752943 commit 27d5f7c

16 files changed

+150
-28
lines changed

‎SMP/config.asm‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,7 @@
750750
%define CONFIG_PCM_RECHUNK_BSF 1
751751
%define CONFIG_PRORES_METADATA_BSF 1
752752
%define CONFIG_REMOVE_EXTRADATA_BSF 1
753+
%define CONFIG_SETTS_BSF 1
753754
%define CONFIG_TEXT2MOVSUB_BSF 1
754755
%define CONFIG_TRACE_HEADERS_BSF 1
755756
%define CONFIG_TRUEHD_CORE_BSF 1
@@ -958,6 +959,7 @@
958959
%define CONFIG_SGI_DECODER 1
959960
%define CONFIG_SGIRLE_DECODER 1
960961
%define CONFIG_SHEERVIDEO_DECODER 1
962+
%define CONFIG_SIMBIOSIS_IMX_DECODER 1
961963
%define CONFIG_SMACKER_DECODER 1
962964
%define CONFIG_SMC_DECODER 1
963965
%define CONFIG_SMVJPEG_DECODER 1
@@ -1323,6 +1325,7 @@
13231325
%define CONFIG_DNXHD_ENCODER 1
13241326
%define CONFIG_DPX_ENCODER 1
13251327
%define CONFIG_DVVIDEO_ENCODER 1
1328+
%define CONFIG_EXR_ENCODER 1
13261329
%define CONFIG_FFV1_ENCODER 1
13271330
%define CONFIG_FFVHUFF_ENCODER 1
13281331
%define CONFIG_FITS_ENCODER 1
@@ -1349,6 +1352,7 @@
13491352
%define CONFIG_PAM_ENCODER 1
13501353
%define CONFIG_PBM_ENCODER 1
13511354
%define CONFIG_PCX_ENCODER 1
1355+
%define CONFIG_PFM_ENCODER 1
13521356
%define CONFIG_PGM_ENCODER 1
13531357
%define CONFIG_PGMYUV_ENCODER 1
13541358
%define CONFIG_PNG_ENCODER 1
@@ -1605,6 +1609,7 @@
16051609
%define CONFIG_BMP_PARSER 1
16061610
%define CONFIG_CAVSVIDEO_PARSER 1
16071611
%define CONFIG_COOK_PARSER 1
1612+
%define CONFIG_CRI_PARSER 1
16081613
%define CONFIG_DCA_PARSER 1
16091614
%define CONFIG_DIRAC_PARSER 1
16101615
%define CONFIG_DNXHD_PARSER 1
@@ -1644,6 +1649,7 @@
16441649
%define CONFIG_VP8_PARSER 1
16451650
%define CONFIG_VP9_PARSER 1
16461651
%define CONFIG_WEBP_PARSER 1
1652+
%define CONFIG_XBM_PARSER 1
16471653
%define CONFIG_XMA_PARSER 1
16481654
%define CONFIG_ALSA_INDEV 0
16491655
%define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1694,6 +1700,7 @@
16941700
%define CONFIG_AECHO_FILTER 1
16951701
%define CONFIG_AEMPHASIS_FILTER 1
16961702
%define CONFIG_AEVAL_FILTER 1
1703+
%define CONFIG_AEXCITER_FILTER 1
16971704
%define CONFIG_AFADE_FILTER 1
16981705
%define CONFIG_AFFTDN_FILTER 1
16991706
%define CONFIG_AFFTFILT_FILTER 1
@@ -1838,6 +1845,9 @@
18381845
%define CONFIG_CODECVIEW_FILTER 1
18391846
%define CONFIG_COLORBALANCE_FILTER 1
18401847
%define CONFIG_COLORCHANNELMIXER_FILTER 1
1848+
%define CONFIG_COLORCONTRAST_FILTER 1
1849+
%define CONFIG_COLORCORRECT_FILTER 1
1850+
%define CONFIG_COLORIZE_FILTER 1
18411851
%define CONFIG_COLORKEY_FILTER 1
18421852
%define CONFIG_COLORKEY_OPENCL_FILTER 0
18431853
%define CONFIG_COLORHOLD_FILTER 1
@@ -1892,6 +1902,7 @@
18921902
%define CONFIG_EROSION_FILTER 1
18931903
%define CONFIG_EROSION_OPENCL_FILTER 0
18941904
%define CONFIG_ESTDIF_FILTER 1
1905+
%define CONFIG_EXPOSURE_FILTER 1
18951906
%define CONFIG_EXTRACTPLANES_FILTER 1
18961907
%define CONFIG_FADE_FILTER 1
18971908
%define CONFIG_FFTDNOIZ_FILTER 1
@@ -1964,6 +1975,7 @@
19641975
%define CONFIG_MIDEQUALIZER_FILTER 1
19651976
%define CONFIG_MINTERPOLATE_FILTER 1
19661977
%define CONFIG_MIX_FILTER 1
1978+
%define CONFIG_MONOCHROME_FILTER 1
19671979
%define CONFIG_MPDECIMATE_FILTER 1
19681980
%define CONFIG_NEGATE_FILTER 1
19691981
%define CONFIG_NLMEANS_FILTER 1
@@ -2094,6 +2106,7 @@
20942106
%define CONFIG_VIBRANCE_FILTER 1
20952107
%define CONFIG_VIDSTABDETECT_FILTER 0
20962108
%define CONFIG_VIDSTABTRANSFORM_FILTER 0
2109+
%define CONFIG_VIF_FILTER 1
20972110
%define CONFIG_VIGNETTE_FILTER 1
20982111
%define CONFIG_VMAFMOTION_FILTER 1
20992112
%define CONFIG_VPP_QSV_FILTER 1
@@ -2200,6 +2213,7 @@
22002213
%define CONFIG_BFI_DEMUXER 1
22012214
%define CONFIG_BINTEXT_DEMUXER 1
22022215
%define CONFIG_BINK_DEMUXER 1
2216+
%define CONFIG_BINKA_DEMUXER 1
22032217
%define CONFIG_BIT_DEMUXER 1
22042218
%define CONFIG_BMV_DEMUXER 1
22052219
%define CONFIG_BFSTM_DEMUXER 1
@@ -2391,6 +2405,7 @@
23912405
%define CONFIG_SER_DEMUXER 1
23922406
%define CONFIG_SHORTEN_DEMUXER 1
23932407
%define CONFIG_SIFF_DEMUXER 1
2408+
%define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
23942409
%define CONFIG_SLN_DEMUXER 1
23952410
%define CONFIG_SMACKER_DEMUXER 1
23962411
%define CONFIG_SMJPEG_DEMUXER 1
@@ -2475,6 +2490,7 @@
24752490
%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
24762491
%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
24772492
%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
2493+
%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
24782494
%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
24792495
%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
24802496
%define CONFIG_LIBGME_DEMUXER 1

‎SMP/config.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#else
3636
# define CC_IDENT "msvc"
3737
#endif
38+
#define OS_NAME Windows
3839
#define av_restrict __restrict
3940
#if defined(__x86_64) || defined(_M_X64)
4041
# define EXTERN_PREFIX ""
@@ -820,6 +821,7 @@
820821
#define CONFIG_PCM_RECHUNK_BSF 1
821822
#define CONFIG_PRORES_METADATA_BSF 1
822823
#define CONFIG_REMOVE_EXTRADATA_BSF 1
824+
#define CONFIG_SETTS_BSF 1
823825
#define CONFIG_TEXT2MOVSUB_BSF 1
824826
#define CONFIG_TRACE_HEADERS_BSF 1
825827
#define CONFIG_TRUEHD_CORE_BSF 1
@@ -1028,6 +1030,7 @@
10281030
#define CONFIG_SGI_DECODER 1
10291031
#define CONFIG_SGIRLE_DECODER 1
10301032
#define CONFIG_SHEERVIDEO_DECODER 1
1033+
#define CONFIG_SIMBIOSIS_IMX_DECODER 1
10311034
#define CONFIG_SMACKER_DECODER 1
10321035
#define CONFIG_SMC_DECODER 1
10331036
#define CONFIG_SMVJPEG_DECODER 1
@@ -1393,6 +1396,7 @@
13931396
#define CONFIG_DNXHD_ENCODER 1
13941397
#define CONFIG_DPX_ENCODER 1
13951398
#define CONFIG_DVVIDEO_ENCODER 1
1399+
#define CONFIG_EXR_ENCODER 1
13961400
#define CONFIG_FFV1_ENCODER 1
13971401
#define CONFIG_FFVHUFF_ENCODER 1
13981402
#define CONFIG_FITS_ENCODER 1
@@ -1419,6 +1423,7 @@
14191423
#define CONFIG_PAM_ENCODER 1
14201424
#define CONFIG_PBM_ENCODER 1
14211425
#define CONFIG_PCX_ENCODER 1
1426+
#define CONFIG_PFM_ENCODER 1
14221427
#define CONFIG_PGM_ENCODER 1
14231428
#define CONFIG_PGMYUV_ENCODER 1
14241429
#define CONFIG_PNG_ENCODER 1
@@ -1727,6 +1732,7 @@
17271732
#define CONFIG_BMP_PARSER 1
17281733
#define CONFIG_CAVSVIDEO_PARSER 1
17291734
#define CONFIG_COOK_PARSER 1
1735+
#define CONFIG_CRI_PARSER 1
17301736
#define CONFIG_DCA_PARSER 1
17311737
#define CONFIG_DIRAC_PARSER 1
17321738
#define CONFIG_DNXHD_PARSER 1
@@ -1766,6 +1772,7 @@
17661772
#define CONFIG_VP8_PARSER 1
17671773
#define CONFIG_VP9_PARSER 1
17681774
#define CONFIG_WEBP_PARSER 1
1775+
#define CONFIG_XBM_PARSER 1
17691776
#define CONFIG_XMA_PARSER 1
17701777
#define CONFIG_ALSA_INDEV 0
17711778
#define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1816,6 +1823,7 @@
18161823
#define CONFIG_AECHO_FILTER 1
18171824
#define CONFIG_AEMPHASIS_FILTER 1
18181825
#define CONFIG_AEVAL_FILTER 1
1826+
#define CONFIG_AEXCITER_FILTER 1
18191827
#define CONFIG_AFADE_FILTER 1
18201828
#define CONFIG_AFFTDN_FILTER 1
18211829
#define CONFIG_AFFTFILT_FILTER 1
@@ -1960,6 +1968,9 @@
19601968
#define CONFIG_CODECVIEW_FILTER 1
19611969
#define CONFIG_COLORBALANCE_FILTER 1
19621970
#define CONFIG_COLORCHANNELMIXER_FILTER 1
1971+
#define CONFIG_COLORCONTRAST_FILTER 1
1972+
#define CONFIG_COLORCORRECT_FILTER 1
1973+
#define CONFIG_COLORIZE_FILTER 1
19631974
#define CONFIG_COLORKEY_FILTER 1
19641975
#define CONFIG_COLORKEY_OPENCL_FILTER 0
19651976
#define CONFIG_COLORHOLD_FILTER 1
@@ -2014,6 +2025,7 @@
20142025
#define CONFIG_EROSION_FILTER 1
20152026
#define CONFIG_EROSION_OPENCL_FILTER 0
20162027
#define CONFIG_ESTDIF_FILTER 1
2028+
#define CONFIG_EXPOSURE_FILTER 1
20172029
#define CONFIG_EXTRACTPLANES_FILTER 1
20182030
#define CONFIG_FADE_FILTER 1
20192031
#define CONFIG_FFTDNOIZ_FILTER 1
@@ -2086,6 +2098,7 @@
20862098
#define CONFIG_MIDEQUALIZER_FILTER 1
20872099
#define CONFIG_MINTERPOLATE_FILTER 1
20882100
#define CONFIG_MIX_FILTER 1
2101+
#define CONFIG_MONOCHROME_FILTER 1
20892102
#define CONFIG_MPDECIMATE_FILTER 1
20902103
#define CONFIG_NEGATE_FILTER 1
20912104
#define CONFIG_NLMEANS_FILTER 1
@@ -2216,6 +2229,7 @@
22162229
#define CONFIG_VIBRANCE_FILTER 1
22172230
#define CONFIG_VIDSTABDETECT_FILTER 0
22182231
#define CONFIG_VIDSTABTRANSFORM_FILTER 0
2232+
#define CONFIG_VIF_FILTER 1
22192233
#define CONFIG_VIGNETTE_FILTER 1
22202234
#define CONFIG_VMAFMOTION_FILTER 1
22212235
#define CONFIG_VPP_QSV_FILTER 1
@@ -2322,6 +2336,7 @@
23222336
#define CONFIG_BFI_DEMUXER 1
23232337
#define CONFIG_BINTEXT_DEMUXER 1
23242338
#define CONFIG_BINK_DEMUXER 1
2339+
#define CONFIG_BINKA_DEMUXER 1
23252340
#define CONFIG_BIT_DEMUXER 1
23262341
#define CONFIG_BMV_DEMUXER 1
23272342
#define CONFIG_BFSTM_DEMUXER 1
@@ -2513,6 +2528,7 @@
25132528
#define CONFIG_SER_DEMUXER 1
25142529
#define CONFIG_SHORTEN_DEMUXER 1
25152530
#define CONFIG_SIFF_DEMUXER 1
2531+
#define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
25162532
#define CONFIG_SLN_DEMUXER 1
25172533
#define CONFIG_SMACKER_DEMUXER 1
25182534
#define CONFIG_SMJPEG_DEMUXER 1
@@ -2597,6 +2613,7 @@
25972613
#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
25982614
#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
25992615
#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
2616+
#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
26002617
#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
26012618
#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
26022619
#define CONFIG_LIBGME_DEMUXER 1

‎SMP/libavcodec.vcxproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
<ClCompile Include="..\libavcodec\mediacodec.c" />
178178
<ClCompile Include="..\libavcodec\mpeg12framerate.c" />
179179
<ClCompile Include="..\libavcodec\options.c" />
180-
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
181180
<ClCompile Include="..\libavcodec\parser.c" />
182181
<ClCompile Include="..\libavcodec\parsers.c" />
183182
<ClCompile Include="..\libavcodec\profiles.c" />
@@ -274,7 +273,6 @@
274273
<ClCompile Include="..\libavcodec\rangecoder.c" />
275274
<ClCompile Include="..\libavcodec\rdft.c" />
276275
<ClCompile Include="..\libavcodec\sinewin.c" />
277-
<ClCompile Include="..\libavcodec\sinewin_fixed.c" />
278276
<ClCompile Include="..\libavcodec\snappy.c" />
279277
<ClCompile Include="..\libavcodec\startcode.c" />
280278
<ClCompile Include="..\libavcodec\texturedsp.c" />
@@ -341,6 +339,7 @@
341339
<ClCompile Include="..\libavcodec\amrwbdec.c" />
342340
<ClCompile Include="..\libavcodec\mjpegenc.c" />
343341
<ClCompile Include="..\libavcodec\mjpegenc_common.c" />
342+
<ClCompile Include="..\libavcodec\mjpegenc_huffman.c" />
344343
<ClCompile Include="..\libavcodec\anm.c" />
345344
<ClCompile Include="..\libavcodec\ansi.c" />
346345
<ClCompile Include="..\libavcodec\cga_data.c" />
@@ -371,7 +370,6 @@
371370
<ClCompile Include="..\libavcodec\av1dec.c" />
372371
<ClCompile Include="..\libavcodec\cuviddec.c" />
373372
<ClCompile Include="..\libavcodec\avrndec.c" />
374-
<ClCompile Include="..\libavcodec\mjpegdec.c" />
375373
<ClCompile Include="..\libavcodec\r210dec.c" />
376374
<ClCompile Include="..\libavcodec\r210enc.c" />
377375
<ClCompile Include="..\libavcodec\avs.c" />
@@ -403,6 +401,7 @@
403401
<ClCompile Include="..\libavcodec\cfhd.c" />
404402
<ClCompile Include="..\libavcodec\cfhddata.c" />
405403
<ClCompile Include="..\libavcodec\cfhdenc.c" />
404+
<ClCompile Include="..\libavcodec\cfhdencdsp.c" />
406405
<ClCompile Include="..\libavcodec\cinepak.c" />
407406
<ClCompile Include="..\libavcodec\cinepakenc.c" />
408407
<ClCompile Include="..\libavcodec\clearvideo.c" />
@@ -474,6 +473,7 @@
474473
<ClCompile Include="..\libavcodec\escape130.c" />
475474
<ClCompile Include="..\libavcodec\evrcdec.c" />
476475
<ClCompile Include="..\libavcodec\exr.c" />
476+
<ClCompile Include="..\libavcodec\exrenc.c" />
477477
<ClCompile Include="..\libavcodec\fastaudio.c" />
478478
<ClCompile Include="..\libavcodec\ffv1dec.c" />
479479
<ClCompile Include="..\libavcodec\ffv1.c" />
@@ -499,6 +499,7 @@
499499
<ClCompile Include="..\libavcodec\frwu.c" />
500500
<ClCompile Include="..\libavcodec\g2meet.c" />
501501
<ClCompile Include="..\libavcodec\elsdec.c" />
502+
<ClCompile Include="..\libavcodec\mjpegdec_common.c" />
502503
<ClCompile Include="..\libavcodec\g723_1dec.c" />
503504
<ClCompile Include="..\libavcodec\g723_1.c" />
504505
<ClCompile Include="..\libavcodec\g723_1enc.c" />
@@ -593,6 +594,7 @@
593594
<ClCompile Include="..\libavcodec\lagarithrac.c" />
594595
<ClCompile Include="..\libavcodec\ljpegenc.c" />
595596
<ClCompile Include="..\libavcodec\loco.c" />
597+
<ClCompile Include="..\libavcodec\lscrdec.c" />
596598
<ClCompile Include="..\libavcodec\m101.c" />
597599
<ClCompile Include="..\libavcodec\mace.c" />
598600
<ClCompile Include="..\libavcodec\magicyuv.c" />
@@ -603,6 +605,7 @@
603605
<ClCompile Include="..\libavcodec\twinvq.c" />
604606
<ClCompile Include="..\libavcodec\microdvddec.c" />
605607
<ClCompile Include="..\libavcodec\mimic.c" />
608+
<ClCompile Include="..\libavcodec\mjpegdec.c" />
606609
<ClCompile Include="..\libavcodec\mjpegbdec.c" />
607610
<ClCompile Include="..\libavcodec\qsvenc_jpeg.c" />
608611
<ClCompile Include="..\libavcodec\mlpdec.c" />
@@ -733,6 +736,7 @@
733736
<ClCompile Include="..\libavcodec\sipr.c" />
734737
<ClCompile Include="..\libavcodec\sipr16k.c" />
735738
<ClCompile Include="..\libavcodec\siren.c" />
739+
<ClCompile Include="..\libavcodec\imx.c" />
736740
<ClCompile Include="..\libavcodec\smacker.c" />
737741
<ClCompile Include="..\libavcodec\smc.c" />
738742
<ClCompile Include="..\libavcodec\snowdec.c" />
@@ -765,7 +769,6 @@
765769
<ClCompile Include="..\libavcodec\tiertexseqv.c" />
766770
<ClCompile Include="..\libavcodec\tiff.c" />
767771
<ClCompile Include="..\libavcodec\faxcompr.c" />
768-
<ClCompile Include="..\libavcodec\tiff_data.c" />
769772
<ClCompile Include="..\libavcodec\tiffenc.c" />
770773
<ClCompile Include="..\libavcodec\tmv.c" />
771774
<ClCompile Include="..\libavcodec\truemotion1.c" />
@@ -926,6 +929,7 @@
926929
<ClCompile Include="..\libavcodec\bmp_parser.c" />
927930
<ClCompile Include="..\libavcodec\cavs_parser.c" />
928931
<ClCompile Include="..\libavcodec\cook_parser.c" />
932+
<ClCompile Include="..\libavcodec\cri_parser.c" />
929933
<ClCompile Include="..\libavcodec\dca_parser.c" />
930934
<ClCompile Include="..\libavcodec\dirac_parser.c" />
931935
<ClCompile Include="..\libavcodec\dnxhd_parser.c" />
@@ -964,6 +968,7 @@
964968
<ClCompile Include="..\libavcodec\vp8_parser.c" />
965969
<ClCompile Include="..\libavcodec\vp9_parser.c" />
966970
<ClCompile Include="..\libavcodec\webp_parser.c" />
971+
<ClCompile Include="..\libavcodec\xbm_parser.c" />
967972
<ClCompile Include="..\libavcodec\xma_parser.c" />
968973
<ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
969974
<ClCompile Include="..\libavcodec\av1_metadata_bsf.c" />
@@ -996,6 +1001,7 @@
9961001
<ClCompile Include="..\libavcodec\pcm_rechunk_bsf.c" />
9971002
<ClCompile Include="..\libavcodec\prores_metadata_bsf.c" />
9981003
<ClCompile Include="..\libavcodec\remove_extradata_bsf.c" />
1004+
<ClCompile Include="..\libavcodec\setts_bsf.c" />
9991005
<ClCompile Include="..\libavcodec\trace_headers_bsf.c" />
10001006
<ClCompile Include="..\libavcodec\truehd_core_bsf.c" />
10011007
<ClCompile Include="..\libavcodec\vp9_metadata_bsf.c" />

0 commit comments

Comments
 (0)