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
..
2012-01-28 11:04:19 +01:00
2011-07-05 02:26:17 +02:00
2011-09-16 20:44:27 +02:00
2011-11-24 03:32:24 +01:00
2011-11-06 00:05:14 +01:00
2011-12-31 16:25:11 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 15:21:08 +01:00
2012-01-01 16:43:32 +01:00
2011-11-06 00:05:14 +01:00
2012-01-24 10:43:42 +01:00
2012-01-08 17:08:55 +01:00
2012-01-05 21:53:18 +01:00
2011-09-16 00:46:41 +02:00
2012-01-08 17:08:55 +01:00
2011-11-06 00:05:14 +01:00
2011-11-24 03:32:24 +01:00
2011-08-21 11:37:57 +02:00
2011-12-04 21:13:22 +01:00
2011-11-26 01:12:08 +01:00
2011-12-26 04:10:47 +01:00
2011-12-26 04:10:47 +01:00
2012-01-22 19:30:40 +01:00
2012-01-13 01:29:48 +01:00
2011-09-28 08:02:53 +02:00
2012-01-24 11:38:36 +01:00
2011-12-08 21:19:23 +01:00
2011-12-25 16:18:57 +01:00
2012-01-29 00:34:59 +01:00
2011-10-28 02:06:50 +02:00
2011-10-28 02:06:50 +02:00
2012-01-29 00:34:59 +01:00
2011-05-17 03:05:36 +02:00
2012-01-24 11:38:36 +01:00
2011-09-28 08:02:53 +02:00
2012-01-12 16:32:54 +01:00
2010-01-16 04:49:02 +00:00
2012-01-26 02:23:56 +01:00
2011-12-22 10:09:42 +01:00
2011-12-26 04:10:47 +01:00
2011-12-13 21:08:43 +01:00
2011-10-20 15:59:20 +02:00
2012-01-24 11:38:36 +01:00
2012-01-29 00:34:59 +01:00
2011-11-26 10:42:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-25 04:45:41 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-21 05:22:49 +01:00
2011-11-06 00:05:14 +01:00
2012-01-11 18:14:03 +01:00
2012-01-20 00:16:27 +01:00
2011-11-06 00:05:14 +01:00
2011-11-21 19:35:33 +01:00
2012-01-29 00:34:59 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-26 02:23:56 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-21 14:40:46 +01:00
2011-11-06 00:05:14 +01:00
2012-01-15 09:12:03 +01:00
2011-11-14 05:42:10 +01:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-16 07:48:23 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 11:15:21 +01:00
2012-01-01 16:16:50 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-20 00:16:27 +01:00
2011-11-06 00:05:14 +01:00
2012-01-13 01:29:48 +01:00
2011-09-19 12:43:10 +02:00
2011-12-11 11:55:33 +01:00
2012-01-20 00:16:27 +01:00
2011-12-11 14:14:01 +01:00
2012-01-21 14:40:46 +01:00
2011-11-06 00:05:14 +01:00
2012-01-17 12:03:30 +01:00
2011-04-03 08:46:19 +02:00