• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 416d2f7a
    Michael Niedermayer authored
    * qatar/master:
      vc1: export some functions
      configure: use HOSTCC_C/O in check_host_cc
      configure: use AS_O setting in check_as
      configure: use LD_O setting in check_ld()
      Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
      build: Restore dependency of acelp_filters.o on celp_math.o
      celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
      celp_math: Move ff_cos() to the only place it is used
      build: Use portable abstraction for linker/hostcc output file syntax
      configure: Fix shared library creation for OpenBSD
      vp56: Don't use DECLARE_ALIGN on a typedef name
      mss1: move code that will be reused by MSS2 decoder into separate file
      mss1: merge decode_intra() and decode_inter()
      avprobe: Get rid of ugly casts in the options table
      vf_hqdn3d: Remove a duplicate inline declaration
    
    Conflicts:
    	Makefile
    	configure
    	ffprobe.c
    	libavcodec/Makefile
    	libavcodec/amrnbdec.c
    	libavcodec/amrwbdec.c
    	libavcodec/celp_math.c
    	libavcodec/celp_math.h
    	libavcodec/dsputil.c
    	libavcodec/lsp.c
    	libavcodec/mss1.c
    	libavcodec/ra288.c
    	libavcodec/vc1dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    416d2f7a
lsp.c 6.82 KB