Michael Niedermayer 4360c6ff61 Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6' ... * commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6': drawtext: Remove the ifdef for localtime_r Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-10-26 03:12:37 +01:00
..
libmpcodecs
x86	x86/vf_noise: move asm code to a separate file	2014-10-17 00:44:35 -03:00
aeval.c
af_adelay.c	avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory	2014-10-07 13:44:26 +02:00
af_aecho.c
af_afade.c	lavfi/afade: fix cur_sample computation	2014-10-21 13:28:08 +02:00
af_aformat.c
af_amerge.c
af_amix.c	libavfilter/af_amix: avoid derreferencing possible null	2014-09-26 18:42:39 -03:00
af_anull.c
af_apad.c
af_aphaser.c
af_aresample.c	avfilter/aresample: Check for memory alloc failure for out sample rates	2014-10-02 12:22:37 +01:00
af_asetnsamples.c
af_asetrate.c
af_ashowinfo.c
af_astats.c
af_astreamsync.c
af_asyncts.c
af_atempo.c
af_biquads.c
af_bs2b.c
af_channelmap.c	libavfilter/af_channelmap: avoid derreferencing possible null	2014-09-26 18:42:39 -03:00
af_channelsplit.c
af_compand.c
af_earwax.c
af_flanger.c
af_join.c	libavfilter/af_join: avoid derreferencing possible null	2014-09-26 18:42:39 -03:00
af_ladspa.c
af_pan.c
af_replaygain.c
af_resample.c	Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'	2014-10-18 22:04:36 +02:00
af_silencedetect.c
af_silenceremove.c	avfilter/af_silenceremove: remove dead code	2014-09-06 21:36:56 +02:00
af_volume.c
af_volume.h
af_volumedetect.c
all_channel_layouts.inc
allfilters.c	avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft	2014-09-17 07:43:03 +00:00
asink_anullsink.c
asrc_abuffer.h
asrc_anullsrc.c
asrc_flite.c
asrc_sine.c
audio.c
audio.h
avcodec.c	avfilter: remove obsolete FF_API_FILL_FRAME cruft	2014-09-17 15:23:26 -03:00
avcodec.h	avfilter: remove obsolete FF_API_FILL_FRAME cruft	2014-09-17 15:23:26 -03:00
avf_avectorscope.c
avf_concat.c	lavfi/concat: accept a single segment	2014-10-21 13:28:40 +02:00
avf_showcqt.c
avf_showspectrum.c
avf_showwaves.c
avfilter.c	Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'	2014-10-25 03:08:19 +02:00
avfilter.h
avfiltergraph.c	avfilter: Properly check for failed format query	2014-10-02 12:22:49 +01:00
avfiltergraph.h
avfilterres.rc
bbox.c
bbox.h
buffer.c
bufferqueue.h
buffersink.c
buffersink.h
buffersrc.c
buffersrc.h
deshake_opencl_kernel.h
deshake_opencl.c
deshake_opencl.h
deshake.h	vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion	2014-09-18 00:48:15 +02:00
drawutils.c
drawutils.h
dualinput.c
dualinput.h
f_ebur128.c	avfilter/ebur128: rework channel weighting definition code	2014-09-06 13:47:59 +02:00
f_interleave.c
f_perms.c
f_select.c
f_sendcmd.c
f_zmq.c
fifo.c
filtfmts.c
formats.c
formats.h
framesync.c
framesync.h
generate_wave_table.c
generate_wave_table.h
gradfun.h
graphdump.c
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
log2_tab.c
lswsutils.c
lswsutils.h
Makefile	avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft	2014-09-17 07:43:03 +00:00
opencl_allkernels.c
opencl_allkernels.h
pthread.c
setpts.c
settb.c
split.c
src_movie.c
thread.h
transform.c
transform.h
trim.c
unsharp_opencl_kernel.h
unsharp_opencl.c
unsharp_opencl.h
unsharp.h
version.h	avfilter/vf_idet: add both multiple and single frame detection metadata	2014-10-20 14:52:27 +02:00
vf_alphamerge.c
vf_aspect.c
vf_bbox.c
vf_blackdetect.c	lavfi: add const/static const to pix_fmts arrays.	2014-08-31 10:25:36 +02:00
vf_blackframe.c
vf_blend.c
vf_boxblur.c
vf_codecview.c
vf_colorbalance.c
vf_colorchannelmixer.c
vf_colormatrix.c
vf_copy.c
vf_crop.c
vf_cropdetect.c	avfilter/vf_cropdetect: Do not check lines or columns twice on black frames	2014-09-09 02:06:17 +02:00
vf_curves.c
vf_dctdnoiz.c
vf_decimate.c
vf_dejudder.c
vf_delogo.c
vf_deshake.c	vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion	2014-09-18 00:48:15 +02:00
vf_drawbox.c
vf_drawtext.c	Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'	2014-10-26 03:12:37 +01:00
vf_edgedetect.c
vf_elbg.c
vf_extractplanes.c
vf_fade.c
vf_field.c
vf_fieldmatch.c
vf_fieldorder.c
vf_format.c	Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'	2014-10-20 22:02:45 +02:00
vf_fps.c
vf_framepack.c
vf_framestep.c
vf_frei0r.c
vf_geq.c
vf_gradfun.c
vf_hflip.c
vf_histeq.c
vf_histogram.c
vf_hqdn3d.c
vf_hqdn3d.h
vf_hqx.c
vf_hue.c
vf_idet.c	avfilter/vf_idet: Fixes issue with idet not flushing last frame.	2014-10-22 15:07:36 +02:00
vf_idet.h	avfilter/vf_idet: Fixes issue with idet not flushing last frame.	2014-10-22 15:07:36 +02:00
vf_il.c
vf_interlace.c
vf_kerndeint.c
vf_lenscorrection.c	lavfi: add const/static const to pix_fmts arrays.	2014-08-31 10:25:36 +02:00
vf_libopencv.c
vf_lut3d.c
vf_lut.c
vf_mcdeint.c
vf_mergeplanes.c
vf_mp.c
vf_mpdecimate.c
vf_noise.c	x86/vf_noise: move asm code to a separate file	2014-10-17 00:44:35 -03:00
vf_noise.h	x86/vf_noise: move asm code to a separate file	2014-10-17 00:44:35 -03:00
vf_null.c
vf_overlay.c
vf_owdenoise.c
vf_pad.c
vf_perspective.c	libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.	2014-10-19 17:59:53 +02:00
vf_phase.c
vf_pixdesctest.c
vf_pp.c	avfilter/vf_pp: add gbrp support	2014-10-14 17:15:56 +02:00
vf_psnr.c
vf_pullup.c
vf_pullup.h
vf_removelogo.c
vf_rotate.c
vf_sab.c
vf_scale.c	avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples	2014-09-21 12:24:03 +02:00
vf_separatefields.c
vf_setfield.c
vf_showinfo.c	Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'	2014-10-18 21:50:34 +02:00
vf_shuffleplanes.c
vf_signalstats.c	avfilter/signalstats: add more pixel formats	2014-09-27 07:28:06 +00:00
vf_smartblur.c
vf_spp.c
vf_spp.h
vf_stereo3d.c
vf_subtitles.c	avfilter/ass: add shaping option	2014-09-16 21:23:33 +02:00
vf_super2xsai.c
vf_swapuv.c
vf_telecine.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c	lavfi: add const/static const to pix_fmts arrays.	2014-08-31 10:25:36 +02:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_vidstabdetect.c	avfilter: Read errno before av_log() as the callback from av_log() might affect errno	2014-10-25 13:28:51 +02:00
vf_vidstabtransform.c	avfilter: Read errno before av_log() as the callback from av_log() might affect errno	2014-10-25 13:28:51 +02:00
vf_vignette.c
vf_w3fdif.c
vf_yadif.c
vf_zoompan.c
video.c
video.h
vidstabutils.c
vidstabutils.h
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h