1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
..
2011-11-25 13:19:54 +00:00
2012-01-28 21:20:42 +01:00
2012-01-03 16:28:17 -05:00
2012-01-14 01:17:06 +01:00
2012-01-17 20:16:35 +01:00
2012-01-14 17:23:57 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2012-01-14 04:47:27 +01:00
2011-12-28 22:05:24 +01:00
2012-01-28 21:59:01 +01:00
2012-01-26 17:05:57 +01:00
2012-01-19 17:12:43 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2011-12-11 00:32:25 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2012-01-17 20:16:35 +01:00
2012-01-22 14:41:15 +01:00
2011-12-30 20:00:53 +01:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-12-23 05:58:32 +01:00
2012-01-26 19:54:38 +01:00
2012-01-15 14:13:25 +01:00
2012-01-25 18:55:32 +01:00
2012-01-12 16:32:55 +01:00
2012-01-26 17:30:49 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2011-11-24 15:39:41 +01:00
2012-01-07 00:11:43 +01:00
2012-01-12 16:32:55 +01:00
2011-12-17 05:04:56 +01:00
2012-01-28 22:08:20 +01:00
2012-01-23 19:47:49 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2011-12-30 20:00:53 +01:00
2012-01-28 11:04:19 +01:00
2012-01-25 23:40:06 +01:00
2012-01-12 17:02:13 +01:00
2011-12-13 21:08:43 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-30 20:00:53 +01:00
2011-12-23 11:39:41 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 18:14:13 +01:00
2012-01-14 22:58:19 +01:00
2011-12-13 19:54:31 +01:00
2012-01-28 22:08:21 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-16 19:21:24 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00