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-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2011-08-03 11:56:58 +03:00
2011-10-22 11:11:08 +02:00
2011-07-06 00:29:59 +01:00
2011-10-24 01:01:21 +02:00
2012-01-14 02:22:09 +01:00
2011-12-15 01:02:58 +00:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-30 04:32:24 +02:00
2011-11-24 03:32:24 +01:00
2011-07-22 12:08:52 +02:00
2011-07-21 16:28:53 +02:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-05-27 23:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-06-24 03:07:04 +02:00
2011-04-04 02:15:12 +02:00
2011-07-06 01:34:08 +02:00
2012-01-21 01:33:31 +01:00
2011-11-24 03:32:24 +01:00
2011-03-19 13:33:20 +00:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-12-06 13:48:25 +00:00
2011-10-22 01:16:41 +02:00
2011-12-07 02:04:00 +01:00
2011-11-24 03:32:24 +01:00
2011-10-21 01:00:41 -07:00
2011-07-11 04:23:25 +02:00
2011-11-24 03:32:24 +01:00
2011-06-13 12:30:22 +01:00
2012-01-29 00:34:59 +01:00
2011-06-24 03:07:04 +02:00
2011-04-03 22:39:52 +01:00
2011-11-24 03:32:24 +01:00
2011-06-23 07:31:54 +01:00
2011-06-13 11:33:44 +01:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-07-16 19:43:35 +02:00
2011-06-24 03:07:04 +02:00
2011-12-02 19:59:18 +00:00
2011-06-24 03:07:04 +02:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-16 14:36:01 +00:00
2011-12-16 14:36:01 +00:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-14 02:22:09 +01:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-05-22 04:53:19 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-12-03 03:00:30 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
c065255bba