FFmpeg/libavcodec
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
..
2012-04-22 22:26:55 +02:00
2012-06-11 21:40:43 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-06-03 01:53:36 +02:00
2012-05-20 16:29:07 +02:00
2012-06-18 21:44:22 +02:00
2012-05-08 00:25:25 +02:00
2012-05-28 18:20:39 +02:00
2012-06-02 19:56:10 +02:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-18 23:34:11 +02:00
2012-05-25 13:40:12 +02:00
2012-05-08 22:04:01 +02:00
2012-06-14 15:48:43 +00:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +02:00
2012-05-25 13:40:12 +02:00
2012-06-07 21:07:17 +02:00
2012-05-31 20:25:23 +02:00
2012-06-18 21:44:48 +02:00
2012-05-31 05:07:51 +02:00
2012-05-25 13:40:12 +02:00
2012-06-10 23:27:17 +02:00
2012-05-18 23:34:11 +02:00
2012-06-04 20:01:36 +02:00
2012-04-22 22:26:55 +02:00
2012-05-28 17:24:13 +02:00
2012-05-09 11:58:08 +02:00
2012-05-18 23:34:11 +02:00
2012-06-03 15:01:34 +02:00
2012-04-22 22:26:55 +02:00
2012-06-02 23:43:31 +02:00
2012-06-06 13:09:02 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-06-17 17:09:34 +02:00
2012-05-25 13:40:12 +02:00
2012-06-06 21:18:14 +02:00
2012-06-01 00:35:06 +02:00
2012-06-10 23:36:22 +02:00
2012-06-05 12:13:39 +02:00
2012-06-08 18:24:47 +02:00
2012-06-11 20:13:31 +02:00
2012-06-19 17:13:45 +02:00
2012-05-22 11:56:18 +00:00
2012-06-07 18:01:09 +02:00
2012-05-08 11:02:12 +02:00
2012-06-10 15:40:24 +02:00
2012-05-05 02:02:56 +02:00
2012-06-17 19:50:58 +02:00
2012-04-21 18:56:19 +01:00
2012-06-06 21:18:47 +02:00
2012-05-28 17:24:13 +02:00