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>

libavfilter/defaults.c

@@ -271,4 +271,3 @@ AVFilterBufferRef *avfilter_null_get_audio_buffer(AVFilterLink *link, int perms,
 {
     return avfilter_get_audio_buffer(link->dst->outputs[0], perms, nb_samples);
 }
-

libavfilter/formats.c

@@ -357,3 +357,4 @@ int main(void)
 }
 
 #endif
+

libavfilter/vf_aspect.c

@@ -143,4 +143,3 @@ AVFilter avfilter_vf_setsar = {
                                   { .name = NULL}},
 };
 #endif /* CONFIG_SETSAR_FILTER */
-

libavfilter/vf_format.c

@@ -142,4 +142,3 @@ AVFilter avfilter_vf_noformat = {
                                   { .name = NULL}},
 };
 #endif /* CONFIG_NOFORMAT_FILTER */
-