From patchwork Sun Mar 25 15:39:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 8156 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2613424jad; Sun, 25 Mar 2018 08:39:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELv8r/f86odDX0QRzz7+5c6FgwZSJrNoeWO+RPooQgpep+nsReiPMGYUesrRFX5/ioSbHcVN X-Received: by 10.28.237.19 with SMTP id l19mr2607497wmh.0.1521992366172; Sun, 25 Mar 2018 08:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521992366; cv=none; d=google.com; s=arc-20160816; b=rVCjCT18bZO4F/HeMAdp8iBUeSOxXeatKyzG8pBsX0wzQtvpTe2XmbQQwTCH2SGIvo 835AIQ2F1Rfp5wLC5oVDUYSlH1gfIv/HmkDL+dd8CD35Klvw/QQxXccAg1MVsCSPuoSZ fCqSDgIZVAsUS4IEMkpXB/XB5jNvDwTvPxZ37FSSD0nw0FLHNSDPCLu4CyCUrKdvL/7p T9hhNziXE1/yqrleYDzvSehrG+6cSgO97GPN7Q6Da0Qeg8fMNE5gLFnOKg1YV/oMFFdI XC3ObpOUmJTp9u65qKDtQO1FPFs5s6gI0XalAUdF52S5GXR5Xyr7JHBeMFXf+JjLawJJ 9WaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to:arc-authentication-results; bh=MhNhQy8DenLVdID7sWrr7rEkDL6uqTHxpaUuBGU++2k=; b=NOWjecCm4ez35sCTqjuA+ed8x1V4po3bh9CUAcDkSk4H2oDv3bcrnZ1fm1EqufgbOs A3u29g379ROGL3tIBTZoRdInoxm50hh+8auEAR5ax5OGif6htsq5mPCM72fJHLae+GNP DHjtFpyBEdQqOS/N6XCLKAy9zRFMJsxhOpfoXU9Kj1x/uJLnA+nm7GRiPrQyn9SbRgeu 8u9R2SYNsgNzhSFBPMb3NDNElzliVhK9Ahrtas4h2rgpb7CdPbPuYJC72v4dzhX/W88/ xaty2I4hGbW9EmQRphOIM3KZdf+/r8JDCPZZdhE32S2ASdgP2cydjPzdDOKID1QU1kCr VQwg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y143si8727651wme.128.2018.03.25.08.39.25; Sun, 25 Mar 2018 08:39:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C181968999A; Sun, 25 Mar 2018 18:39:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B395689957 for ; Sun, 25 Mar 2018 18:39:01 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 Received: from phare.normalesup.org (archicubes.ens.fr [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id w2PFdHww094880 for ; Sun, 25 Mar 2018 17:39:18 +0200 (CEST) Received: by phare.normalesup.org (Postfix, from userid 1001) id CAA56E00CF; Sun, 25 Mar 2018 17:39:17 +0200 (CEST) Date: Sun, 25 Mar 2018 17:39:17 +0200 From: Nicolas George To: FFmpeg development discussions and patches Message-ID: <20180325153917.GA1788052@phare.normalesup.org> References: <20180325150032.GO32664@michaelspb> <20180325170733.4024a025@debian> <20180325153451.GQ32664@michaelspb> MIME-Version: 1.0 In-Reply-To: <20180325153451.GQ32664@michaelspb> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Sun, 25 Mar 2018 17:39:18 +0200 (CEST) Subject: Re: [FFmpeg-devel] [RFC] avpriv cleanup X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Michael Niedermayer (2018-03-25): > The thread is for finding out peoples oppinon before anyone spends time > writing patches. If you have time to spend on the avpriv issue, I suggest you spend it trying to get this working. It would be most beneficial. Regards, From fcf7b622135a845e66bfa164447adb5fecacb1f6 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Mon, 31 Jul 2017 16:41:08 +0200 Subject: [PATCH] all: merge all libraries. Signed-off-by: Nicolas George --- Makefile | 6 +++- configure | 2 +- ffbuild/common.mak | 13 ++++--- ffbuild/library.mak | 63 +--------------------------------- libavcodec/Makefile | 1 - libavcodec/log2_tab.c | 1 - libavcodec/reverse.c | 1 - libavdevice/Makefile | 1 - libavdevice/reverse.c | 1 - libavfilter/Makefile | 2 -- libavfilter/log2_tab.c | 1 - libavformat/Makefile | 1 - libavformat/golomb_tab.c | 1 - libavformat/log2_tab.c | 1 - libffmpeg/Makefile | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ libffmpeg/libffmpeg.v | 23 +++++++++++++ libswresample/Makefile | 1 - libswresample/log2_tab.c | 1 - libswscale/Makefile | 2 -- libswscale/log2_tab.c | 1 - 20 files changed, 126 insertions(+), 85 deletions(-) delete mode 100644 libavcodec/log2_tab.c delete mode 100644 libavcodec/reverse.c delete mode 100644 libavdevice/reverse.c delete mode 100644 libavfilter/log2_tab.c delete mode 100644 libavformat/golomb_tab.c delete mode 100644 libavformat/log2_tab.c create mode 100644 libffmpeg/Makefile create mode 100644 libffmpeg/libffmpeg.v delete mode 100644 libswresample/log2_tab.c delete mode 100644 libswscale/log2_tab.c diff --git a/Makefile b/Makefile index 29870d7710..4aaa966f4a 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,10 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) +SUBDIR := libffmpeg/ +include $(SRC_PATH)/$(SUBDIR)Makefile +SUBDIR := diediedie + include $(SRC_PATH)/doc/Makefile define DOPROG @@ -208,7 +212,7 @@ check: all alltools examples testprogs fate include $(SRC_PATH)/tests/Makefile -$(sort $(OBJDIRS)): +$(sort $(OBJDIRS)) libffmpeg/: $(Q)mkdir -p $@ # Dummy rule to stop make trying to rebuild removed or renamed headers diff --git a/configure b/configure index 66c7b948e4..e3d18ff226 100755 --- a/configure +++ b/configure @@ -6226,7 +6226,7 @@ EOF # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample +check_ldflags -Wl,-rpath-link=libffmpeg enabled rpath && add_ldexeflags -Wl,-rpath,$libdir enabled rpath && add_ldlibflags -Wl,-rpath,$libdir test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic diff --git a/ffbuild/common.mak b/ffbuild/common.mak index e168fb2cfd..7499db0865 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -41,7 +41,7 @@ X86ASMFLAGS += $(IFLAGS:%=%/) -I$( $$@ - -$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR) - $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" - -$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) - $$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@ - -$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) - $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) - -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver - $(SLIB_CREATE_DEF_CMD) - $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) - $(SLIB_EXTRA_CMD) - -ifdef SUBDIR -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) -endif - clean:: $(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%) @@ -62,36 +27,10 @@ distclean:: clean $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \ $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%) -install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) - $(Q)mkdir -p "$(SHLIBDIR)" - $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" - $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" - $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));) - $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)") - $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)") - $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)") - -install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) - $(Q)mkdir -p "$(LIBDIR)" - $$(INSTALL) -m 644 $$< "$(LIBDIR)" - $(LIB_INSTALL_EXTRA_CMD) - install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS)) $(Q)mkdir -p "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc - $(Q)mkdir -p "$(PKGCONFIGDIR)" - $$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)" - -uninstall-libs:: - -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ - "$(SHLIBDIR)/$(SLIBNAME)" \ - "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" - -$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%") - -$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%") - -$(RM) "$(LIBDIR)/$(LIBNAME)" - uninstall-headers:: $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 74de41ab0f..a9065d6da4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -124,7 +124,6 @@ OBJS-$(CONFIG_QSVENC) += qsvenc.o OBJS-$(CONFIG_RANGECODER) += rangecoder.o OBJS-$(CONFIG_RDFT) += rdft.o OBJS-$(CONFIG_RV34DSP) += rv34dsp.o -OBJS-$(CONFIG_SHARED) += log2_tab.o reverse.o OBJS-$(CONFIG_SINEWIN) += sinewin.o sinewin_fixed.o OBJS-$(CONFIG_SNAPPY) += snappy.o OBJS-$(CONFIG_STARTCODE) += startcode.o diff --git a/libavcodec/log2_tab.c b/libavcodec/log2_tab.c deleted file mode 100644 index 47a1df03b7..0000000000 --- a/libavcodec/log2_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/log2_tab.c" diff --git a/libavcodec/reverse.c b/libavcodec/reverse.c deleted file mode 100644 index 440badaf34..0000000000 --- a/libavcodec/reverse.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/reverse.c" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 1d4e9e69fe..c055d6718d 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -9,7 +9,6 @@ OBJS = alldevices.o \ utils.o \ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o -OBJS-$(CONFIG_SHARED) += reverse.o # input/output devices OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o timefilter.o diff --git a/libavdevice/reverse.c b/libavdevice/reverse.c deleted file mode 100644 index 440badaf34..0000000000 --- a/libavdevice/reverse.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/reverse.c" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 4d61d7835e..a581125966 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -378,8 +378,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h -OBJS-$(CONFIG_SHARED) += log2_tab.o - TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats integral diff --git a/libavfilter/log2_tab.c b/libavfilter/log2_tab.c deleted file mode 100644 index 47a1df03b7..0000000000 --- a/libavfilter/log2_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/log2_tab.c" diff --git a/libavformat/Makefile b/libavformat/Makefile index b0ef82cdd4..977ee8ff3f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -61,7 +61,6 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_vp9.o \ rtpdec_xiph.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o -OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o OBJS-$(CONFIG_SRTP) += srtp.o # muxers/demuxers diff --git a/libavformat/golomb_tab.c b/libavformat/golomb_tab.c deleted file mode 100644 index 063fae3647..0000000000 --- a/libavformat/golomb_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavcodec/golomb.c" diff --git a/libavformat/log2_tab.c b/libavformat/log2_tab.c deleted file mode 100644 index 47a1df03b7..0000000000 --- a/libavformat/log2_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/log2_tab.c" diff --git a/libffmpeg/Makefile b/libffmpeg/Makefile new file mode 100644 index 0000000000..2b28e67bab --- /dev/null +++ b/libffmpeg/Makefile @@ -0,0 +1,88 @@ +NAME = ffmpeg +DESC = FFmpeg multimedia library + +LIBVERSION := $(libavutil_VERSION) +LIBMAJOR := $(libavutil_VERSION_MAJOR) +LIBMINOR := $(libavutil_VERSION_MINOR) + +OBJS := $(OBJS-avutil) +OBJS-yes := +OBJS-$(CONFIG_AVCODEC) += $(OBJS-avcodec) +OBJS-$(CONFIG_AVDEVICE) += $(OBJS-avdevice) +OBJS-$(CONFIG_AVFILTER) += $(OBJS-avfilter) +OBJS-$(CONFIG_AVFORMAT) += $(OBJS-avformat) +OBJS-$(CONFIG_AVRESAMPLE) += $(OBJS-avresample) +OBJS-$(CONFIG_POSTPROC) += $(OBJS-postproc) +OBJS-$(CONFIG_SWRESAMPLE) += $(OBJS-swresample) +OBJS-$(CONFIG_SWSCALE) += $(OBJS-swscale) +OBJS += $(OBJS-yes) + +FFLIBS := avutil + +# XXX CIG libffmpeg +#$(SUBDIR)$(LIBNAME): $(OBJS) +# $(RM) $@ +# $(AR) $(ARFLAGS) $(AR_O) $^ +# $(RANLIB) $@ + +# XXX CIG libffmpeg +#install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static +#install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared + +define RULES + +# XXX CIG libffmpeg TODO +$(SUBDIR)lib$(FULLNAME).pc: libavutil/version.h | $(SUBDIR) + $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" + +$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) | $(SUBDIR) + $$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@ + +$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) + $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) + +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver + $(SLIB_CREATE_DEF_CMD) + $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) + $(SLIB_EXTRA_CMD) + +clean:: + $(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ + $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%) + +distclean:: clean + $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \ + $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%) + +# XXX CIG libffmpeg TODO +install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) + $(Q)mkdir -p "$(SHLIBDIR)" + $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" + $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" + $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));) + $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)") + $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)") + $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)") + +install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) + $(Q)mkdir -p "$(LIBDIR)" + $$(INSTALL) -m 644 $$< "$(LIBDIR)" + $(LIB_INSTALL_EXTRA_CMD) + +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc + $(Q)mkdir -p "$(PKGCONFIGDIR)" + $$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)" + +uninstall-libs:: + -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ + "$(SHLIBDIR)/$(SLIBNAME)" \ + "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" + -$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%") + -$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%") + -$(RM) "$(LIBDIR)/$(LIBNAME)" + +endef + +$(eval $(RULES)) + +FFLIBS := ffmpeg diff --git a/libffmpeg/libffmpeg.v b/libffmpeg/libffmpeg.v new file mode 100644 index 0000000000..8f4f1e9b03 --- /dev/null +++ b/libffmpeg/libffmpeg.v @@ -0,0 +1,23 @@ +LIBAVUTIL_MAJOR { + global: + av*; + postproc_*; + pp_*; + swr_*; + swresample_*; + swscale_*; + sws_*; + #FIXME those are for ffserver + ff_inet_aton; + ff_socket_nonblock; + ff_rtsp_parse_line; + ff_rtp_get_local_rtp_port; + ff_rtp_get_local_rtcp_port; + ffio_open_dyn_packet_buf; + ffio_set_buf_size; + ffurl_close; + ffurl_open; + ffurl_write; + local: + *; +}; diff --git a/libswresample/Makefile b/libswresample/Makefile index 42666e4dd2..9009711946 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -15,7 +15,6 @@ OBJS = audioconvert.o \ swresample_frame.o \ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o -OBJS-$(CONFIG_SHARED) += log2_tab.o # Windows resource file SLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o diff --git a/libswresample/log2_tab.c b/libswresample/log2_tab.c deleted file mode 100644 index 47a1df03b7..0000000000 --- a/libswresample/log2_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/log2_tab.c" diff --git a/libswscale/Makefile b/libswscale/Makefile index 5e03e6fa0a..fb9aabdf23 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -19,8 +19,6 @@ OBJS = alphablend.o \ yuv2rgb.o \ vscale.o \ -OBJS-$(CONFIG_SHARED) += log2_tab.o - # Windows resource file SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o diff --git a/libswscale/log2_tab.c b/libswscale/log2_tab.c deleted file mode 100644 index 47a1df03b7..0000000000 --- a/libswscale/log2_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavutil/log2_tab.c" -- 2.16.2