mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
lavf: do not make a hard dep on internal subtitles helpers.
This commit is contained in:
Clément Bœsch
parent
ad98567198
commit
dec9800c9d
@ -20,7 +20,6 @@ OBJS = allformats.o \
|
||||
riff.o \
|
||||
sdp.o \
|
||||
seek.o \
|
||||
subtitles.o \
|
||||
utils.o \
|
||||
|
||||
OBJS-$(CONFIG_NETWORK) += network.o
|
||||
@ -69,11 +68,11 @@ OBJS-$(CONFIG_AMR_MUXER) += amr.o
|
||||
OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
|
||||
OBJS-$(CONFIG_APC_DEMUXER) += apc.o
|
||||
OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o
|
||||
OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o
|
||||
OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o
|
||||
OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \
|
||||
avlanguage.o
|
||||
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o
|
||||
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
|
||||
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o subtitles.o
|
||||
OBJS-$(CONFIG_ASS_MUXER) += assenc.o
|
||||
OBJS-$(CONFIG_AST_DEMUXER) += ast.o astdec.o
|
||||
OBJS-$(CONFIG_AST_MUXER) += ast.o astenc.o
|
||||
@ -177,7 +176,7 @@ OBJS-$(CONFIG_ISS_DEMUXER) += iss.o
|
||||
OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o
|
||||
OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o
|
||||
OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o
|
||||
OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o
|
||||
OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o subtitles.o
|
||||
OBJS-$(CONFIG_JACOSUB_MUXER) += jacosubenc.o rawenc.o
|
||||
OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o
|
||||
OBJS-$(CONFIG_LATM_DEMUXER) += rawdec.o
|
||||
@ -195,7 +194,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
|
||||
flacenc_header.o avlanguage.o
|
||||
OBJS-$(CONFIG_MD5_MUXER) += md5enc.o
|
||||
OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o
|
||||
OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o
|
||||
OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o
|
||||
OBJS-$(CONFIG_MICRODVD_MUXER) += microdvdenc.o
|
||||
OBJS-$(CONFIG_MJPEG_DEMUXER) += rawdec.o
|
||||
OBJS-$(CONFIG_MJPEG_MUXER) += rawenc.o
|
||||
@ -224,8 +223,8 @@ OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o isom.o
|
||||
OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
|
||||
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o
|
||||
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
|
||||
OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o
|
||||
OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o
|
||||
OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o subtitles.o
|
||||
OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o
|
||||
OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o
|
||||
OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
|
||||
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
|
||||
@ -296,7 +295,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o
|
||||
OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o rawenc.o
|
||||
OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o
|
||||
OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o rawenc.o
|
||||
OBJS-$(CONFIG_PJS_DEMUXER) += pjsdec.o
|
||||
OBJS-$(CONFIG_PJS_DEMUXER) += pjsdec.o subtitles.o
|
||||
OBJS-$(CONFIG_PMP_DEMUXER) += pmpdec.o
|
||||
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
|
||||
OBJS-$(CONFIG_PVF_DEMUXER) += pvfdec.o pcm.o
|
||||
@ -304,7 +303,7 @@ OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o
|
||||
OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o
|
||||
OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o
|
||||
OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o
|
||||
OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o
|
||||
OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o subtitles.o
|
||||
OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o
|
||||
OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o rmsipr.o
|
||||
OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o
|
||||
@ -330,7 +329,7 @@ OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \
|
||||
urldecode.o
|
||||
OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \
|
||||
urldecode.o
|
||||
OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o
|
||||
OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o subtitles.o
|
||||
OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o
|
||||
OBJS-$(CONFIG_SAP_MUXER) += sapenc.o
|
||||
OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o
|
||||
@ -349,15 +348,15 @@ OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o pcm.o
|
||||
OBJS-$(CONFIG_SOX_MUXER) += soxenc.o rawenc.o
|
||||
OBJS-$(CONFIG_SPDIF_DEMUXER) += spdif.o spdifdec.o
|
||||
OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o spdifenc.o
|
||||
OBJS-$(CONFIG_SRT_DEMUXER) += srtdec.o
|
||||
OBJS-$(CONFIG_SRT_DEMUXER) += srtdec.o subtitles.o
|
||||
OBJS-$(CONFIG_SRT_MUXER) += srtenc.o
|
||||
OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
|
||||
OBJS-$(CONFIG_SUBVIEWER1_DEMUXER) += subviewer1dec.o
|
||||
OBJS-$(CONFIG_SUBVIEWER_DEMUXER) += subviewerdec.o
|
||||
OBJS-$(CONFIG_SUBVIEWER1_DEMUXER) += subviewer1dec.o subtitles.o
|
||||
OBJS-$(CONFIG_SUBVIEWER_DEMUXER) += subviewerdec.o subtitles.o
|
||||
OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o swf.o
|
||||
OBJS-$(CONFIG_SWF_MUXER) += swfenc.o swf.o
|
||||
OBJS-$(CONFIG_TAK_DEMUXER) += takdec.o apetag.o img2.o rawdec.o
|
||||
OBJS-$(CONFIG_TEDCAPTIONS_DEMUXER) += tedcaptionsdec.o
|
||||
OBJS-$(CONFIG_TEDCAPTIONS_DEMUXER) += tedcaptionsdec.o subtitles.o
|
||||
OBJS-$(CONFIG_TEE_MUXER) += tee.o
|
||||
OBJS-$(CONFIG_THP_DEMUXER) += thp.o
|
||||
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
|
||||
@ -373,9 +372,10 @@ OBJS-$(CONFIG_VC1T_DEMUXER) += vc1test.o
|
||||
OBJS-$(CONFIG_VC1T_MUXER) += vc1testenc.o
|
||||
OBJS-$(CONFIG_VIVO_DEMUXER) += vivo.o
|
||||
OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
|
||||
OBJS-$(CONFIG_VOBSUB_DEMUXER) += subtitles.o # mpeg demuxer is in the dependencies
|
||||
OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
|
||||
OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o
|
||||
OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o
|
||||
OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o subtitles.o
|
||||
OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o
|
||||
OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o
|
||||
OBJS-$(CONFIG_W64_MUXER) += wavenc.o w64.o
|
||||
@ -385,7 +385,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
|
||||
OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
|
||||
isom.o avc.o \
|
||||
flacenc_header.o avlanguage.o
|
||||
OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o
|
||||
OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o
|
||||
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o
|
||||
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o
|
||||
OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user