Merge remote-tracking branch 'qatar/master'
* 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:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- Makefile 2 additions, 2 deletionsMakefile
- common.mak 1 addition, 1 deletioncommon.mak
- configure 16 additions, 3 deletionsconfigure
- ffprobe.c 11 additions, 11 deletionsffprobe.c
- libavcodec/Makefile 6 additions, 6 deletionslibavcodec/Makefile
- libavcodec/acelp_pitch_delay.c 1 addition, 1 deletionlibavcodec/acelp_pitch_delay.c
- libavcodec/acelp_vectors.c 3 additions, 3 deletionslibavcodec/acelp_vectors.c
- libavcodec/amrnbdec.c 7 additions, 4 deletionslibavcodec/amrnbdec.c
- libavcodec/amrwbdec.c 13 additions, 8 deletionslibavcodec/amrwbdec.c
- libavcodec/celp_math.c 0 additions, 103 deletionslibavcodec/celp_math.c
- libavcodec/celp_math.h 0 additions, 8 deletionslibavcodec/celp_math.h
- libavcodec/dsputil.c 16 additions, 16 deletionslibavcodec/dsputil.c
- libavcodec/dsputil.h 11 additions, 4 deletionslibavcodec/dsputil.h
- libavcodec/lsp.c 24 additions, 2 deletionslibavcodec/lsp.c
- libavcodec/mss1.c 26 additions, 631 deletionslibavcodec/mss1.c
- libavcodec/mss12.c 581 additions, 0 deletionslibavcodec/mss12.c
- libavcodec/mss12.h 83 additions, 0 deletionslibavcodec/mss12.h
- libavcodec/qcelpdec.c 6 additions, 7 deletionslibavcodec/qcelpdec.c
- libavcodec/ra288.c 2 additions, 3 deletionslibavcodec/ra288.c
- libavcodec/sipr.c 4 additions, 5 deletionslibavcodec/sipr.c
Loading
Please register or sign in to comment