Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:45:44 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:45:50 +0000 (23:45 +0200)
commit59bfddfcdacf53a9f3dd0996c276b8b33c0e4e70
treeff9c707183f7ba8e587c7ee2a077d4b5c0a372f6
parent96a4d0c1c3cf32ca9c98608b8c852d5c64f436bf
parent8f9fe6ae3461ce270bce6b7083fda5ec314cdad4
Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'

* commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4':
  aarch64: NEON fixed/floating point MPADSP apply_window

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aarch64/mpegaudiodsp_init.c
libavcodec/aarch64/mpegaudiodsp_neon.S
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h