[FFmpeg-cvslog] Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 20 22:12:29 2015 +0100| [7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4] | committer: Michael Niedermayer

Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4
---