RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-21 15:00:27 +00:00
Code Issues Projects Releases Wiki Activity
a05a44e205
ffmpeg/libavfilter
History
Michael Niedermayer a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* 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
      759001c534 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>
2013-03-10 01:40:35 +01:00
..
libmpcodecs lavfi/mp: drop mp=stereo3d filter 2013-03-05 18:45:35 +00:00
x86 Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82' 2013-02-16 09:09:38 +01:00
af_aconvert.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_afade.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_aformat.c lavfi/af_aformat: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_amerge.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_amix.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_anull.c lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_apad.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_aresample.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_asetnsamples.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_ashowinfo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_astreamsync.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_asyncts.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_atempo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_biquads.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_channelmap.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_channelsplit.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_earwax.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_join.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_pan.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_resample.c lavfi: switch to AVFrame. 2013-03-08 07:37:18 +01:00
af_silencedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_volume.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_volume.h
af_volumedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
all_channel_layouts.inc
allfilters.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asink_anullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_abuffer.h
asrc_aevalsrc.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_anullsrc.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_flite.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
audio.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
audio.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avcodec.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avcodec.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avf_concat.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avf_showspectrum.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avf_showwaves.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avfilter.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avfilter.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
avfiltergraph.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
avfiltergraph.h avfilter/avfiltergraph.h: Move public field out of the private fields 2013-02-24 20:31:56 +01:00
bbox.c
bbox.h
buffer.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
bufferqueue.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersink.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersrc.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
buffersrc.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
drawutils.c lavfi/drawutils: fix blending computation in blend_line function 2013-01-05 13:08:02 +01:00
drawutils.h lavfi/drawutils: fix typo 2013-01-05 05:21:44 +01:00
f_ebur128.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_select.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_sendcmd.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_setpts.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
f_settb.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
fifo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
filtfmts.c
formats.c lavfi/formats: reindent after last commit. 2013-02-24 12:05:06 +01:00
formats.h lavfi: fix merging of formats and clarify exception. 2013-02-24 11:58:52 +01:00
gradfun.h
graphdump.c
graphparser.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
internal.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
sink_buffer.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
split.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
src_movie.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
transform.c
transform.h
version.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_alphaextract.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_alphamerge.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_aspect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_bbox.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_blackdetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_blackframe.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_blend.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_boxblur.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_colormatrix.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_copy.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_crop.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_cropdetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_decimate.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_delogo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_deshake.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_drawbox.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_drawtext.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_edgedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_fade.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_field.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_fieldorder.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_format.c
vf_fps.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_framestep.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_frei0r.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_geq.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_gradfun.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_hflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_histeq.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_histogram.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_hqdn3d.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_hqdn3d.h avfilter/vf_hqdn3d.h: restore author attribution, history and project name 2013-02-02 13:18:10 +01:00
vf_hue.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_idet.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_il.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_kerndeint.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_libopencv.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_lut.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_mp.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_noise.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_null.c
vf_overlay.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pad.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pixdesctest.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pp.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_removelogo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_scale.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_setfield.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_showinfo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_smartblur.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_stereo3d.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_subtitles.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_super2xsai.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_swapuv.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_thumbnail.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_tile.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_tinterlace.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_transpose.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_unsharp.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_vflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_yadif.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
video.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
video.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsink_nullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_cellauto.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_life.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_mandelbrot.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_mptestsrc.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vsrc_testsrc.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
yadif.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00