Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:12:29 +0000 (22:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:13:07 +0000 (22:13 +0100)
commit7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4
treed3f9782c9f3af696982d44f9f0731eaa79e1518a
parentdc6eadaa458aa2e3ce407459b37e8f8403e455b4
parentdf0891fc8f32db3ced797cd6ebff9492fda01b99
Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
  libavresample: Annotate AARCH64 init function with av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/aarch64/resample_init.c