Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-18 13:30:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer eb0f774d4b Merge commit '1565cbc65c' 
* commit '1565cbc65c':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
	libavfilter/avfilter.c
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:54:05 +02:00
..
libmpcodecs lavfi: remove telecine libmpcodecs wrapper 2013-04-11 11:22:11 +00:00
x86 lavfi/gradfun: remove rounding to match C and SSE code. 2013-03-28 07:59:29 +01:00
af_aconvert.c lavfi: deprecate aconvert. 2013-04-11 22:13:45 +02:00
af_afade.c lavfi/afade: switch to AVOption-base system 2013-04-11 01:25:02 +02:00
af_aformat.c lavfi: remove double .priv_class initializers 2013-04-11 11:13:42 +00:00
af_amerge.c lavfi/amerge: switch to an AVOptions-based system. 2013-04-11 18:31:01 +02:00
af_amix.c Merge commit 'ac20e3ab8e' 2013-04-11 01:32:08 +02:00
af_anull.c lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_apad.c lavfi/apad: switch to AVOption-based system 2013-04-11 01:31:08 +02:00
af_aphaser.c lavfi/aphaser: switch to AVOption-based system 2013-04-11 01:37:57 +02:00
af_aresample.c avfilter/aresample: use init_dict system and set child AVOption context correctly 2013-04-11 20:40:59 +02:00
af_asetnsamples.c lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
af_ashowinfo.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
af_astreamsync.c lavfi/astreamsync: switch to an AVOptions-based system. 2013-04-11 15:09:25 +02:00
af_asyncts.c Merge commit 'b2b25b0659' 2013-04-11 01:42:28 +02:00
af_atempo.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_biquads.c lavfi/biquads: switch to an AVOptions-based system 2013-04-11 00:34:19 +00:00
af_channelmap.c Merge commit 'ba8efac977' 2013-04-11 02:10:12 +02:00
af_channelsplit.c Merge commit '3f14febbdf' 2013-04-11 02:17:28 +02:00
af_earwax.c lavfi/earwax: clip sample, this is what sox does 2013-04-03 10:55:13 +00:00
af_join.c Merge commit 'dd7fc37c71' 2013-04-11 02:37:43 +02:00
af_pan.c lavfi: always check return value of ff_get_{audio,video}_buffer() 2013-04-08 19:24:09 +00:00
af_resample.c af_resample: switch to an AVOptions-based system. 2013-04-09 18:45:50 +02:00
af_silencedetect.c lavfi/silencedetect: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
af_volume.c Merge commit 'b13623e184' 2013-04-11 02:44:13 +02:00
af_volume.h Merge commit 'b519298a15' 2012-12-06 15:55:47 +01:00
af_volumedetect.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
all_channel_layouts.inc lavfi: rename all_channel_layouts.h to all_channel_layouts.inc. 2012-05-18 23:34:11 +02:00
allfilters.c lavfi: deprecate aconvert. 2013-04-11 22:13:45 +02:00
asink_anullsink.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c lavfi/aevalsrc: switch to an AVOptions-based system. 2013-04-11 17:28:02 +02:00
asrc_anullsrc.c lavfi/anullsrc: switch to an AVOptions-based system. 2013-04-11 15:21:40 +02:00
asrc_flite.c lavfi/flite: switch to AVOption-based system 2013-04-11 21:37:48 +02:00
asrc_sine.c lavfi/sine: switch to an AVOptions-based system. 2013-04-11 11:51:48 +02:00
audio.c avfilter: avoid direct access to "frame"->channels 2013-03-10 11:25:54 +01:00
audio.h Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
avcodec.c lavfi/avcodec: deprecate remainders of the avcodec glue code 2013-03-16 17:04:36 +01:00
avcodec.h lavfi/avcodec: deprecate remainders of the avcodec glue code 2013-03-16 17:04:36 +01:00
avf_concat.c lavfi/concat: switch to an AVOptions-based system. 2013-04-11 11:51:47 +02:00
avf_showspectrum.c lavfi/showspectrum: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
avf_showwaves.c lavfi/showwaves: switch to an AVOptions-based system. 2013-04-11 14:18:44 +02:00
avfilter.c Merge commit '1565cbc65c' 2013-04-12 00:54:05 +02:00
avfilter.h Merge commit '1565cbc65c' 2013-04-12 00:54:05 +02:00
avfiltergraph.c Merge commit '1565cbc65c' 2013-04-12 00:54:05 +02:00
avfiltergraph.h Merge commit '38f0c0781a' 2013-04-11 23:50:39 +02:00
bbox.c bbox: remove superfluous initializations 2012-03-22 13:40:37 +01:00
bbox.h lavfi: add bbox filter 2012-03-17 11:21:49 +01:00
buffer.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
bufferqueue.h Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
buffersink.c buffersink/uninit: use av_frame_free() not unref 2013-03-23 23:49:33 +01:00
buffersink.h lavfi/buffersink: fix header. 2013-03-17 12:31:25 +01:00
buffersrc.c lavfi/buffersrc: update for compatibility with the fork. 2013-04-11 13:09:10 +02:00
buffersrc.h lavfi/buffersrc: implement flags. 2013-03-10 13:56:17 +01:00
deshake.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
deshake_kernel.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
deshake_opencl.c opencl: add spec opencl device APIs 20130411 2013-04-11 12:46:34 +02:00
deshake_opencl.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02: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 lavfi/ebur128: remove now unused av_opt_free call. 2013-04-11 20:52:41 +02:00
f_perms.c lavfi/perms: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
f_select.c avfilter/f_select: use AVFrame metadata accessor function 2013-04-11 18:33:24 +02:00
f_sendcmd.c lavfi/sendcmd: switch to an AVOptions-based system. 2013-04-11 14:40:02 +02:00
f_setpts.c Merge commit '33b97faaba' 2013-04-10 23:49:58 +02:00
f_settb.c lavfi/asettb: switch to an AVOptions-based system. 2013-04-11 11:53:53 +02:00
fifo.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-09 19:12:38 +02:00
filtfmts.c Merge commit 'cb45553f57' 2012-12-05 13:34:45 +01:00
formats.c lavfi: detect merge failure for unknown layouts. 2013-04-01 10:37:48 +02:00
formats.h lavfi: fix merging of formats and clarify exception. 2013-02-24 11:58:52 +01:00
gradfun.h Merge commit '7ed833d78e' 2013-04-10 21:09:06 +02:00
graphdump.c Merge commit '42c7c61ab2' 2013-03-16 16:09:37 +01:00
graphparser.c Merge commit '1565cbc65c' 2013-04-12 00:54:05 +02:00
internal.h Merge commit '1565cbc65c' 2013-04-12 00:54:05 +02:00
lavfutils.c libavfilter/lavfutils: remove useless NULL check on format context 2012-10-17 20:00:31 +02:00
lavfutils.h Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
libavfilter.v libavfilter: export ff_default_query_formats() 2012-05-25 18:54:01 +02:00
lswsutils.c Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
lswsutils.h Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
Makefile lavfi: remove telecine libmpcodecs wrapper 2013-04-11 11:22:11 +00:00
opencl_allkernels.c deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
opencl_allkernels.h deshake opencl based on comments on 20130402 3rd 2013-04-02 15:57:44 +02:00
split.c Merge commit '73d5d405d4' 2013-04-11 02:50:21 +02:00
src_movie.c Merge commit 'a42d6e6c4c' 2013-04-11 03:41:08 +02:00
transform.c transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
transform.h transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
version.h Merge commit 'bc1a985ba0' 2013-04-12 00:31:44 +02:00
vf_alphaextract.c lavfi/alphaextract: fix frame memleak. 2013-03-17 03:12:44 +01:00
vf_alphamerge.c lavfi/alphamerge: raise filter_frame() error. 2013-03-13 19:00:09 +01:00
vf_aspect.c lavfi/aspect: fix d2q convert in init. 2013-04-11 22:46:47 +02:00
vf_bbox.c lavfi/bbox: remove unused variables and functions 2013-04-11 14:02:59 +00:00
vf_blackdetect.c lavfi/blackdetect: switch to an AVOptions-based system. 2013-04-11 14:48:19 +02:00
vf_blackframe.c lavfi: remove double .priv_class initializers 2013-04-11 11:13:42 +00:00
vf_blend.c lavfi/blend: support more yuv pixel formats 2013-04-11 13:10:11 +00:00
vf_boxblur.c Merge commit '51def31dbe' 2013-04-10 16:34:44 +02:00
vf_colormatrix.c lavfi/colormatrix: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
vf_copy.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vf_crop.c lavfi: remove double .priv_class initializers 2013-04-11 11:13:42 +00:00
vf_cropdetect.c Merge commit '460e7b4f6d' 2013-04-10 17:36:29 +02:00
vf_curves.c lavfi/curves: introduce "all" field in presets and use it. 2013-04-11 13:05:06 +02:00
vf_decimate.c lavfi/decimate: switch to an AVOption-based system 2013-04-11 00:20:01 +02:00
vf_delogo.c Merge commit '63e58c55c1' 2013-04-10 17:54:20 +02:00
vf_deshake.c lavfi/deshake: switch to an AVOptions-based system. 2013-04-11 11:51:48 +02:00
vf_drawbox.c Merge commit '335c31293b' 2013-04-10 18:11:15 +02:00
vf_drawtext.c Merge commit '8ec464c61c' 2013-04-10 18:31:14 +02:00
vf_edgedetect.c lavfi/edgedetect: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_fade.c Merge commit 'b9dfee9fa2' 2013-04-10 18:48:07 +02:00
vf_field.c lavfi/field: cleanup unused shorthand and doc. 2013-04-11 12:41:13 +02:00
vf_fieldorder.c Merge commit 'a39c154049' 2013-04-10 19:03:30 +02:00
vf_format.c Merge commit 'e67a87eac8' 2013-04-10 13:59:45 +02:00
vf_fps.c Merge commit 'f13ab29925' 2013-04-10 19:21:59 +02:00
vf_framestep.c lavfi/framestep: remove request_frame hack 2013-04-11 00:18:28 +00:00
vf_frei0r.c Merge commit '5aa1a668cf' 2013-04-10 19:51:02 +02:00
vf_geq.c lavfi/geq: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_gradfun.c Merge commit '7ed833d78e' 2013-04-10 21:09:06 +02:00
vf_hflip.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vf_histeq.c lavfi/histeq: switch to an AVOptions-based system. 2013-04-11 01:04:44 +02:00
vf_histogram.c lavfi/histogram: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_hqdn3d.c Merge commit '8c747d46f7' 2013-04-10 21:14:30 +02:00
vf_hqdn3d.h Merge commit '8c747d46f7' 2013-04-10 21:14:30 +02:00
vf_hue.c lavfi/hue: extend debugging message 2013-04-11 21:37:43 +02:00
vf_idet.c lavfi/idet: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_il.c lavfi/il: switch to AVOption-based system 2013-04-11 00:31:25 +02:00
vf_kerndeint.c lavfi/kerndeint: switch to AVOption-based system 2013-04-11 00:55:45 +02:00
vf_libopencv.c Merge commit 'ee0e8d4b15' 2013-04-10 21:25:01 +02:00
vf_lut.c Merge commit '20b46f8f4f' 2013-04-10 22:13:34 +02:00
vf_mp.c lavfi/mp: switch to an AVOptions-based system. 2013-04-11 23:27:12 +02:00
vf_noise.c lavfi/noise: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_null.c vf_null: switch to filter_frame 2012-11-29 02:09:01 +01:00
vf_overlay.c lavfi/overlay: improve feedback in case of invalid expression 2013-04-12 00:18:39 +02:00
vf_pad.c Merge commit '40c885c589' 2013-04-10 22:50:32 +02:00
vf_pixdesctest.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vf_pp.c lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_removelogo.c lavfi/removelogo: switch to an AVOptions-based system. 2013-04-11 18:49:46 +02:00
vf_scale.c Merge commit 'c334c113d4' 2013-04-10 20:40:37 +02:00
vf_separatefields.c lavfi/separatefields: adjust tb to avoid rounding errors. 2013-04-10 02:38:54 +02:00
vf_setfield.c lavfi/setfield: switch to an AVOptions-based system. 2013-04-11 11:53:53 +02:00
vf_showinfo.c Merge commit 'e4a7b2177d' 2013-03-16 16:38:11 +01:00
vf_smartblur.c lavfi/smartblur: cleanup unused shorthand and doc. 2013-04-11 12:41:13 +02:00
vf_stereo3d.c lavfi/stereo3d: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_subtitles.c lavfi/subtitles: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
vf_super2xsai.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vf_swapuv.c lavfi/swapuv: remove deprecated base field use 2013-03-17 13:06:01 +01:00
vf_telecine.c telecine filter 2013-04-11 11:12:39 +00:00
vf_thumbnail.c lavfi/thumbnail: switch to an AVOptions-based system. 2013-04-10 23:16:02 +02:00
vf_tile.c lavfi/tile: switch to an AVOptions-based system. 2013-04-11 11:51:47 +02:00
vf_tinterlace.c lavfi/tinterlace: switch to an AVOptions-based system. 2013-04-11 11:51:48 +02:00
vf_transpose.c Merge commit '0c2466dec7' 2013-04-11 00:33:31 +02:00
vf_unsharp.c Merge commit 'b83e9efc53' 2013-04-11 01:02:07 +02:00
vf_vflip.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vf_yadif.c Merge commit '7536c67104' 2013-04-11 01:18:18 +02:00
video.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
video.h Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vsink_nullsink.c Merge commit '7e350379f8' 2013-03-10 01:40:35 +01:00
vsrc_cellauto.c lavfi/cellauto: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_life.c lavfi/life: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_mandelbrot.c lavfi/mandelbrot: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_mptestsrc.c lavfi/mptestsrc: switch to an AVOptions-based system. 2013-04-11 00:21:47 +02:00
vsrc_testsrc.c lavfi/testsrc: remove useless args/NULL passing. 2013-04-11 14:36:50 +02:00
yadif.h vf_yadif: switch to an AVOptions-based system. 2013-04-09 19:09:03 +02:00