mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
224 lines
12 KiB
Makefile
224 lines
12 KiB
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = avfilter
|
|
FFLIBS = avutil
|
|
FFLIBS-$(CONFIG_ACONVERT_FILTER) += swresample
|
|
FFLIBS-$(CONFIG_AMOVIE_FILTER) += avformat avcodec
|
|
FFLIBS-$(CONFIG_ARESAMPLE_FILTER) += swresample
|
|
FFLIBS-$(CONFIG_ASYNCTS_FILTER) += avresample
|
|
FFLIBS-$(CONFIG_ATEMPO_FILTER) += avcodec
|
|
FFLIBS-$(CONFIG_DECIMATE_FILTER) += avcodec
|
|
FFLIBS-$(CONFIG_DESHAKE_FILTER) += avcodec
|
|
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
|
|
FFLIBS-$(CONFIG_MP_FILTER) += avcodec
|
|
FFLIBS-$(CONFIG_PAN_FILTER) += swresample
|
|
FFLIBS-$(CONFIG_PP_FILTER) += postproc
|
|
FFLIBS-$(CONFIG_REMOVELOGO_FILTER) += avformat avcodec swscale
|
|
FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample
|
|
FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
|
|
FFLIBS-$(CONFIG_SHOWSPECTRUM_FILTER) += avcodec
|
|
FFLIBS-$(CONFIG_SMARTBLUR_FILTER) += swscale
|
|
FFLIBS-$(CONFIG_SUBTITLES_FILTER) += avformat avcodec
|
|
|
|
HEADERS = asrc_abuffer.h \
|
|
avcodec.h \
|
|
avfilter.h \
|
|
avfiltergraph.h \
|
|
buffersink.h \
|
|
buffersrc.h \
|
|
version.h \
|
|
|
|
OBJS = allfilters.o \
|
|
audio.o \
|
|
avfilter.o \
|
|
avfiltergraph.o \
|
|
buffer.o \
|
|
buffersrc.o \
|
|
drawutils.o \
|
|
fifo.o \
|
|
formats.o \
|
|
graphdump.o \
|
|
graphparser.o \
|
|
sink_buffer.o \
|
|
transform.o \
|
|
video.o \
|
|
|
|
|
|
OBJS-$(CONFIG_AVCODEC) += avcodec.o
|
|
OBJS-$(CONFIG_AVFORMAT) += lavfutils.o
|
|
OBJS-$(CONFIG_SWSCALE) += lswsutils.o
|
|
|
|
OBJS-$(CONFIG_ACONVERT_FILTER) += af_aconvert.o
|
|
OBJS-$(CONFIG_AFADE_FILTER) += af_afade.o
|
|
OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o
|
|
OBJS-$(CONFIG_ALLPASS_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o
|
|
OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o
|
|
OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o
|
|
OBJS-$(CONFIG_APAD_FILTER) += af_apad.o
|
|
OBJS-$(CONFIG_ARESAMPLE_FILTER) += af_aresample.o
|
|
OBJS-$(CONFIG_ASELECT_FILTER) += f_select.o
|
|
OBJS-$(CONFIG_ASENDCMD_FILTER) += f_sendcmd.o
|
|
OBJS-$(CONFIG_ASETNSAMPLES_FILTER) += af_asetnsamples.o
|
|
OBJS-$(CONFIG_ASETPTS_FILTER) += f_setpts.o
|
|
OBJS-$(CONFIG_ASETTB_FILTER) += f_settb.o
|
|
OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o
|
|
OBJS-$(CONFIG_ASPLIT_FILTER) += split.o
|
|
OBJS-$(CONFIG_ASTREAMSYNC_FILTER) += af_astreamsync.o
|
|
OBJS-$(CONFIG_ASYNCTS_FILTER) += af_asyncts.o
|
|
OBJS-$(CONFIG_ATEMPO_FILTER) += af_atempo.o
|
|
OBJS-$(CONFIG_BANDPASS_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_BANDREJECT_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_BASS_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_BIQUAD_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_CHANNELMAP_FILTER) += af_channelmap.o
|
|
OBJS-$(CONFIG_CHANNELSPLIT_FILTER) += af_channelsplit.o
|
|
OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o
|
|
OBJS-$(CONFIG_EBUR128_FILTER) += f_ebur128.o
|
|
OBJS-$(CONFIG_EQUALIZER_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_HIGHPASS_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_JOIN_FILTER) += af_join.o
|
|
OBJS-$(CONFIG_LOWPASS_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_PAN_FILTER) += af_pan.o
|
|
OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o
|
|
OBJS-$(CONFIG_SILENCEDETECT_FILTER) += af_silencedetect.o
|
|
OBJS-$(CONFIG_TREBLE_FILTER) += af_biquads.o
|
|
OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o
|
|
OBJS-$(CONFIG_VOLUMEDETECT_FILTER) += af_volumedetect.o
|
|
|
|
OBJS-$(CONFIG_AEVALSRC_FILTER) += asrc_aevalsrc.o
|
|
OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o
|
|
OBJS-$(CONFIG_FLITE_FILTER) += asrc_flite.o
|
|
|
|
OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o
|
|
|
|
OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o
|
|
OBJS-$(CONFIG_ALPHAEXTRACT_FILTER) += vf_alphaextract.o
|
|
OBJS-$(CONFIG_ALPHAMERGE_FILTER) += vf_alphamerge.o
|
|
OBJS-$(CONFIG_BBOX_FILTER) += bbox.o vf_bbox.o
|
|
OBJS-$(CONFIG_BLACKDETECT_FILTER) += vf_blackdetect.o
|
|
OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
|
|
OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
|
|
OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o
|
|
OBJS-$(CONFIG_COLORMATRIX_FILTER) += vf_colormatrix.o
|
|
OBJS-$(CONFIG_COPY_FILTER) += vf_copy.o
|
|
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
|
|
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
|
|
OBJS-$(CONFIG_DECIMATE_FILTER) += vf_decimate.o
|
|
OBJS-$(CONFIG_DELOGO_FILTER) += vf_delogo.o
|
|
OBJS-$(CONFIG_DESHAKE_FILTER) += vf_deshake.o
|
|
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
|
|
OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o
|
|
OBJS-$(CONFIG_EDGEDETECT_FILTER) += vf_edgedetect.o
|
|
OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o
|
|
OBJS-$(CONFIG_FIELD_FILTER) += vf_field.o
|
|
OBJS-$(CONFIG_FIELDORDER_FILTER) += vf_fieldorder.o
|
|
OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
|
|
OBJS-$(CONFIG_FRAMESTEP_FILTER) += vf_framestep.o
|
|
OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
|
|
OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
|
|
OBJS-$(CONFIG_GEQ_FILTER) += vf_geq.o
|
|
OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o
|
|
OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
|
|
OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o
|
|
OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o
|
|
OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
|
|
OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
|
|
OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
|
|
OBJS-$(CONFIG_IL_FILTER) += vf_il.o
|
|
OBJS-$(CONFIG_KERNDEINT_FILTER) += vf_kerndeint.o
|
|
OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
|
|
OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
|
|
OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
|
|
OBJS-$(CONFIG_MP_FILTER) += vf_mp.o
|
|
OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o
|
|
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
|
|
OBJS-$(CONFIG_NOISE_FILTER) += vf_noise.o
|
|
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
|
|
OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o
|
|
OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
|
|
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
|
|
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
|
|
OBJS-$(CONFIG_PP_FILTER) += vf_pp.o
|
|
OBJS-$(CONFIG_REMOVELOGO_FILTER) += bbox.o lswsutils.o lavfutils.o vf_removelogo.o
|
|
OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
|
|
OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
|
|
OBJS-$(CONFIG_SENDCMD_FILTER) += f_sendcmd.o
|
|
OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o
|
|
OBJS-$(CONFIG_SETFIELD_FILTER) += vf_setfield.o
|
|
OBJS-$(CONFIG_SETPTS_FILTER) += f_setpts.o
|
|
OBJS-$(CONFIG_SETSAR_FILTER) += vf_aspect.o
|
|
OBJS-$(CONFIG_SETTB_FILTER) += f_settb.o
|
|
OBJS-$(CONFIG_SHOWINFO_FILTER) += vf_showinfo.o
|
|
OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o
|
|
OBJS-$(CONFIG_SPLIT_FILTER) += split.o
|
|
OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o
|
|
OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_subtitles.o
|
|
OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o
|
|
OBJS-$(CONFIG_SWAPUV_FILTER) += vf_swapuv.o
|
|
OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o
|
|
OBJS-$(CONFIG_TILE_FILTER) += vf_tile.o
|
|
OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o
|
|
OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
|
|
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
|
|
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
|
|
OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
|
|
|
|
OBJS-$(CONFIG_CELLAUTO_FILTER) += vsrc_cellauto.o
|
|
OBJS-$(CONFIG_COLOR_FILTER) += vsrc_testsrc.o
|
|
OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o
|
|
OBJS-$(CONFIG_LIFE_FILTER) += vsrc_life.o
|
|
OBJS-$(CONFIG_MANDELBROT_FILTER) += vsrc_mandelbrot.o
|
|
OBJS-$(CONFIG_MPTESTSRC_FILTER) += vsrc_mptestsrc.o
|
|
OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_testsrc.o
|
|
OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o
|
|
OBJS-$(CONFIG_SMPTEBARS_FILTER) += vsrc_testsrc.o
|
|
OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
|
|
|
|
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
|
|
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_detc.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dint.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_divtc.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o
|
|
#OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_filmdint.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_harddup.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ivtc.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_mcdeint.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_noise.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ow.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_perspective.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_phase.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pp7.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pullup.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
|
|
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
|
|
|
|
# multimedia filters
|
|
OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o
|
|
OBJS-$(CONFIG_SHOWSPECTRUM_FILTER) += avf_showspectrum.o
|
|
OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o
|
|
|
|
# multimedia sources
|
|
OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o
|
|
OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o
|
|
|
|
TOOLS = graph2dot
|
|
TESTPROGS = drawutils filtfmts formats
|
|
|
|
clean::
|
|
$(RM) $(CLEANSUFFIXES:%=libavfilter/libmpcodecs/%)
|