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)
* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
  libavresample: Annotate AARCH64 init function with av_cold

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

Simple merge