• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c065255b
    Michael Niedermayer authored
    * 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: default avatarMichael Niedermayer <michaelni@gmx.at>
    c065255b