project: Update for recent upstream merge.

ShiftMediaProject · Jul 5, 2020 · d4f0aa1 · d4f0aa1
1 parent ba89adc
commit d4f0aa1
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 12 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -454,7 +454,6 @@
 %define CONFIG_LIBLENSFUN 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
-%define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVO_AMRWBENC 0
 %define CONFIG_MBEDTLS 0
 %define CONFIG_RKMPP 0
@@ -493,6 +492,7 @@
 %define CONFIG_LIBOPENH264 0
 %define CONFIG_LIBOPENJPEG 0
 %define CONFIG_LIBOPENMPT 0
+%define CONFIG_LIBOPENVINO 0
 %define CONFIG_LIBOPUS 1
 %define CONFIG_LIBPULSE 0
 %define CONFIG_LIBRABBITMQ 0
@@ -511,6 +511,7 @@
 %define CONFIG_LIBTHEORA 1
 %define CONFIG_LIBTWOLAME 0
 %define CONFIG_LIBV4L2 0
+%define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVORBIS 1
 %define CONFIG_LIBVPX 1
 %define CONFIG_LIBWAVPACK 0
@@ -916,6 +917,7 @@
 %define CONFIG_PFM_DECODER 1
 %define CONFIG_PGM_DECODER 1
 %define CONFIG_PGMYUV_DECODER 1
+%define CONFIG_PGX_DECODER 1
 %define CONFIG_PICTOR_DECODER 1
 %define CONFIG_PIXLET_DECODER 1
 %define CONFIG_PNG_DECODER 1
@@ -1444,11 +1446,8 @@
 %define CONFIG_WEBVTT_ENCODER 1
 %define CONFIG_XSUB_ENCODER 1
 %define CONFIG_AAC_AT_ENCODER 0
-%define CONFIG_AAC_MF_ENCODER 1
-%define CONFIG_AC3_MF_ENCODER 1
 %define CONFIG_ALAC_AT_ENCODER 0
 %define CONFIG_ILBC_AT_ENCODER 0
-%define CONFIG_MP3_MF_ENCODER 1
 %define CONFIG_PCM_ALAW_AT_ENCODER 0
 %define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBAOM_AV1_ENCODER 0
@@ -1480,6 +1479,8 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXAVS2_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 1
+%define CONFIG_AAC_MF_ENCODER 1
+%define CONFIG_AC3_MF_ENCODER 1
 %define CONFIG_H263_V4L2M2M_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_AMF_ENCODER 1
@@ -1503,6 +1504,7 @@
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MJPEG_QSV_ENCODER 1
 %define CONFIG_MJPEG_VAAPI_ENCODER 0
+%define CONFIG_MP3_MF_ENCODER 1
 %define CONFIG_MPEG2_QSV_ENCODER 1
 %define CONFIG_MPEG2_VAAPI_ENCODER 0
 %define CONFIG_MPEG4_OMX_ENCODER 0
@@ -1634,6 +1636,7 @@
 %define CONFIG_LIBCDIO_INDEV 1
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_ALSA_OUTDEV 0
+%define CONFIG_AUDIOTOOLBOX_OUTDEV 0
 %define CONFIG_CACA_OUTDEV 0
 %define CONFIG_DECKLINK_OUTDEV 0
 %define CONFIG_FBDEV_OUTDEV 0
@@ -2238,6 +2241,7 @@
 %define CONFIG_LVF_DEMUXER 1
 %define CONFIG_LXF_DEMUXER 1
 %define CONFIG_M4V_DEMUXER 1
+%define CONFIG_MCC_DEMUXER 1
 %define CONFIG_MATROSKA_DEMUXER 1
 %define CONFIG_MGSTS_DEMUXER 1
 %define CONFIG_MICRODVD_DEMUXER 1
@@ -2399,6 +2403,7 @@
 %define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -512,7 +512,6 @@
 #define CONFIG_LIBLENSFUN 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
-#define CONFIG_LIBVMAF 0
 #define CONFIG_LIBVO_AMRWBENC 0
 #define CONFIG_MBEDTLS 0
 #define CONFIG_RKMPP 0
@@ -551,6 +550,7 @@
 #define CONFIG_LIBOPENH264 0
 #define CONFIG_LIBOPENJPEG 0
 #define CONFIG_LIBOPENMPT 0
+#define CONFIG_LIBOPENVINO 0
 #define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
 #define CONFIG_LIBRABBITMQ 0
@@ -569,6 +569,7 @@
 #define CONFIG_LIBTHEORA 1
 #define CONFIG_LIBTWOLAME 0
 #define CONFIG_LIBV4L2 0
+#define CONFIG_LIBVMAF 0
 #define CONFIG_LIBVORBIS 1
 #define CONFIG_LIBVPX 1
 #define CONFIG_LIBWAVPACK 0
@@ -986,6 +987,7 @@
 #define CONFIG_PFM_DECODER 1
 #define CONFIG_PGM_DECODER 1
 #define CONFIG_PGMYUV_DECODER 1
+#define CONFIG_PGX_DECODER 1
 #define CONFIG_PICTOR_DECODER 1
 #define CONFIG_PIXLET_DECODER 1
 #define CONFIG_PNG_DECODER 1
@@ -1514,11 +1516,8 @@
 #define CONFIG_WEBVTT_ENCODER 1
 #define CONFIG_XSUB_ENCODER 1
 #define CONFIG_AAC_AT_ENCODER 0
-#define CONFIG_AAC_MF_ENCODER 1
-#define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_ALAC_AT_ENCODER 0
 #define CONFIG_ILBC_AT_ENCODER 0
-#define CONFIG_MP3_MF_ENCODER 1
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBAOM_AV1_ENCODER 0
@@ -1550,6 +1549,8 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXAVS2_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 1
+#define CONFIG_AAC_MF_ENCODER 1
+#define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_H263_V4L2M2M_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_AMF_ENCODER 1
@@ -1573,6 +1574,7 @@
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MJPEG_QSV_ENCODER 1
 #define CONFIG_MJPEG_VAAPI_ENCODER 0
+#define CONFIG_MP3_MF_ENCODER 1
 #define CONFIG_MPEG2_QSV_ENCODER 1
 #define CONFIG_MPEG2_VAAPI_ENCODER 0
 #define CONFIG_MPEG4_OMX_ENCODER 0
@@ -1756,6 +1758,7 @@
 #define CONFIG_LIBCDIO_INDEV 1
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
 #define CONFIG_CACA_OUTDEV 0
 #define CONFIG_DECKLINK_OUTDEV 0
 #define CONFIG_FBDEV_OUTDEV 0
@@ -2360,6 +2363,7 @@
 #define CONFIG_LVF_DEMUXER 1
 #define CONFIG_LXF_DEMUXER 1
 #define CONFIG_M4V_DEMUXER 1
+#define CONFIG_MCC_DEMUXER 1
 #define CONFIG_MATROSKA_DEMUXER 1
 #define CONFIG_MGSTS_DEMUXER 1
 #define CONFIG_MICRODVD_DEMUXER 1
@@ -2521,6 +2525,7 @@
 #define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -663,6 +663,7 @@
     <ClCompile Include="..\libavcodec\pcx.c" />
     <ClCompile Include="..\libavcodec\pcxenc.c" />
     <ClCompile Include="..\libavcodec\pgssubdec.c" />
+    <ClCompile Include="..\libavcodec\pgxdec.c" />
     <ClCompile Include="..\libavcodec\pictordec.c" />
     <ClCompile Include="..\libavcodec\pixlet.c" />
     <ClCompile Include="..\libavcodec\textdec.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -1839,6 +1839,9 @@
     <ClCompile Include="..\libavcodec\pgssubdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\pgxdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\pictordec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -174,9 +174,6 @@ static const AVCodec *codec_list[] = {
     &ff_text_encoder,
     &ff_webvtt_encoder,
     &ff_xsub_encoder,
-    &ff_aac_mf_encoder,
-    &ff_ac3_mf_encoder,
-    &ff_mp3_mf_encoder,
     &ff_libilbc_encoder,
     &ff_libmp3lame_encoder,
     &ff_libopus_encoder,
@@ -189,6 +186,8 @@ static const AVCodec *codec_list[] = {
     &ff_libx264rgb_encoder,
     &ff_libx265_encoder,
     &ff_libxvid_encoder,
+    &ff_aac_mf_encoder,
+    &ff_ac3_mf_encoder,
     &ff_h264_amf_encoder,
     &ff_h264_mf_encoder,
     &ff_h264_nvenc_encoder,
@@ -201,6 +200,7 @@ static const AVCodec *codec_list[] = {
     &ff_hevc_nvenc_encoder,
     &ff_hevc_qsv_encoder,
     &ff_mjpeg_qsv_encoder,
+    &ff_mp3_mf_encoder,
     &ff_mpeg2_qsv_encoder,
     &ff_vp9_qsv_encoder,
     &ff_aasc_decoder,
@@ -350,6 +350,7 @@ static const AVCodec *codec_list[] = {
     &ff_pfm_decoder,
     &ff_pgm_decoder,
     &ff_pgmyuv_decoder,
+    &ff_pgx_decoder,
     &ff_pictor_decoder,
     &ff_pixlet_decoder,
     &ff_png_decoder,

diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
@@ -306,6 +306,7 @@
     <ClCompile Include="..\libavformat\av1.c" />
     <ClCompile Include="..\libavformat\hevc.c" />
     <ClCompile Include="..\libavformat\wv.c" />
+    <ClCompile Include="..\libavformat\mccdec.c" />
     <ClCompile Include="..\libavformat\mgsts.c" />
     <ClCompile Include="..\libavformat\microdvddec.c" />
     <ClCompile Include="..\libavformat\microdvdenc.c" />

diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
@@ -769,6 +769,9 @@
     <ClCompile Include="..\libavformat\wv.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\mccdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\mgsts.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c
@@ -151,6 +151,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_lvf_demuxer,
     &ff_lxf_demuxer,
     &ff_m4v_demuxer,
+    &ff_mcc_demuxer,
     &ff_matroska_demuxer,
     &ff_mgsts_demuxer,
     &ff_microdvd_demuxer,
@@ -312,6 +313,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_image_pcx_pipe_demuxer,
     &ff_image_pgmyuv_pipe_demuxer,
     &ff_image_pgm_pipe_demuxer,
+    &ff_image_pgx_pipe_demuxer,
     &ff_image_pictor_pipe_demuxer,
     &ff_image_png_pipe_demuxer,
     &ff_image_ppm_pipe_demuxer,

diff --git a/SMP/libavutil.def b/SMP/libavutil.def
@@ -336,6 +336,7 @@ EXPORTS
     av_murmur3_init_seeded
     av_murmur3_update
     av_nearer_q
+    av_opt_child_class_iterate
     av_opt_child_class_next
     av_opt_child_next
     av_opt_copy
@@ -480,6 +481,7 @@ EXPORTS
     av_thread_message_queue_set_free_func
     av_timecode_adjust_ntsc_framenum2
     av_timecode_check_frame_rate
+    av_timecode_get_smpte
     av_timecode_get_smpte_from_framenum
     av_timecode_init
     av_timecode_init_from_string

diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h
@@ -21,5 +21,5 @@
 
 #ifndef SMP_LIBAVUTIL_FFVERSION_H
 #define SMP_LIBAVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "4.2.git"
+#define FFMPEG_VERSION "4.3.git"
 #endif /* SMP_LIBAVUTIL_FFVERSION_H */