Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-20 22:12:29 +01:00
commit 7b7f8d3ed0

View File

@ -45,7 +45,7 @@ void ff_resample_one_s32_neon(struct ResampleContext *c, void *dst0,
int dst_index, const void *src0, int dst_index, const void *src0,
unsigned int index, int frac); unsigned int index, int frac);
void ff_audio_resample_init_aarch64(ResampleContext *c, av_cold void ff_audio_resample_init_aarch64(ResampleContext *c,
enum AVSampleFormat sample_fmt) enum AVSampleFormat sample_fmt)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();