Michael Niedermayer 5d509fbdcf Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79' ...

* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
  vsrc_movie: do not free avoption variables in uninit()

Conflicts:
	libavfilter/src_movie.c

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

2013-06-21 10:41:41 +02:00

..

libmpcodecs

lavfi/mp: remove mp=spp.

2013-06-14 01:27:22 +02:00

x86

lavfi: add spp filter.

2013-06-14 01:27:22 +02: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/afade: add timeline support

2013-05-25 13:20:27 +00:00

af_aformat.c

Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

2013-05-18 12:22:25 +02:00

af_amerge.c

lavfi: flag more dynamic i/o filters.

2013-04-13 19:43:17 +02:00

af_amix.c

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

2013-05-05 11:42:18 +02:00

af_anull.c

lavfi/anull: remove redundant lines

2013-05-10 15:08:12 +00:00

af_apad.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

af_aphaser.c

lavfi/aphaser: silence uninitialized variable warnings.

2013-04-15 01:12:26 +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_asetrate.c

lavfi: add asetrate filter.

2013-04-21 15:20:50 +02:00

af_ashowinfo.c

lavfi/(a)showinfo: use link frame counter instead of local counter.

2013-05-21 22:29:16 +02:00

af_astats.c

avfilter/af_astats: rename stat()

2013-06-03 14:59:52 +02: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

Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'

2013-05-10 23:03:50 +02:00

af_atempo.c

libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484

2013-04-21 10:46:52 +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/channelmap: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:31:52 +00:00

af_channelsplit.c

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

2013-05-05 11:42:18 +02:00

af_earwax.c

lavfi/earwax: remove pointless store

2013-04-16 21:32:26 +00:00

af_join.c

lavfi/join: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:10:39 +00: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_silencedetect.c

…

af_volume.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

af_volume.h

…

af_volumedetect.c

avfilter: add av_cold to uninit()

2013-05-06 16:55:06 +02:00

all_channel_layouts.inc

…

allfilters.c

lavfi: add spp filter.

2013-06-14 01:27:22 +02:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_aevalsrc.c

avfilter: add av_cold to uninit()

2013-05-06 16:55: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

Merge remote-tracking branch 'qatar/master'

2013-06-19 08:27:35 +02:00

audio.h

…

avcodec.c

…

avcodec.h

…

avf_avectorscope.c

lavfi: avectorscope filter

2013-05-10 17:11:54 +00:00

avf_concat.c

lavfi: flag more dynamic i/o filters.

2013-04-13 19:43:17 +02:00

avf_showspectrum.c

lavfi/showspectrum: fix crash in case of negative linesize

2013-04-29 19:27:15 +00:00

avf_showwaves.c

lavfi/showwaves: fix crash in case of negative linesize

2013-04-29 19:28:12 +00:00

avfilter.c

avfilter/process_options: fix memleak

2013-06-03 15:26:50 +02:00

avfilter.h

Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'

2013-06-05 12:05:41 +02:00

avfiltergraph.c

Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

2013-05-24 14:07:00 +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

Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

2013-05-05 12:48:25 +02:00

buffersink.h

…

buffersrc.c

lavfi: let gcc realign the stack on public graph driving functions

2013-05-04 23:40:13 +03:00

buffersrc.h

…

deshake_opencl_kernel.h

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

deshake_opencl.c

lavu: add FF_CEIL_RSHIFT and use it in various places.

2013-05-09 16:59:42 +02:00

deshake_opencl.h

…

deshake.h

…

drawutils.c

lavfi/drawutils: attempt to fix subsampling.

2013-05-28 19:20:27 +02:00

drawutils.h

…

dualinput.c

lavfi: add dual input helpers.

2013-05-27 20:32:28 +02:00

dualinput.h

lavfi: add dual input helpers.

2013-05-27 20:32:28 +02:00

f_ebur128.c

lavfi: flag more dynamic i/o filters.

2013-04-13 19:43:17 +02:00

f_interleave.c

avfilter: add av_cold to uninit()

2013-05-06 16:55:06 +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/select: unbreak compatibility with older PICT_TYPE syntax

2013-05-12 10:52:26 +00:00

f_sendcmd.c

make the ordering of the return type and av_cold consistent

2013-05-05 13:13:00 +02:00

f_settb.c

lavfi/asettb: switch to an AVOptions-based system.

2013-04-11 11:53:53 +02:00

f_zmq.c

lavfi: add zmq filters

2013-05-14 20:10:44 +02:00

fifo.c

Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'

2013-04-22 13:02:29 +02:00

filtfmts.c

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

2013-05-18 11:46:09 +02:00

formats.c

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

2013-05-18 11:46:09 +02:00

formats.h

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

2013-05-18 11:46:09 +02:00

gradfun.h

…

graphdump.c

…

graphparser.c

Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'

2013-05-01 10:16:31 +02:00

internal.h

Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

2013-05-24 14:07:00 +02:00

lavfutils.c

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

lavfi/mp: remove mp=spp.

2013-06-14 01:27:22 +02:00

opencl_allkernels.c

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

opencl_allkernels.h

…

pthread.c

os2threads: move from lavc to compat/

2013-05-28 12:49:20 +02:00

setpts.c

lavfi/setpts: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:14:43 +00:00

split.c

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

2013-05-05 11:42:18 +02:00

src_movie.c

Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'

2013-06-21 10:41:41 +02:00

thread.h

Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

2013-05-24 14:07:00 +02:00

transform.c

…

transform.h

…

trim.c

lavfi/trim: mark link closed on EOF.

2013-06-02 23:19:42 +02:00

unsharp_opencl_kernel.h

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

2013-05-10 12:44:04 +02:00

unsharp_opencl.c

lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

2013-05-09 16:59:43 +02:00

unsharp_opencl.h

lavfi/unsharp: add opencl unsharp filter

2013-04-26 03:05:26 +02:00

unsharp.h

lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

2013-05-09 16:59:43 +02:00

version.h

lavfi/mp: remove mp=spp.

2013-06-14 01:27:22 +02:00

vf_alphamerge.c

…

vf_aspect.c

Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'

2013-05-17 11:29:22 +02:00

vf_bbox.c

lavfi/bbox: export bbox info to frame metadata

2013-05-26 14:00:10 +00:00

vf_blackdetect.c

lavfi: add frame counter into AVFilterLink and use it in filters.

2013-04-23 01:02:27 +02:00

vf_blackframe.c

Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'

2013-05-16 10:08:17 +02:00

vf_blend.c

lavfi/blend: support slice threading

2013-05-24 21:41:28 +00:00

vf_boxblur.c

Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'

2013-05-16 10:08:17 +02:00

vf_colorbalance.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_colorchannelmixer.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_colormatrix.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_copy.c

vf_copy: silence "incompatible pointer type" warning

2013-05-11 15:51:27 +02:00

vf_crop.c

Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'

2013-05-17 11:29:22 +02:00

vf_cropdetect.c

Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'

2013-05-16 10:14:00 +02:00

vf_curves.c

lavfi: cosmetics: fix vertical alignment for pads in some filters

2013-05-14 15:31:56 +00:00

vf_dctdnoiz.c

lavfi/dctdnoiz: move DC normalization out of loops.

2013-05-26 22:41:02 +02:00

vf_decimate.c

lavfi: use ceil right shift for chroma width/height.

2013-05-10 17:20:06 +02:00

vf_delogo.c

delogo: Fix function description

2013-06-19 22:13:12 +02:00

vf_deshake.c

avfilter/vf_deshake: check rx

2013-05-18 18:28:59 +02:00

vf_drawbox.c

drawbox: Respect thickness parameter

2013-06-14 03:52:32 +02:00

vf_drawtext.c

add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num

2013-06-18 17:38:17 -04:00

vf_edgedetect.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_extractplanes.c

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

2013-05-18 11:46:09 +02:00

vf_fade.c

vf_fade: remove unused function

2013-05-24 20:50:15 +02:00

vf_field.c

lavfi/field, il, noise: use av_pix_fmt_count_planes()

2013-05-24 12:53:23 +00:00

vf_fieldmatch.c

lavfi: use ceil right shift for chroma width/height.

2013-05-10 17:20:06 +02:00

vf_fieldorder.c

Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'

2013-05-16 15:21:31 +02:00

vf_format.c

lavfi/format: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:17:34 +00:00

vf_fps.c

Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'

2013-05-17 11:05:18 +02:00

vf_framestep.c

lavfi/framestep: cosmetics: reindent AVFilter

2013-06-06 17:19:16 +00:00

vf_frei0r.c

lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:31:52 +00:00

vf_geq.c

lavfi/geq: prefer symbolic constants

2013-05-21 21:15:08 +02:00

vf_gradfun.c

Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'

2013-05-17 10:51:59 +02:00

vf_hflip.c

Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'

2013-05-16 16:45:43 +02:00

vf_histeq.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_histogram.c

lavfi/histogram: cache log2 of max_hval

2013-05-19 14:30:42 +00:00

vf_hqdn3d.c

lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS

2013-05-27 10:58:45 +00:00

vf_hqdn3d.h

…

vf_hue.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_idet.c

lavfi/idet: remove request_frame hack

2013-05-27 09:55:39 +00:00

vf_il.c

lavfi/il: add timeline support

2013-06-06 17:44:54 +00:00

vf_interlace.c

Merge remote-tracking branch 'qatar/master'

2013-06-18 09:31:05 +02:00

vf_kerndeint.c

replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

2013-05-15 11:23:14 +02:00

vf_libopencv.c

lavfi/ocv: make use of AVFILTER_DEFINE_CLASS

2013-05-27 11:31:52 +00:00

vf_lut3d.c

lavfi/lut3d: add sanity checks.

2013-06-07 01:48:41 +02:00

vf_lut.c

Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'

2013-05-17 10:51:59 +02:00

vf_mcdeint.c

avfilter/vf_mcdeint: free frame on error

2013-06-03 15:41:29 +02:00

vf_mp.c

lavfi/mp: remove mp=spp.

2013-06-14 01:27:22 +02:00

vf_mpdecimate.c

lavfi: use ceil right shift for chroma width/height.

2013-05-10 17:20:06 +02:00

vf_noise.c

lavfi/noise: fix out of array access

2013-05-29 16:54:28 +00:00

vf_null.c

lavfi/null: remove redudant lines

2013-05-08 12:48:05 +00:00

vf_overlay.c

lavfi/overlay: remove do_blend forward declaration.

2013-05-27 20:42:46 +02:00

vf_owdenoise.c

lavfi: port wavelet denoiser filter from libmpcodecs.

2013-05-16 00:45:45 +02:00

vf_pad.c

lavfi/pad: switch to AV_OPT_TYPE_COLOR

2013-05-17 11:32:54 +00:00

vf_pixdesctest.c

lavfi/pixdesctest: fix chroma subsampling with odd sizes.

2013-06-01 12:05:55 +02:00

vf_pp.c

lavfi/pp: set out frame size.

2013-06-08 23:23:30 +02:00

vf_removelogo.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_rotate.c

lavfi/rotate: add angle command

2013-06-13 01:21:47 +02:00

vf_sab.c

vf_sab: Fix memleak

2013-06-10 22:00:43 +02:00

vf_scale.c

Merge remote-tracking branch 'qatar/master'

2013-05-15 11:10:09 +02:00

vf_separatefields.c

lavfi: add frame counter into AVFilterLink and use it in filters.

2013-04-23 01:02:27 +02:00

vf_setfield.c

lavfi/setfield: switch to an AVOptions-based system.

2013-04-11 11:53:53 +02:00

vf_showinfo.c

lavfi/(a)showinfo: use link frame counter instead of local counter.

2013-05-21 22:29:16 +02:00

vf_smartblur.c

lavfi: replace passthrough_filter_frame with a flag.

2013-05-12 13:07:47 +02:00

vf_spp.c

lavfi/spp: fix description.

2013-06-14 06:53:52 +02:00

vf_spp.h

lavfi: add spp filter.

2013-06-14 01:27:22 +02:00

vf_stereo3d.c

lavfi/stereo3d: add support for alternating frames input & output format

2013-04-30 09:13:36 +00:00

vf_subtitles.c

lavfi/subtitles: zero-init AVSubtitle.

2013-04-25 00:56:38 +02:00

vf_super2xsai.c

…

vf_swapuv.c

replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

2013-05-15 11:23:14 +02:00

vf_telecine.c

replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

2013-05-15 11:23:14 +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

Merge remote-tracking branch 'qatar/master'

2013-06-18 09:31:05 +02:00

vf_transpose.c

replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*

2013-05-15 11:23:14 +02:00

vf_unsharp.c

lavfi/unsharp: remove unused float.h include.

2013-05-16 13:38:26 +02:00

vf_vflip.c

lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.

2013-05-12 12:59:00 +02:00

vf_vidstabdetect.c

lavfi/vidstabdetect: fix direct path.

2013-04-24 18:30:43 +02:00

vf_vidstabtransform.c

lavfi/vidstab: remove mention of defaults for consistency with other filters.

2013-04-24 18:30:43 +02:00

vf_vignette.c

lavfi/vignette: remove extra semi-colon.

2013-05-31 10:22:03 +02:00

vf_yadif.c

yadif: fix slice sizes

2013-05-24 17:46:57 +02:00

video.c

…

video.h

…

vidstabutils.c

lavfi/vidstab: miscelenaous cosmetics and typo fixes.

2013-04-24 18:30:42 +02:00

vidstabutils.h

lavfi: add video stabilization plugins using vid.stab library

2013-04-24 18:30:42 +02:00

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/life: switch to AV_OPT_TYPE_COLOR

2013-05-17 11:32:54 +00: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/mptestsrc: fix chroma subsampling with odd sizes.

2013-06-01 12:05:55 +02:00

vsrc_testsrc.c

lavfi/haldclutsrc: 10l remove size options.

2013-05-27 20:53:25 +02:00

yadif.h

yadif: restore speed of the C filtering code

2013-05-14 09:23:55 +02:00