1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavfilter
Michael Niedermayer 1cba7fa364 Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
  lavfi: add an asetpts filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/f_setpts.c
	libavfilter/setpts.c
	libavfilter/version.h
	libavfilter/vf_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:59:21 +02:00
..
libmpcodecs lavfi/mp: remove mp=tinterlace wrapper 2013-04-28 13:16:40 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2013-04-23 11:01:46 +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: fix AVOptions descriptions 2013-04-26 10:04:16 +00: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: flag more dynamic i/o filters. 2013-04-13 19:43:17 +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/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
af_astats.c astats filter 2013-04-27 12:40:34 +00: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 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 Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8' 2013-05-01 10:16:31 +02:00
af_channelsplit.c lavfi: add missing periods in filter descriptions. 2013-04-14 20:58:31 +02:00
af_earwax.c lavfi/earwax: remove pointless store 2013-04-16 21:32:26 +00:00
af_join.c lavfi: add missing periods in filter descriptions. 2013-04-14 20:58:31 +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_silencedetect.c
af_volume.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
af_volume.h
af_volumedetect.c
all_channel_layouts.inc
allfilters.c lavfi: add an asetpts filter 2013-04-30 11:17:57 +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: 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 lavfi: add 'enable' command injection to filters supporting timeline. 2013-04-23 01:02:28 +02:00
avfilter.h lavfi: add timeline support. 2013-04-23 01:02:27 +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 lavfi/buffersink: fix possible leaks after allocation failures. 2013-04-21 16:11:36 +02:00
buffersink.h
buffersrc.c lavfi/buffersrc: fix failed requests count. 2013-04-17 11:32:03 +02:00
buffersrc.h
deshake_kernel.h avfilter/deshake_kernel: fix reset value bug of deshake kernel 2013-04-20 19:55:58 +02:00
deshake_opencl.c
deshake_opencl.h
deshake.h
drawutils.c
drawutils.h
f_ebur128.c lavfi: flag more dynamic i/o filters. 2013-04-13 19:43:17 +02:00
f_interleave.c lavfi: add interleave filters 2013-04-21 18:24:04 +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: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
f_sendcmd.c lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers 2013-04-21 17:27:32 +02:00
f_settb.c
fifo.c Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d' 2013-04-22 13:02:29 +02:00
filtfmts.c Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5' 2013-04-12 01:31:55 +02:00
formats.c
formats.h
gradfun.h
graphdump.c
graphparser.c Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8' 2013-05-01 10:16:31 +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 commit 'b472938233b98178ed6c1353c37e0dc7ab585902' 2013-05-01 10:59:21 +02:00
opencl_allkernels.c lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
opencl_allkernels.h
setpts.c Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902' 2013-05-01 10:59:21 +02:00
split.c Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071' 2013-05-01 10:11:01 +02:00
src_movie.c lavfi: flag more dynamic i/o filters. 2013-04-13 19:43:17 +02:00
transform.c
transform.h
unsharp_kernel.h lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
unsharp_opencl.c lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
unsharp_opencl.h lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
unsharp.h lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
version.h Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902' 2013-05-01 10:59:21 +02:00
vf_alphaextract.c
vf_alphamerge.c
vf_aspect.c lavfi/vf_aspect: improve compatibility of parsing. 2013-04-18 20:51:55 +02:00
vf_bbox.c
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
vf_blend.c lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_boxblur.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_colorbalance.c lavfi: support timeline for colorbalance and colorchannelmixer 2013-04-26 09:37:28 +00:00
vf_colorchannelmixer.c lavfi: support timeline for colorbalance and colorchannelmixer 2013-04-26 09:37:28 +00:00
vf_colormatrix.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_copy.c
vf_crop.c lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_cropdetect.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_curves.c lavfi/curves: add support for more rgb formats 2013-04-26 09:37:28 +00:00
vf_decimate.c lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_delogo.c lavfi: add timeline support in {de,remove}logo. 2013-04-24 20:13:01 +02:00
vf_deshake.c deshake: fix off by 2 error 2013-04-15 16:23:28 +02:00
vf_drawbox.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_drawtext.c avfilter/drawtext: add pict_type support 2013-04-23 03:35:28 +02:00
vf_edgedetect.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_fade.c lavfi/fade: Added ability to do video fade based on timestamp 2013-04-21 20:57:02 +02:00
vf_field.c
vf_fieldmatch.c lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_fieldorder.c
vf_format.c lavfi: remove now unused args parameter from AVFilter.init 2013-04-12 11:54:39 +02:00
vf_fps.c lavfi: add missing periods in filter descriptions. 2013-04-14 20:58:31 +02:00
vf_framestep.c lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_frei0r.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +02:00
vf_geq.c avfilter/geq: rgb support 2013-04-23 16:06:37 +02:00
vf_gradfun.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_hflip.c
vf_histeq.c lavfi: add timeline support. 2013-04-23 01:02:27 +02:00
vf_histogram.c vf_histogram: avoid floats, unbreak fate 2013-04-15 21:44:50 +02:00
vf_hqdn3d.c lavfi/hqdn3d: remove timeline flag. 2013-04-26 21:27:02 +02:00
vf_hqdn3d.h
vf_hue.c lavfi/hue: rework logic for setting commands 2013-04-23 22:33:53 +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: remove pointless store 2013-04-16 21:45:34 +00:00
vf_interlace.c lavfi/interlace: remove exec permissions. 2013-04-17 19:27:33 +02:00
vf_kerndeint.c
vf_libopencv.c avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 2013-04-12 15:47:16 +02:00
vf_lut.c lavfi/negate: unbreak negate alpha 2013-04-26 23:45:24 +00:00
vf_mp.c lavfi/mp: remove mp=tinterlace wrapper 2013-04-28 13:16:40 +02:00
vf_mpdecimate.c Add avpriv_dsputil_init() and use it in lavfi where relevant. 2013-04-14 20:15:54 +02:00
vf_noise.c lavfi/noise: remove get_video_buffer, its redundant now 2013-04-25 17:05:42 +00:00
vf_null.c
vf_overlay.c lavfi/overlay: support timeline through the new system. 2013-04-23 01:02:28 +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: add timeline support. 2013-04-23 01:02:27 +02:00
vf_removelogo.c lavfi: add timeline support in {de,remove}logo. 2013-04-24 20:13:01 +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: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
vf_setfield.c
vf_showinfo.c
vf_smartblur.c lavfi: add timeline support. 2013-04-23 01:02:27 +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
vf_telecine.c lavfi/telecine: show time base change too 2013-04-25 16:52:29 +00: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 avfilter/vf_tinterlace: fix handling of not so even sizes 2013-04-29 12:26:15 +02:00
vf_transpose.c lavfi/transpose: apply grammar consistency fixes to transpose dir option 2013-04-28 13:16:40 +02:00
vf_unsharp.c lavfi/unsharp: add opencl unsharp filter 2013-04-26 03:05:26 +02:00
vf_vflip.c
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_yadif.c
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: 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/mptestsrc: fix invalid access in case of negative linesize 2013-04-18 23:47:44 +02:00
vsrc_testsrc.c lavfi/testsrc: fix style 2013-04-17 22:39:44 +02:00
yadif.h