• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · cabbd271
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cabbd271
ilbc.c 4.07 KB