Michael Niedermayer 325f6e0a97 Merge remote-tracking branch 'qatar/master' ... * qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-10-29 11:58:11 +01:00
..
libmpcodecs	avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration	2013-10-24 07:44:23 +00:00
x86	avfilter/x86/vf_gradfun_init: fix const and related warnings	2013-10-24 12:12:59 +02:00
Makefile	avfilter: add mergeplanes filter	2013-10-27 18:58:43 +00:00
af_aconvert.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_adelay.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_aecho.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_afade.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_aformat.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_amerge.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_amix.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_anull.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_apad.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_aphaser.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_aresample.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_asetnsamples.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_asetrate.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_ashowinfo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_astats.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_astreamsync.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_asyncts.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_atempo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_biquads.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_channelmap.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_channelsplit.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_compand.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_earwax.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_join.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_ladspa.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_pan.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_replaygain.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_resample.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_silencedetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_volume.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
af_volume.h	…
af_volumedetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
all_channel_layouts.inc	…
allfilters.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
asink_anullsink.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
asrc_abuffer.h	…
asrc_aevalsrc.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
asrc_anullsrc.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
asrc_flite.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
asrc_sine.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
audio.c	…
audio.h	…
avcodec.c	…
avcodec.h	Do not leave positive values undefined when negative are defined as error	2013-10-19 16:42:57 +02:00
avf_avectorscope.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
avf_concat.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
avf_showspectrum.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
avf_showwaves.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
avfilter.c	Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'	2013-10-28 13:07:05 +01:00
avfilter.h	Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'	2013-10-28 13:07:05 +01:00
avfiltergraph.c	avfiltergraph: Properly handle memory allocation failure	2013-10-27 19:15:03 +00:00
avfiltergraph.h	…
bbox.c	…
bbox.h	…
buffer.c	…
bufferqueue.h	…
buffersink.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
buffersink.h	…
buffersrc.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
buffersrc.h	…
deshake.h	…
deshake_opencl.c	…
deshake_opencl.h	…
deshake_opencl_kernel.h	…
drawutils.c	…
drawutils.h	…
dualinput.c	avfilter/dualinput: simplify	2013-09-30 08:47:40 +00:00
dualinput.h	avfilter/dualinput: simplify	2013-09-30 08:47:40 +00:00
f_ebur128.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_interleave.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_perms.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_select.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_sendcmd.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_settb.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
f_zmq.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
fifo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
filtfmts.c	…
formats.c	…
formats.h	…
framesync.c	…
framesync.h	…
gradfun.h	Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'	2013-10-23 12:14:49 +02:00
graphdump.c	…
graphparser.c	Do not leave positive values undefined when negative are defined as error	2013-10-19 16:42:57 +02:00
internal.h	Do not leave positive values undefined when negative are defined as error	2013-10-19 16:42:57 +02:00
lavfutils.c	avfilter/lavfutils: fix memleak of avpacket	2013-10-12 11:52:10 +02:00
lavfutils.h	Do not leave positive values undefined when negative are defined as error	2013-10-19 16:42:57 +02:00
libavfilter.v	…
lswsutils.c	avfilter/lswsutils: dont override the default scaler	2013-10-07 13:28:13 +02:00
lswsutils.h	…
opencl_allkernels.c	…
opencl_allkernels.h	…
pthread.c	lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups	2013-10-22 17:05:26 +01:00
setpts.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
split.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
src_movie.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
thread.h	Merge remote-tracking branch 'qatar/master'	2013-09-28 11:02:01 +02:00
transform.c	…
transform.h	…
trim.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
unsharp.h	…
unsharp_opencl.c	…
unsharp_opencl.h	…
unsharp_opencl_kernel.h	…
version.h	Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'	2013-10-28 13:07:05 +01:00
vf_alphamerge.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_aspect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_bbox.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_blackdetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_blackframe.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_blend.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_boxblur.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_colorbalance.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_colorchannelmixer.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_colormatrix.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_copy.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_crop.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_cropdetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_curves.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_dctdnoiz.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_decimate.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_delogo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_deshake.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_drawbox.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_drawtext.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_edgedetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_extractplanes.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_fade.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_field.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_fieldmatch.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_fieldorder.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_format.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_fps.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_framestep.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_frei0r.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_geq.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_gradfun.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_hflip.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_histeq.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_histogram.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_hqdn3d.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_hqdn3d.h	…
vf_hue.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_idet.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_il.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_interlace.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_kerndeint.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_libopencv.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_lut.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_lut3d.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_mcdeint.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_mergeplanes.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_mp.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_mpdecimate.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_noise.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_null.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_overlay.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_owdenoise.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_pad.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_perspective.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_phase.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_pixdesctest.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_pp.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_psnr.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_pullup.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_pullup.h	…
vf_removelogo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_rotate.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_sab.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_scale.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_separatefields.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_setfield.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_showinfo.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_smartblur.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_spp.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_spp.h	…
vf_stereo3d.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_subtitles.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_super2xsai.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_swapuv.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_telecine.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_thumbnail.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_tile.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_tinterlace.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_transpose.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_unsharp.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_vflip.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_vidstabdetect.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_vidstabtransform.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_vignette.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_w3fdif.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vf_yadif.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
video.c	…
video.h	…
vidstabutils.c	…
vidstabutils.h	…
vsink_nullsink.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vsrc_cellauto.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vsrc_life.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vsrc_mandelbrot.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vsrc_mptestsrc.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
vsrc_testsrc.c	Merge remote-tracking branch 'qatar/master'	2013-10-29 11:58:11 +01:00
yadif.h	…