From ca622c8fb7a35c8da7b2cc6c43a0a709385917c7 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 7 Sep 2020 20:09:21 +1000 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/SMP.patch | 6 +++--- SMP/config.asm | 14 +++++++++++++ SMP/config.h | 14 +++++++++++++ SMP/libavcodec.vcxproj | 15 ++++++++++++-- SMP/libavcodec.vcxproj.filters | 35 +++++++++++++++++++++++++++++---- SMP/libavcodec/codec_list.c | 7 +++++++ SMP/libavfilter.vcxproj | 1 + SMP/libavfilter.vcxproj.filters | 3 +++ SMP/libavformat.vcxproj | 2 ++ SMP/libavformat.vcxproj.filters | 6 ++++++ SMP/libavformat/demuxer_list.c | 4 ++++ SMP/libavformat/muxer_list.c | 1 + 12 files changed, 99 insertions(+), 9 deletions(-) diff --git a/SMP/SMP.patch b/SMP/SMP.patch index 521851f003888..d73a9bae656f4 100644 --- a/SMP/SMP.patch +++ b/SMP/SMP.patch @@ -1,10 +1,10 @@ diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c -index 7bbeab7d4c..8907d7bc4b 100644 +index ca7cc3a540..99702894d2 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c -@@ -31,10 +31,6 @@ - #include "internal.h" +@@ -32,10 +32,6 @@ #include "packet_internal.h" + #include "atsc_a53.h" -#if defined(_MSC_VER) -#define X264_API_IMPORTS 1 diff --git a/SMP/config.asm b/SMP/config.asm index 2e1dfbccc9627..37f59ebe93cda 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -395,6 +395,7 @@ %define HAVE_STRUCT_SOCKADDR_STORAGE 1 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0 +%define HAVE_LIBDRM_GETFB2 0 %define HAVE_MAKEINFO 0 %define HAVE_MAKEINFO_HTML 0 %define HAVE_OPENCL_D3D11 0 @@ -631,6 +632,7 @@ %define CONFIG_AANDCTTABLES 1 %define CONFIG_AC3DSP 1 %define CONFIG_ADTS_HEADER 1 +%define CONFIG_ATSC_A53 1 %define CONFIG_AUDIO_FRAME_QUEUE 1 %define CONFIG_AUDIODSP 1 %define CONFIG_BLOCKDSP 1 @@ -876,6 +878,7 @@ %define CONFIG_MJPEG_DECODER 1 %define CONFIG_MJPEGB_DECODER 1 %define CONFIG_MMVIDEO_DECODER 1 +%define CONFIG_MOBICLIP_DECODER 1 %define CONFIG_MOTIONPIXELS_DECODER 1 %define CONFIG_MPEG1VIDEO_DECODER 1 %define CONFIG_MPEG2VIDEO_DECODER 1 @@ -919,6 +922,7 @@ %define CONFIG_PGM_DECODER 1 %define CONFIG_PGMYUV_DECODER 1 %define CONFIG_PGX_DECODER 1 +%define CONFIG_PHOTOCD_DECODER 1 %define CONFIG_PICTOR_DECODER 1 %define CONFIG_PIXLET_DECODER 1 %define CONFIG_PNG_DECODER 1 @@ -1063,6 +1067,7 @@ %define CONFIG_DST_DECODER 1 %define CONFIG_EAC3_DECODER 1 %define CONFIG_EVRC_DECODER 1 +%define CONFIG_FASTAUDIO_DECODER 1 %define CONFIG_FFWAVESYNTH_DECODER 1 %define CONFIG_FLAC_DECODER 1 %define CONFIG_G723_1_DECODER 1 @@ -1192,6 +1197,7 @@ %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1 %define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1 %define CONFIG_ADPCM_IMA_ISS_DECODER 1 +%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 1 %define CONFIG_ADPCM_IMA_MTF_DECODER 1 %define CONFIG_ADPCM_IMA_OKI_DECODER 1 %define CONFIG_ADPCM_IMA_QT_DECODER 1 @@ -1301,6 +1307,7 @@ %define CONFIG_AVUI_ENCODER 1 %define CONFIG_AYUV_ENCODER 1 %define CONFIG_BMP_ENCODER 1 +%define CONFIG_CFHD_ENCODER 1 %define CONFIG_CINEPAK_ENCODER 1 %define CONFIG_CLJR_ENCODER 1 %define CONFIG_COMFORTNOISE_ENCODER 1 @@ -1345,6 +1352,7 @@ %define CONFIG_R210_ENCODER 1 %define CONFIG_RAWVIDEO_ENCODER 1 %define CONFIG_ROQ_ENCODER 1 +%define CONFIG_RPZA_ENCODER 1 %define CONFIG_RV10_ENCODER 1 %define CONFIG_RV20_ENCODER 1 %define CONFIG_S302M_ENCODER 1 @@ -1427,6 +1435,7 @@ %define CONFIG_PCM_VIDC_ENCODER 1 %define CONFIG_ROQ_DPCM_ENCODER 1 %define CONFIG_ADPCM_ADX_ENCODER 1 +%define CONFIG_ADPCM_ARGO_ENCODER 1 %define CONFIG_ADPCM_G722_ENCODER 1 %define CONFIG_ADPCM_G726_ENCODER 1 %define CONFIG_ADPCM_G726LE_ENCODER 1 @@ -2255,6 +2264,8 @@ %define CONFIG_MLV_DEMUXER 1 %define CONFIG_MM_DEMUXER 1 %define CONFIG_MMF_DEMUXER 1 +%define CONFIG_MODS_DEMUXER 1 +%define CONFIG_MOFLEX_DEMUXER 1 %define CONFIG_MOV_DEMUXER 1 %define CONFIG_MP3_DEMUXER 1 %define CONFIG_MPC_DEMUXER 1 @@ -2281,6 +2292,7 @@ %define CONFIG_NSV_DEMUXER 1 %define CONFIG_NUT_DEMUXER 1 %define CONFIG_NUV_DEMUXER 1 +%define CONFIG_OBU_DEMUXER 1 %define CONFIG_OGG_DEMUXER 1 %define CONFIG_OMA_DEMUXER 1 %define CONFIG_PAF_DEMUXER 1 @@ -2408,6 +2420,7 @@ %define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1 +%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1 @@ -2434,6 +2447,7 @@ %define CONFIG_APNG_MUXER 1 %define CONFIG_APTX_MUXER 1 %define CONFIG_APTX_HD_MUXER 1 +%define CONFIG_ARGO_ASF_MUXER 1 %define CONFIG_ASF_MUXER 1 %define CONFIG_ASS_MUXER 1 %define CONFIG_AST_MUXER 1 diff --git a/SMP/config.h b/SMP/config.h index 0db3d1bfdd43c..30e2797399a78 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -453,6 +453,7 @@ #define HAVE_STRUCT_SOCKADDR_STORAGE 1 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0 +#define HAVE_LIBDRM_GETFB2 0 #define HAVE_MAKEINFO 0 #define HAVE_MAKEINFO_HTML 0 #define HAVE_OPENCL_D3D11 0 @@ -701,6 +702,7 @@ #define CONFIG_AANDCTTABLES 1 #define CONFIG_AC3DSP 1 #define CONFIG_ADTS_HEADER 1 +#define CONFIG_ATSC_A53 1 #define CONFIG_AUDIO_FRAME_QUEUE 1 #define CONFIG_AUDIODSP 1 #define CONFIG_BLOCKDSP 1 @@ -946,6 +948,7 @@ #define CONFIG_MJPEG_DECODER 1 #define CONFIG_MJPEGB_DECODER 1 #define CONFIG_MMVIDEO_DECODER 1 +#define CONFIG_MOBICLIP_DECODER 1 #define CONFIG_MOTIONPIXELS_DECODER 1 #define CONFIG_MPEG1VIDEO_DECODER 1 #define CONFIG_MPEG2VIDEO_DECODER 1 @@ -989,6 +992,7 @@ #define CONFIG_PGM_DECODER 1 #define CONFIG_PGMYUV_DECODER 1 #define CONFIG_PGX_DECODER 1 +#define CONFIG_PHOTOCD_DECODER 1 #define CONFIG_PICTOR_DECODER 1 #define CONFIG_PIXLET_DECODER 1 #define CONFIG_PNG_DECODER 1 @@ -1133,6 +1137,7 @@ #define CONFIG_DST_DECODER 1 #define CONFIG_EAC3_DECODER 1 #define CONFIG_EVRC_DECODER 1 +#define CONFIG_FASTAUDIO_DECODER 1 #define CONFIG_FFWAVESYNTH_DECODER 1 #define CONFIG_FLAC_DECODER 1 #define CONFIG_G723_1_DECODER 1 @@ -1262,6 +1267,7 @@ #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1 #define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1 #define CONFIG_ADPCM_IMA_ISS_DECODER 1 +#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 1 #define CONFIG_ADPCM_IMA_MTF_DECODER 1 #define CONFIG_ADPCM_IMA_OKI_DECODER 1 #define CONFIG_ADPCM_IMA_QT_DECODER 1 @@ -1371,6 +1377,7 @@ #define CONFIG_AVUI_ENCODER 1 #define CONFIG_AYUV_ENCODER 1 #define CONFIG_BMP_ENCODER 1 +#define CONFIG_CFHD_ENCODER 1 #define CONFIG_CINEPAK_ENCODER 1 #define CONFIG_CLJR_ENCODER 1 #define CONFIG_COMFORTNOISE_ENCODER 1 @@ -1415,6 +1422,7 @@ #define CONFIG_R210_ENCODER 1 #define CONFIG_RAWVIDEO_ENCODER 1 #define CONFIG_ROQ_ENCODER 1 +#define CONFIG_RPZA_ENCODER 1 #define CONFIG_RV10_ENCODER 1 #define CONFIG_RV20_ENCODER 1 #define CONFIG_S302M_ENCODER 1 @@ -1497,6 +1505,7 @@ #define CONFIG_PCM_VIDC_ENCODER 1 #define CONFIG_ROQ_DPCM_ENCODER 1 #define CONFIG_ADPCM_ADX_ENCODER 1 +#define CONFIG_ADPCM_ARGO_ENCODER 1 #define CONFIG_ADPCM_G722_ENCODER 1 #define CONFIG_ADPCM_G726_ENCODER 1 #define CONFIG_ADPCM_G726LE_ENCODER 1 @@ -2377,6 +2386,8 @@ #define CONFIG_MLV_DEMUXER 1 #define CONFIG_MM_DEMUXER 1 #define CONFIG_MMF_DEMUXER 1 +#define CONFIG_MODS_DEMUXER 1 +#define CONFIG_MOFLEX_DEMUXER 1 #define CONFIG_MOV_DEMUXER 1 #define CONFIG_MP3_DEMUXER 1 #define CONFIG_MPC_DEMUXER 1 @@ -2403,6 +2414,7 @@ #define CONFIG_NSV_DEMUXER 1 #define CONFIG_NUT_DEMUXER 1 #define CONFIG_NUV_DEMUXER 1 +#define CONFIG_OBU_DEMUXER 1 #define CONFIG_OGG_DEMUXER 1 #define CONFIG_OMA_DEMUXER 1 #define CONFIG_PAF_DEMUXER 1 @@ -2530,6 +2542,7 @@ #define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1 +#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1 @@ -2556,6 +2569,7 @@ #define CONFIG_APNG_MUXER 1 #define CONFIG_APTX_MUXER 1 #define CONFIG_APTX_HD_MUXER 1 +#define CONFIG_ARGO_ASF_MUXER 1 #define CONFIG_ASF_MUXER 1 #define CONFIG_ASS_MUXER 1 #define CONFIG_AST_MUXER 1 diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index ab20a5a1d8b3b..8b3e13cb13693 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -114,6 +114,7 @@ + @@ -192,6 +193,7 @@ + @@ -394,6 +396,7 @@ + @@ -436,7 +439,7 @@ - + @@ -463,6 +466,7 @@ + @@ -601,6 +605,7 @@ + @@ -664,6 +669,7 @@ + @@ -696,6 +702,7 @@ + @@ -864,11 +871,11 @@ + - @@ -1031,6 +1038,7 @@ + @@ -1143,6 +1151,9 @@ $(IntDir)\libavcodec_pngdsp.obj + + $(IntDir)\libavcodec_cfhddsp.obj + $(IntDir)\libavcodec_dcadsp.obj diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index f13c77b23ea2c..6d82bb1c4ad67 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -196,6 +196,9 @@ Source Files\libavcodec\x86 + + Source Files\libavcodec\x86 + Source Files\libavcodec\x86 @@ -426,6 +429,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1032,6 +1038,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1158,7 +1167,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -1239,6 +1248,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1653,6 +1665,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1842,6 +1857,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1938,6 +1956,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2442,6 +2463,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2454,9 +2478,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2943,6 +2964,9 @@ Source Files\libavcodec\x86 + + Source Files\libavcodec\x86 + Source Files\libavcodec\x86 @@ -3123,6 +3147,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c index ad22d2716b472..c736c7fed2a46 100644 --- a/SMP/libavcodec/codec_list.c +++ b/SMP/libavcodec/codec_list.c @@ -30,6 +30,7 @@ static const AVCodec *codec_list[] = { &ff_avui_encoder, &ff_ayuv_encoder, &ff_bmp_encoder, + &ff_cfhd_encoder, &ff_cinepak_encoder, &ff_cljr_encoder, &ff_comfortnoise_encoder, @@ -73,6 +74,7 @@ static const AVCodec *codec_list[] = { &ff_r210_encoder, &ff_rawvideo_encoder, &ff_roq_encoder, + &ff_rpza_encoder, &ff_rv10_encoder, &ff_rv20_encoder, &ff_s302m_encoder, @@ -155,6 +157,7 @@ static const AVCodec *codec_list[] = { &ff_pcm_vidc_encoder, &ff_roq_dpcm_encoder, &ff_adpcm_adx_encoder, + &ff_adpcm_argo_encoder, &ff_adpcm_g722_encoder, &ff_adpcm_g726_encoder, &ff_adpcm_g726le_encoder, @@ -318,6 +321,7 @@ static const AVCodec *codec_list[] = { &ff_mjpeg_decoder, &ff_mjpegb_decoder, &ff_mmvideo_decoder, + &ff_mobiclip_decoder, &ff_motionpixels_decoder, &ff_mpeg1video_decoder, &ff_mpeg2video_decoder, @@ -352,6 +356,7 @@ static const AVCodec *codec_list[] = { &ff_pgm_decoder, &ff_pgmyuv_decoder, &ff_pgx_decoder, + &ff_photocd_decoder, &ff_pictor_decoder, &ff_pixlet_decoder, &ff_png_decoder, @@ -488,6 +493,7 @@ static const AVCodec *codec_list[] = { &ff_dst_decoder, &ff_eac3_decoder, &ff_evrc_decoder, + &ff_fastaudio_decoder, &ff_ffwavesynth_decoder, &ff_flac_decoder, &ff_g723_1_decoder, @@ -617,6 +623,7 @@ static const AVCodec *codec_list[] = { &ff_adpcm_ima_ea_eacs_decoder, &ff_adpcm_ima_ea_sead_decoder, &ff_adpcm_ima_iss_decoder, + &ff_adpcm_ima_moflex_decoder, &ff_adpcm_ima_mtf_decoder, &ff_adpcm_ima_oki_decoder, &ff_adpcm_ima_qt_decoder, diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index dd53408457a7f..3550a22355ff5 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -416,6 +416,7 @@ + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index df2212ddd6fe8..4337cab9dd583 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -1101,6 +1101,9 @@ Source Files\libavfilter\dnn + + Source Files\libavfilter\dnn + Source Files\libavfilter\dnn diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index c8d57e5e3332a..222f2912e110f 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -315,6 +315,8 @@ + + diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index 4c078cb622bd0..e8ec9cd8692d3 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -796,6 +796,12 @@ Source Files\libavformat + + Source Files\libavformat + + + Source Files\libavformat + Source Files\libavformat diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c index efd0210fc942f..7672b655621ed 100644 --- a/SMP/libavformat/demuxer_list.c +++ b/SMP/libavformat/demuxer_list.c @@ -161,6 +161,8 @@ static const AVInputFormat *demuxer_list[] = { &ff_mlv_demuxer, &ff_mm_demuxer, &ff_mmf_demuxer, + &ff_mods_demuxer, + &ff_moflex_demuxer, &ff_mov_demuxer, &ff_mp3_demuxer, &ff_mpc_demuxer, @@ -187,6 +189,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_nsv_demuxer, &ff_nut_demuxer, &ff_nuv_demuxer, + &ff_obu_demuxer, &ff_ogg_demuxer, &ff_oma_demuxer, &ff_paf_demuxer, @@ -314,6 +317,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_image_pgmyuv_pipe_demuxer, &ff_image_pgm_pipe_demuxer, &ff_image_pgx_pipe_demuxer, + &ff_image_photocd_pipe_demuxer, &ff_image_pictor_pipe_demuxer, &ff_image_png_pipe_demuxer, &ff_image_ppm_pipe_demuxer, diff --git a/SMP/libavformat/muxer_list.c b/SMP/libavformat/muxer_list.c index 1aafc8f5c1489..37832092177a7 100644 --- a/SMP/libavformat/muxer_list.c +++ b/SMP/libavformat/muxer_list.c @@ -29,6 +29,7 @@ static const AVOutputFormat *muxer_list[] = { &ff_apng_muxer, &ff_aptx_muxer, &ff_aptx_hd_muxer, + &ff_argo_asf_muxer, &ff_asf_muxer, &ff_ass_muxer, &ff_ast_muxer,