Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 10:50:56 +0000 (11:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 10:58:11 +0000 (11:58 +0100)
commit325f6e0a97c943807c665eb1d5c278f8d789156b
tree4502d77d338015bfffe11a71ee8e80fd9bf98391
parentd3e13250a0308d8fda851e064ddbbbd7e574d880
parentcd43ca0443a298ab8cf9f9567c568f83b67b656c
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>
145 files changed:
libavfilter/af_aconvert.c
libavfilter/af_adelay.c
libavfilter/af_aecho.c
libavfilter/af_afade.c
libavfilter/af_aformat.c
libavfilter/af_amerge.c
libavfilter/af_amix.c
libavfilter/af_anull.c
libavfilter/af_apad.c
libavfilter/af_aphaser.c
libavfilter/af_aresample.c
libavfilter/af_asetnsamples.c
libavfilter/af_asetrate.c
libavfilter/af_ashowinfo.c
libavfilter/af_astats.c
libavfilter/af_astreamsync.c
libavfilter/af_asyncts.c
libavfilter/af_atempo.c
libavfilter/af_biquads.c
libavfilter/af_channelmap.c
libavfilter/af_channelsplit.c
libavfilter/af_compand.c
libavfilter/af_earwax.c
libavfilter/af_join.c
libavfilter/af_ladspa.c
libavfilter/af_pan.c
libavfilter/af_replaygain.c
libavfilter/af_resample.c
libavfilter/af_silencedetect.c
libavfilter/af_volume.c
libavfilter/af_volumedetect.c
libavfilter/allfilters.c
libavfilter/asink_anullsink.c
libavfilter/asrc_aevalsrc.c
libavfilter/asrc_anullsrc.c
libavfilter/asrc_flite.c
libavfilter/asrc_sine.c
libavfilter/avf_avectorscope.c
libavfilter/avf_concat.c
libavfilter/avf_showspectrum.c
libavfilter/avf_showwaves.c
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/f_ebur128.c
libavfilter/f_interleave.c
libavfilter/f_perms.c
libavfilter/f_select.c
libavfilter/f_sendcmd.c
libavfilter/f_settb.c
libavfilter/f_zmq.c
libavfilter/fifo.c
libavfilter/setpts.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/trim.c
libavfilter/vf_alphamerge.c
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackdetect.c
libavfilter/vf_blackframe.c
libavfilter/vf_blend.c
libavfilter/vf_boxblur.c
libavfilter/vf_colorbalance.c
libavfilter/vf_colorchannelmixer.c
libavfilter/vf_colormatrix.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_curves.c
libavfilter/vf_dctdnoiz.c
libavfilter/vf_decimate.c
libavfilter/vf_delogo.c
libavfilter/vf_deshake.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_edgedetect.c
libavfilter/vf_extractplanes.c
libavfilter/vf_fade.c
libavfilter/vf_field.c
libavfilter/vf_fieldmatch.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_fps.c
libavfilter/vf_framestep.c
libavfilter/vf_frei0r.c
libavfilter/vf_geq.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_histeq.c
libavfilter/vf_histogram.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_hue.c
libavfilter/vf_idet.c
libavfilter/vf_il.c
libavfilter/vf_interlace.c
libavfilter/vf_kerndeint.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_lut3d.c
libavfilter/vf_mcdeint.c
libavfilter/vf_mergeplanes.c
libavfilter/vf_mp.c
libavfilter/vf_mpdecimate.c
libavfilter/vf_noise.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_owdenoise.c
libavfilter/vf_pad.c
libavfilter/vf_perspective.c
libavfilter/vf_phase.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_pp.c
libavfilter/vf_psnr.c
libavfilter/vf_pullup.c
libavfilter/vf_removelogo.c
libavfilter/vf_rotate.c
libavfilter/vf_sab.c
libavfilter/vf_scale.c
libavfilter/vf_separatefields.c
libavfilter/vf_setfield.c
libavfilter/vf_showinfo.c
libavfilter/vf_smartblur.c
libavfilter/vf_spp.c
libavfilter/vf_stereo3d.c
libavfilter/vf_subtitles.c
libavfilter/vf_super2xsai.c
libavfilter/vf_swapuv.c
libavfilter/vf_telecine.c
libavfilter/vf_thumbnail.c
libavfilter/vf_tile.c
libavfilter/vf_tinterlace.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_vidstabdetect.c
libavfilter/vf_vidstabtransform.c
libavfilter/vf_vignette.c
libavfilter/vf_w3fdif.c
libavfilter/vf_yadif.c
libavfilter/vsink_nullsink.c
libavfilter/vsrc_cellauto.c
libavfilter/vsrc_life.c
libavfilter/vsrc_mandelbrot.c
libavfilter/vsrc_mptestsrc.c
libavfilter/vsrc_testsrc.c