Merge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 17:43:37 +0000 (14:43 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 17:43:37 +0000 (14:43 -0300)
commit5694427dc384cb6f35fc84d87615854d53c2de3a
tree75612937cd40b35f5943f8d1055266fca479bbf5
parent0ad9aff0227a841df462134510614af1bf044874
parent72a19f4013ec2c7f8581416f8ad4bf81df163fb6
Merge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'

* commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6':
  mpegaudiodsp: aarch64: Adjust function prototype after 2caa93b813adc5dbb7771dfe615da826a2947d18

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/aarch64/mpegaudiodsp_init.c