• 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
Name
Last commit
Last update
compat Loading commit data...
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffmpeg.h Loading commit data...
ffmpeg_filter.c Loading commit data...
ffmpeg_opt.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...