Re: [PATCH] Build with current FFmpeg Git head
Nicolas George <[email protected]> Tue, 28 Jul 2026 20:23:39 +0200
| Newsgroups | gmane.comp.video.mplayer.devel |
|---|---|
| Message-ID | <[email protected]> |
--+Qi7XLuRilZ0+fU6
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Nicolas George (HE12026-07-28):
> I also needed to patch the Makefiles in ffmpeg for missing dependencies.
> Some (most? all?) of the missing dependencies are expressed in ffmpeg's
> configure as whatever_select="…", we probably should hack configure to
> use them. I will send the diff in reply to this mail.
Here it is.
Regards,
--
Nicolas George
--+Qi7XLuRilZ0+fU6
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="ffmpeg_for_mplayer_20260728.diff"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 232fdd7..4537dec 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -117,9 +117,9 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \
h2645data.o h2645_parse.o h2645_vui.o
OBJS-$(CONFIG_H264PRED) += h264pred.o
OBJS-$(CONFIG_H264QPEL) += h264qpel.o
-OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o
+OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_HEVCPARSE) += h2645data.o h2645_parse.o h2645_vui.o
-OBJS-$(CONFIG_HEVC_SEI) += h2645_sei.o
+OBJS-$(CONFIG_HEVC_SEI) += h2645_sei.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_HPELDSP) += hpeldsp.o
OBJS-$(CONFIG_HUFFMAN) += huffman.o
OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
@@ -158,7 +158,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o rl.o \
to_upper4.o
OBJS-$(CONFIG_MPEGVIDEODEC) += mpegvideo_dec.o mpegutils.o
OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
- motion_est.o ratecontrol.o
+ motion_est.o ratecontrol.o mpegvideoencdsp.o
OBJS-$(CONFIG_MPEGVIDEOENCDSP) += mpegvideoencdsp.o
OBJS-$(CONFIG_MSMPEG4DEC) += msmpeg4dec.o msmpeg4.o msmpeg4data.o \
msmpeg4_vc1_data.o mpeg4videodec.o
@@ -197,13 +197,11 @@ OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o
OBJS-$(CONFIG_AAC_DECODER) += aactab.o \
aacsbr.o aacps_common.o aacps_float.o \
kbdwin.o \
- sbrdsp.o aacpsdsp_float.o cbrt_data.o \
- $(if $(!CONFIG_HARDCODED_TABLES), cbrt_tablegen_common.o)
+ sbrdsp.o aacpsdsp_float.o cbrt_data.o cbrt_tablegen_common.o
OBJS-$(CONFIG_AAC_FIXED_DECODER) += aactab.o \
aacsbr_fixed.o aacps_common.o aacps_fixed.o \
kbdwin.o \
- sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o \
- $(if $(!CONFIG_HARDCODED_TABLES), cbrt_tablegen_common.o)
+ sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o cbrt_tablegen_common.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \
aacpsy.o aactab.o aacencdsp.o \
aacenc_is.o \
@@ -233,11 +231,13 @@ OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mlz.o
OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \
acelp_filters.o \
acelp_vectors.o \
- acelp_pitch_delay.o
+ acelp_pitch_delay.o \
+ celp_math.o
OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
acelp_filters.o \
acelp_vectors.o \
- acelp_pitch_delay.o
+ acelp_pitch_delay.o \
+ celp_math.o
OBJS-$(CONFIG_AMRNB_MEDIACODEC_DECODER) += mediacodecdec.o
OBJS-$(CONFIG_AMRWB_MEDIACODEC_DECODER) += mediacodecdec.o
OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpegenc_common.o
@@ -275,7 +275,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER) += atrac3plusdec.o atrac3plus.o \
OBJS-$(CONFIG_ATRAC9_DECODER) += atrac9dec.o
OBJS-$(CONFIG_AURA_DECODER) += cyuv.o
OBJS-$(CONFIG_AURA2_DECODER) += aura.o
-OBJS-$(CONFIG_AV1_DECODER) += av1dec.o av1_parse.o
+OBJS-$(CONFIG_AV1_DECODER) += av1dec.o av1_parse.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_AV1_CUVID_DECODER) += cuviddec.o
OBJS-$(CONFIG_AV1_D3D12VA_ENCODER) += d3d12va_encode_av1.o av1_levels.o
OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER) += mediacodecdec.o
@@ -337,12 +337,12 @@ OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dcadata.o dcahuff.o \
OBJS-$(CONFIG_DDS_DECODER) += dds.o
OBJS-$(CONFIG_DERF_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o diractab.o \
- dirac_arith.o dirac_dwt.o dirac_vlc.o
+ dirac_arith.o dirac_dwt.o dirac_vlc.o mpegvideoencdsp.o x86/mpegvideoencdsp_init.o x86/mpegvideoenc.o x86/mpegvideoencdsp.o
OBJS-$(CONFIG_DFA_DECODER) += dfa.o
OBJS-$(CONFIG_DFPWM_DECODER) += dfpwmdec.o
OBJS-$(CONFIG_DFPWM_ENCODER) += dfpwmenc.o
OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o
-OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o
+OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o mpegvideoencdsp.o x86/mpegvideoencdsp_init.o x86/mpegvideoenc.o x86/mpegvideoencdsp.o
OBJS-$(CONFIG_DOLBY_E_DECODER) += dolby_e.o dolby_e_parse.o kbdwin.o
OBJS-$(CONFIG_DPX_DECODER) += dpx.o
OBJS-$(CONFIG_DPX_ENCODER) += dpxenc.o
@@ -723,7 +723,7 @@ OBJS-$(CONFIG_SMC_ENCODER) += smcenc.o
OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o snow_dwt.o
OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o snow_dwt.o \
h263data.o ituh263enc.o \
- motion_est.o ratecontrol.o
+ motion_est.o ratecontrol.o mpegvideoencdsp.o x86/mpegvideoencdsp_init.o x86/mpegvideoenc.o x86/mpegvideoencdsp.o
OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_SPEEDHQ_DECODER) += speedhqdec.o speedhq.o mpeg12.o \
mpeg12data.o
@@ -744,7 +744,7 @@ OBJS-$(CONFIG_SBC_DECODER) += sbcdec.o sbc.o
OBJS-$(CONFIG_SBC_ENCODER) += sbcenc.o sbc.o sbcdsp.o
OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263data.o
OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o h263data.o \
- h263.o ituh263enc.o motion_est.o
+ h263.o ituh263enc.o motion_est.o mpegvideoencdsp.o x86/mpegvideoencdsp_init.o x86/mpegvideoenc.o x86/mpegvideoencdsp.o
OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o mpegutils.o h264data.o
OBJS-$(CONFIG_TEXT_DECODER) += textdec.o ass.o
OBJS-$(CONFIG_TEXT_ENCODER) += srtenc.o ass_split.o
@@ -835,7 +835,7 @@ OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_VQC_DECODER) += vqcdec.o
OBJS-$(CONFIG_VVC_DECODER) += executor.o h2645data.o
-OBJS-$(CONFIG_VVC_SEI) += h2645_sei.o h274.o
+OBJS-$(CONFIG_VVC_SEI) += h2645_sei.o h274.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o
@@ -1177,13 +1177,13 @@ OBJS-$(CONFIG_ALAC_AT_ENCODER) += audiotoolboxenc.o
OBJS-$(CONFIG_ILBC_AT_ENCODER) += audiotoolboxenc.o
OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER) += audiotoolboxenc.o
OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER) += audiotoolboxenc.o
-OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o libaom.o
+OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o libaom.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o libaom.o
OBJS-$(CONFIG_LIBARIBB24_DECODER) += libaribb24.o ass.o
OBJS-$(CONFIG_LIBARIBCAPTION_DECODER) += libaribcaption.o ass.o
OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o
OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o
-OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o
+OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o itut35.o dynamic_hdr_vivid.o
OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o
OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o
diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile
index abbd4be..6d34a53 100644
--- a/libavcodec/bsf/Makefile
+++ b/libavcodec/bsf/Makefile
@@ -17,7 +17,7 @@ OBJS-$(CONFIG_DTS2PTS_BSF) += bsf/dts2pts.o
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += bsf/dump_extradata.o
OBJS-$(CONFIG_DV_ERROR_MARKER_BSF) += bsf/dv_error_marker.o
OBJS-$(CONFIG_EAC3_CORE_BSF) += bsf/eac3_core.o
-OBJS-$(CONFIG_EIA608_TO_SMPTE436M_BSF) += bsf/eia608_to_smpte436m.o
+OBJS-$(CONFIG_EIA608_TO_SMPTE436M_BSF) += bsf/eia608_to_smpte436m.o smpte_436m.o
OBJS-$(CONFIG_EVC_FRAME_MERGE_BSF) += bsf/evc_frame_merge.o
OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += bsf/extract_extradata.o
OBJS-$(CONFIG_FILTER_UNITS_BSF) += bsf/filter_units.o
diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile
index 87d6393..0a73fd9 100644
--- a/libavcodec/hevc/Makefile
+++ b/libavcodec/hevc/Makefile
@@ -10,6 +10,7 @@ OBJS-$(CONFIG_HEVC_DECODER) += \
hevc/mvs.o \
hevc/pred.o \
hevc/refs.o \
+ aom_film_grain.o
OBJS-$(CONFIG_HEVC_PARSER) += \
hevc/parser.o \
diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile
index 10125ff..c251885 100644
--- a/libavcodec/vvc/Makefile
+++ b/libavcodec/vvc/Makefile
@@ -16,3 +16,4 @@ OBJS-$(CONFIG_VVC_DECODER) += vvc/dec.o \
vvc/refs.o \
vvc/sei.o \
vvc/thread.o \
+ aom_film_grain.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4508422..39533a5 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -394,7 +394,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \
OBJS-$(CONFIG_MOV_MUXER) += movenc.o \
movenchint.o mov_chan.o rtp.o \
movenccenc.o movenc_ttml.o rawutils.o \
- apv.o dovi_isom.o evc.o
+ apv.o dovi_isom.o evc.o cbs.o
OBJS-$(CONFIG_MP2_MUXER) += rawenc.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o
OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o
--+Qi7XLuRilZ0+fU6
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
MPlayer-dev-eng mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo/%(_internal_name)s
--+Qi7XLuRilZ0+fU6--