ffmpeg/libavfilter
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-12-31 16:25:11 +01:00
2011-12-27 15:21:08 +01:00
2012-01-24 10:43:42 +01:00
2011-12-04 21:13:22 +01:00
2012-01-24 11:38:36 +01:00
2011-12-13 21:08:43 +01:00
2012-01-24 11:38:36 +01:00
2011-11-25 04:45:41 +01:00
2011-11-14 05:42:10 +01:00
2011-12-11 11:55:33 +01:00