ffmpeg/libavresample
Michael Niedermayer cabbd271a5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
  flvdec: remove incomplete, disabled seeking code
  mem: add support for _aligned_malloc() as found on Windows
  lavc: Extend the documentation for avcodec_init_packet
  flvdec: remove incomplete, disabled seeking code
  http: replace atoll() with strtoll()
  mpegts: remove unused/incomplete/broken seeking code
  af_amix: allow float planar sample format as input
  af_amix: use AVFloatDSPContext.vector_fmac_scalar()
  float_dsp: add x86-optimized functions for vector_fmac_scalar()
  float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil
  lavr: Add x86-optimized function for flt to s32 conversion
  lavr: Add x86-optimized function for flt to s16 conversion
  lavr: Add x86-optimized functions for s32 to flt conversion
  lavr: Add x86-optimized functions for s32 to s16 conversion
  lavr: Add x86-optimized functions for s16 to flt conversion
  lavr: Add x86-optimized function for s16 to s32 conversion
  rtpenc: Support packetizing iLBC
  rtpdec: Add a depacketizer for iLBC
  Implement the iLBC storage file format
  mov: Support muxing/demuxing iLBC
  ...

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/dsputil.c
	libavcodec/version.h
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/version.h
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-19 20:53:27 +02:00
..
x86 lavr: Add x86-optimized function for flt to s32 conversion 2012-06-18 16:16:59 -04:00
Makefile
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix.c Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
audio_mix.h
audio_mix_matrix.c Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
avresample-test.c
avresample.h Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
internal.h Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
libavresample.v
options.c Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00
resample.c
resample.h
utils.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
version.h Add Dolby/DPLII downmix support to libavresample 2012-06-18 10:55:00 -04:00