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

…

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

…

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

…

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

Merge remote-tracking branch 'qatar/master'

2013-04-12 16:32:33 +02:00

asink_anullsink.c

…

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

…

audio.h

…

avcodec.c

…

avcodec.h

…

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

…

bufferqueue.h

…

buffersink.c

buffersink: remove shorthand

2013-04-12 12:25:03 +02:00

buffersink.h

…

buffersrc.c

lavfi: remove now unused args parameter from AVFilter.init

2013-04-12 11:54:39 +02:00

buffersrc.h

…

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

…

drawutils.h

…

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

…

gradfun.h

Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'

2013-04-10 21:09:06 +02:00

graphdump.c

…

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

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

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.h

…

version.h

Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'

2013-04-12 15:08:40 +02:00

vf_alphaextract.c

…

vf_alphamerge.c

…

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

…

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

…

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_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

…

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

…

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

…

vf_swapuv.c

…

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

…

vf_yadif.c

Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'

2013-04-11 01:18:18 +02:00

video.c

…

video.h

…

vsink_nullsink.c

…

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