Michael Niedermayer 7381d31f22 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-28 11:02:01 +02:00

..

libmpcodecs

lavfi/mp: remove mp=qp

2013-09-19 15:53:45 +00:00

x86

avfilter/x86/vf_pullup: try to fix build on x64

2013-09-17 17:20:58 +00:00

af_aconvert.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_adelay.c

avfilter: add adelay filter

2013-09-16 14:33:07 +00:00

af_aecho.c

avfilter/af_aecho & af_compand: use extended_data

2013-09-15 12:10:12 +00:00

af_afade.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_aformat.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_amerge.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_amix.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_anull.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_apad.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_aphaser.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_aresample.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_asetnsamples.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_asetrate.c

…

af_ashowinfo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_astats.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_astreamsync.c

…

af_asyncts.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_atempo.c

…

af_biquads.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_channelmap.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_channelsplit.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_compand.c

avfilter/af_aecho & af_compand: use extended_data

2013-09-15 12:10:12 +00:00

af_earwax.c

…

af_join.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_ladspa.c

avfilter/af_ladspa: set output channel layout for passthrough case

2013-09-27 12:51:08 +00:00

af_pan.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_resample.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_silencedetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_volume.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

af_volume.h

…

af_volumedetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

all_channel_layouts.inc

…

allfilters.c

avfilter: add ladspa wrapper filter

2013-09-22 16:36:10 +00:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_aevalsrc.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

asrc_anullsrc.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

asrc_flite.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

asrc_sine.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

audio.c

…

audio.h

…

avcodec.c

…

avcodec.h

…

avf_avectorscope.c

avfilter/avf_avectorscope: improve description

2013-09-14 12:11:22 +00:00

avf_concat.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

avf_showspectrum.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

avf_showwaves.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

avfilter.c

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

avfilter.h

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

avfiltergraph.h

…

bbox.c

…

bbox.h

…

buffer.c

Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

2013-08-01 11:36:54 +02:00

bufferqueue.h

…

buffersink.c

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

2013-08-03 10:08:30 +02:00

buffersink.h

…

buffersrc.c

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

2013-08-03 10:08:30 +02:00

buffersrc.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

deshake_opencl_kernel.h

…

deshake_opencl.c

…

deshake_opencl.h

…

deshake.h

…

drawutils.c

lavfi/drawutils: set subsampling for rgb too

2013-07-14 17:59:25 +00:00

drawutils.h

…

dualinput.c

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

dualinput.h

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

f_ebur128.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_interleave.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

f_perms.c

…

f_select.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_sendcmd.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_settb.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

f_zmq.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

fifo.c

avfilter: remove redundant .get_(audio/video)_buffer initializations

2013-09-07 18:20:16 +00:00

filtfmts.c

avfilter/filtfmts: fix use of deprecated symbols

2013-08-25 19:33:44 +02:00

formats.c

avfilter: remove ff_copy_int*_list

2013-08-16 16:07:29 +02:00

formats.h

…

framesync.c

lavfi: add an API to synchronize multiple video inputs.

2013-09-23 09:49:37 +02:00

framesync.h

lavfi: add an API to synchronize multiple video inputs.

2013-09-23 09:49:37 +02:00

gradfun.h

…

graphdump.c

avfilter/graphdump: fix use of deprecated symbols

2013-08-25 19:33:44 +02:00

graphparser.c

avfilter/graphparser: fix use of deprecated symbols

2013-08-25 19:36:58 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

lavfutils.c

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

setpts.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

split.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

src_movie.c

…

thread.h

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

transform.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

transform.h

…

trim.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

unsharp_opencl_kernel.h

…

unsharp_opencl.c

…

unsharp_opencl.h

…

unsharp.h

…

version.h

Merge remote-tracking branch 'qatar/master'

2013-09-28 11:02:01 +02:00

vf_alphamerge.c

avfilter: remove redundant .get_(audio/video)_buffer initializations

2013-09-07 18:20:16 +00:00

vf_aspect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_bbox.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_blackdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_blackframe.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_blend.c

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

vf_boxblur.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_colorbalance.c

…

vf_colorchannelmixer.c

…

vf_colormatrix.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_copy.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_crop.c

lavfi/pad,crop,scale: remove options description from filter description

2013-09-21 12:50:02 +00:00

vf_cropdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_curves.c

…

vf_dctdnoiz.c

…

vf_decimate.c

avfilter/vf_decimate: add gray16 and yuv440p

2013-09-19 17:53:05 +00:00

vf_delogo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_deshake.c

…

vf_drawbox.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_drawtext.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_edgedetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_extractplanes.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vf_fade.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_field.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_fieldmatch.c

avfilter: fix plane validity checks

2013-08-03 19:15:46 +02:00

vf_fieldorder.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_format.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_fps.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_framestep.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_frei0r.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_geq.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_gradfun.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_hflip.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_histeq.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_histogram.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_hqdn3d.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_hqdn3d.h

…

vf_hue.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_idet.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_il.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_interlace.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_kerndeint.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_libopencv.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_lut3d.c

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

vf_lut.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_mcdeint.c

…

vf_mp.c

lavfi/mp: remove mp=qp

2013-09-19 15:53:45 +00:00

vf_mpdecimate.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_noise.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vf_null.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_overlay.c

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

vf_owdenoise.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_pad.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_perspective.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_phase.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_pixdesctest.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_pp.c

…

vf_psnr.c

lavfi/dualinput: reimplement on top of framesync.

2013-09-23 09:50:09 +02:00

vf_pullup.c

avfilter/vf_pullup: remove junk_down nonsense

2013-09-18 12:47:57 +00:00

vf_pullup.h

avfilter/vf_pullup: remove junk_down nonsense

2013-09-18 12:47:57 +00:00

vf_removelogo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_rotate.c

avfilter/vf_rotate: fix 'oh' option description

2013-09-07 18:35:26 +00:00

vf_sab.c

…

vf_scale.c

lavfi/pad,crop,scale: remove options description from filter description

2013-09-21 12:50:02 +00:00

vf_separatefields.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_setfield.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_showinfo.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_smartblur.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_spp.c

Update copyrights where my email appears with the new one.

2013-09-03 20:42:24 +02:00

vf_spp.h

…

vf_stereo3d.c

avfilter/vf_stereod3d: add const qualifiers to ana_convert()

2013-09-16 12:37:29 +00:00

vf_subtitles.c

…

vf_super2xsai.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_swapuv.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_telecine.c

avfilter/vf_telecine: remove redudant av_frame_copy_props()

2013-09-18 19:17:34 +00:00

vf_thumbnail.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_tile.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_tinterlace.c

avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

2013-09-21 12:48:24 +00:00

vf_transpose.c

avfilter: remove duplicate includes

2013-09-21 15:36:33 +02:00

vf_unsharp.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vflip.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vidstabdetect.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vf_vidstabtransform.c

avfilter/vidstabtransform: update optzoom range values for recent vid.stab update.

2013-09-27 16:48:31 +00:00

vf_vignette.c

avfilter: fix plane validity checks

2013-08-03 19:15:46 +02:00

vf_w3fdif.c

lavfi: Weston 3 Field Deinterlacing Filter

2013-09-06 12:46:56 +00:00

vf_yadif.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

video.c

avfilter/video: remove commented out cruft

2013-09-13 19:17:56 +00:00

video.h

…

vidstabutils.c

…

vidstabutils.h

…

vsink_nullsink.c

…

vsrc_cellauto.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vsrc_life.c

avfilter: add av_cold to init()

2013-09-27 18:51:49 +00:00

vsrc_mandelbrot.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vsrc_mptestsrc.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

vsrc_testsrc.c

avfilter: various cosmetics

2013-09-12 14:01:43 +00:00

yadif.h

…