[FFmpeg-cvslog] avcodec/Makefile: Skip ffv1_vulkan.h in checkheaders
ffmpeg | branch: master | Andreas Rheinhardt | Tue Mar 18 16:23:39 2025 +0100| [c0b7f817a4c72eb3e501f94f403b3031114e8d98] | committer: Andreas Rheinhardt avcodec/Makefile: Skip ffv1_vulkan.h in checkheaders unless vulkan is actually enabled. Reviewed-by: Lynne Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0b7f817a4c72eb3e501f94f403b3031114e8d98 --- libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f800f08a63..37b201ec4a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1310,7 +1310,8 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h SKIPHEADERS-$(CONFIG_VAAPI)+= vaapi_decode.h vaapi_hevc.h vaapi_encode.h SKIPHEADERS-$(CONFIG_VDPAU)+= vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan_video.h vulkan_encode.h vulkan_decode.h +SKIPHEADERS-$(CONFIG_VULKAN) += ffv1_vulkan.h vulkan_video.h \ + vulkan_encode.h vulkan_decode.h SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] ffbuild: use response files only if ar accepts them
ffmpeg | branch: master | Gyan Doshi | Mon Mar 17 20:57:28 2025 +0530| [740d4009656abeb006e2d43001b59d875c1a7a6a] | committer: Gyan Doshi ffbuild: use response files only if ar accepts them > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=740d4009656abeb006e2d43001b59d875c1a7a6a --- configure | 7 +++ ffbuild/library.mak | 8 2 files changed, 15 insertions(+) diff --git a/configure b/configure index f6964c4ee1..d84e32196d 100755 --- a/configure +++ b/configure @@ -5230,6 +5230,12 @@ else ar_o='$@' fi +if $ar 2>&1 | grep -qi "@.*file"; then +ar_objs="true" +else +ar_objs="" +fi + add_cflags $extra_cflags add_cxxflags $extra_cxxflags add_objcflags $extra_objcflags @@ -8133,6 +8139,7 @@ DEPX86ASM=$x86asmexe DEPX86ASMFLAGS=\$(X86ASMFLAGS) AR=$ar ARFLAGS=$arflags +AR_OBJS=$ar_objs AR_O=$ar_o AR_CMD=$ar NM_CMD=$nm diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 72e3872157..7e1871b74c 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -35,8 +35,12 @@ OBJS += $(SHLIBOBJS) endif $(SUBDIR)$(LIBNAME): $(OBJS) $(STLIBOBJS) $(RM) $@ +ifeq ($(AR_OBJS),true) $(Q)echo $^ > $@.objs $(AR) $(ARFLAGS) $(AR_O) @$@.objs +else + $(AR) $(ARFLAGS) $(AR_O) $^ +endif $(RANLIB) $@ -$(RM) $@.objs @@ -68,8 +72,12 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) +ifeq ($(AR_OBJS),true) $(Q)echo $$(filter %.o,$$^) > $$@.objs $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) @$$@.objs $(FFEXTRALIBS) +else + $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) +endif $(SLIB_EXTRA_CMD) -$(RM) $$@.objs ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/vvc/Makefile: Move VVC decoder->h2645data dep to lavc/Makefile
ffmpeg | branch: master | Andreas Rheinhardt | Tue Mar 18 08:25:14 2025 +0100| [6bd4e8bf76c791c494b58b4edd00702f80ab9124] | committer: Andreas Rheinhardt avcodec/vvc/Makefile: Move VVC decoder->h2645data dep to lavc/Makefile If h2645data.c were changed in a way that makes it rely on another object file, all components that need h2645data.o would need to be updated. And given that the VVC decoder->h2645data.o dependency is currently hidden in a separate Makefile, it would likely be forgotten. So move it to the libavcodec/Makefile. Reviewed-by: Nuo Mi Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bd4e8bf76c791c494b58b4edd00702f80ab9124 --- libavcodec/Makefile | 1 + libavcodec/vvc/Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index abe8b3ffda..20b3a93a69 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -809,6 +809,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o 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) += h2645data.o OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile index d1d78933d1..6a28d32bc2 100644 --- a/libavcodec/vvc/Makefile +++ b/libavcodec/vvc/Makefile @@ -15,4 +15,3 @@ OBJS-$(CONFIG_VVC_DECODER) += vvc/dec.o \ vvc/ps.o\ vvc/refs.o \ vvc/thread.o\ -h2645data.o \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/Makefile: Only compile executor when VVC decoder is enabled
ffmpeg | branch: master | Andreas Rheinhardt | Tue Mar 18 08:38:36 2025 +0100| [81c50c33b6f582a268dddedfb0664c9be119a36a] | committer: Andreas Rheinhardt avcodec/Makefile: Only compile executor when VVC decoder is enabled Reviewed-by: Nuo Mi Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81c50c33b6f582a268dddedfb0664c9be119a36a --- libavcodec/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 20b3a93a69..5284c561a6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -43,7 +43,6 @@ OBJS = ac3_parser.o \ dirac.o \ dv_profile.o \ encode.o \ - executor.o \ get_buffer.o \ imgconvert.o \ jni.o\ @@ -809,7 +808,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o 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) += h2645data.o +OBJS-$(CONFIG_VVC_DECODER) += executor.o h2645data.o OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avutil: only duplicate hal2float and float2half in shared builds
ffmpeg | branch: master | James Almer | Sun Mar 16 23:26:53 2025 -0300| [bf22c4cc3e005c01f50e233b1582fd1d8051aed9] | committer: James Almer avutil: only duplicate hal2float and float2half in shared builds Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf22c4cc3e005c01f50e233b1582fd1d8051aed9 --- libavcodec/Makefile | 13 + libavutil/Makefile | 2 ++ libswscale/Makefile | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5284c561a6..f800f08a63 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -365,8 +365,8 @@ OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER)+= 8svx.o OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_EVRC_DECODER)+= evrcdec.o acelp_vectors.o lsp.o -OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o float2half.o half2float.o -OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o float2half.o +OBJS-$(CONFIG_EXR_DECODER) += exr.o exrdsp.o +OBJS-$(CONFIG_EXR_ENCODER) += exrenc.o OBJS-$(CONFIG_FASTAUDIO_DECODER) += fastaudio.o OBJS-$(CONFIG_FFV1_DECODER)+= ffv1dec.o ffv1_parse.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER)+= ffv1enc.o ffv1_parse.o ffv1.o @@ -612,8 +612,8 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o -OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o half2float.o -OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o float2half.o +OBJS-$(CONFIG_PHM_DECODER) += pnmdec.o pnm.o +OBJS-$(CONFIG_PHM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PHOTOCD_DECODER) += photocd.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o @@ -1076,6 +1076,11 @@ OBJS-$(CONFIG_VVC_VAAPI_HWACCEL) += vaapi_vvc.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o reverse.o +SHLIBOBJS-$(CONFIG_EXR_DECODER)+= half2float.o float2half.o +SHLIBOBJS-$(CONFIG_EXR_ENCODER)+= float2half.o +SHLIBOBJS-$(CONFIG_PHM_DECODER)+= half2float.o +SHLIBOBJS-$(CONFIG_PHM_ENCODER)+= float2half.o + # General libavformat dependencies OBJS-$(CONFIG_FITS_DEMUXER)+= fits.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o diff --git a/libavutil/Makefile b/libavutil/Makefile index b7ed339ab3..b03c50444f 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -139,9 +139,11 @@ OBJS = adler32.o \ file.o \ file_open.o \ float_dsp.o \ + float2half.o \ film_grain_params.o \ fixed_dsp.o \ frame.o \ + half2float.o \ hash.o \ hdr_dynamic_metadata.o \ hdr_dynamic_vivid_metadata.o \ diff --git a/libswscale/Makefile b/libswscale/Makefile index 4cf4bb2602..d5e10d17dc 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -13,7 +13,6 @@ OBJS = alphablend.o \ format.o \ gamma.o \ graph.o \ - half2float.o \ input.o \ lut3d.o \ options.o\ @@ -28,7 +27,7 @@ OBJS = alphablend.o \ vscale.o \ # Objects duplicated from other libraries for shared builds -SHLIBOBJS+= log2_tab.o +SHLIBOBJS+= log2_tab.o half2float.o # Windows resource file SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
