generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ebbd4fd5f0
ffmpeg/libavfilter
History
Michael Niedermayer ebbd4fd5f0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add a test for the interlace filter
  lavfi: new interlace filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:32:33 +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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_afade.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_aformat.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
af_amerge.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_amix.c Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65' 2013-04-12 14:30:34 +02:00
af_anull.c lavfi/af_anull: accept unknown channel layouts. 2013-01-26 11:15:38 +01:00
af_apad.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_aphaser.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_ashowinfo.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
af_astreamsync.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_asyncts.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
af_atempo.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_biquads.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
af_channelmap.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
af_channelsplit.c Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65' 2013-04-12 14:30:34 +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 '7cdd737ba81b5c2c9521c4509edf0ac315fabc65' 2013-04-12 14:30:34 +02:00
af_pan.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02: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 lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
af_volume.h Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 2012-12-06 15:55:47 +01:00
af_volumedetect.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
all_channel_layouts.inc
allfilters.c Merge remote-tracking branch 'qatar/master' 2013-04-12 16:32:33 +02:00
asink_anullsink.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
asrc_abuffer.h
asrc_aevalsrc.c avfilter/asrc_aevalsrc: fix return code, 2nd try 2013-04-12 12:02:06 +02:00
asrc_anullsrc.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
asrc_flite.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
asrc_sine.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
audio.c avfilter: avoid direct access to "frame"->channels 2013-03-10 11:25:54 +01:00
audio.h Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +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 'f160c6a18a574b4c7d063e0a748037cbbd9912ee' 2013-04-12 15:14:08 +02:00
avfilter.h Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +02:00
avfiltergraph.c avfilter: remove opaque passing hacks 2013-04-12 13:56:03 +02:00
avfiltergraph.h Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 2013-04-11 23:50:39 +02: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 buffersink: remove shorthand 2013-04-12 12:25:03 +02:00
buffersink.h lavfi/buffersink: fix header. 2013-03-17 12:31:25 +01:00
buffersrc.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
buffersrc.h lavfi/buffersrc: implement flags. 2013-03-10 13:56:17 +01: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
deshake.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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
f_perms.c avfilter: Filter options that are used for both video and audio should have both flags 2013-04-12 15:45:28 +02:00
f_select.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
f_sendcmd.c avfilter: Filter options that are used for both video and audio should have both flags 2013-04-12 15:45:28 +02:00
f_setpts.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +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-12 11:54:39 +02:00
filtfmts.c Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5' 2013-04-12 01:31:55 +02: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 '7ed833d78ea661d619124fd898547a900f6480bc' 2013-04-10 21:09:06 +02:00
graphdump.c Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf' 2013-03-16 16:09:37 +01:00
graphparser.c lavfi: fix forgotten chunk in eb0f774d. 2013-04-12 14:08:04 +02:00
internal.h Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0' 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 '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter.v
lswsutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lswsutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-04-12 16:32:33 +02: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 '7cdd737ba81b5c2c9521c4509edf0ac315fabc65' 2013-04-12 14:30:34 +02:00
src_movie.c avfilter: Filter options that are used for both video and audio should have both flags 2013-04-12 15:45:28 +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 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 2013-04-12 15:08:40 +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: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_boxblur.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_colormatrix.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_copy.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 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 lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_curves.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_decimate.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_delogo.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_deshake.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_drawbox.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_drawtext.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_edgedetect.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_fade.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +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 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec' 2013-04-10 19:03:30 +02:00
vf_format.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_fps.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_framestep.c lavfi/framestep: remove request_frame hack 2013-04-11 00:18:28 +00:00
vf_frei0r.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +02:00
vf_geq.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_gradfun.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_hflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_histeq.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_histogram.c lavfi/histogram: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
vf_hqdn3d.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +02:00
vf_hqdn3d.h Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a' 2013-04-10 21:14:30 +02:00
vf_hue.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_idet.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_il.c lavfi/il: switch to AVOption-based system 2013-04-11 00:31:25 +02:00
vf_interlace.c Merge remote-tracking branch 'qatar/master' 2013-04-12 16:32:33 +02:00
vf_kerndeint.c lavfi/kerndeint: switch to AVOption-based system 2013-04-11 00:55:45 +02:00
vf_libopencv.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +02:00
vf_lut.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_mp.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_noise.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_null.c vf_null: switch to filter_frame 2012-11-29 02:09:01 +01:00
vf_overlay.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_pad.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_pixdesctest.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_pp.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_removelogo.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_scale.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +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 'e4a7b2177d14678ae240edcabaacfe2b14619b7b' 2013-03-16 16:38:11 +01:00
vf_smartblur.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +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: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_super2xsai.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 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 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_thumbnail.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vf_tile.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +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 '0c2466dec719b933d161f5d680a57fde38aa5daa' 2013-04-11 00:33:31 +02:00
vf_unsharp.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_vflip.c Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 2013-03-10 01:40:35 +01:00
vf_yadif.c Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775' 2013-04-11 01:18:18 +02: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 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vsrc_life.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vsrc_mandelbrot.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vsrc_mptestsrc.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
vsrc_testsrc.c lavfi: remove now unused args parameter from AVFilter.init and init_opaque 2013-04-12 11:54:39 +02:00
yadif.h vf_yadif: switch to an AVOptions-based system. 2013-04-09 19:09:03 +02:00