• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 325f6e0a
    Michael Niedermayer authored
    
    
    * 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: default avatarMichael Niedermayer <michaelni@gmx.at>
    325f6e0a