From 94ee7da08d2af875f485d4f784d50726cf3078f4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 9 Feb 2013 16:19:27 +0100 Subject: Remove pointless av_cold attributes in header files The init functions marked as av_cold have to be executed in any case, so there is no gain from trying to mark paths leading to such functions as unlikely. --- libavcodec/psymodel.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavcodec/psymodel.h') diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 34b20d7d04..1cc30668e4 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -137,9 +137,9 @@ typedef struct FFPsyModel { * * @return zero if successful, a negative value if not */ -av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens, - const uint8_t **bands, const int* num_bands, - int num_groups, const uint8_t *group_map); +int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens, + const uint8_t **bands, const int *num_bands, + int num_groups, const uint8_t *group_map); /** * Determine what group a channel belongs to. @@ -156,7 +156,7 @@ FFPsyChannelGroup *ff_psy_find_group(FFPsyContext *ctx, int channel); * * @param ctx model context */ -av_cold void ff_psy_end(FFPsyContext *ctx); +void ff_psy_end(FFPsyContext *ctx); /************************************************************************** @@ -168,7 +168,7 @@ struct FFPsyPreprocessContext; /** * psychoacoustic model audio preprocessing initialization */ -av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *avctx); +struct FFPsyPreprocessContext *ff_psy_preprocess_init(AVCodecContext *avctx); /** * Preprocess several channel in audio frame in order to compress it better. @@ -182,6 +182,6 @@ void ff_psy_preprocess(struct FFPsyPreprocessContext *ctx, float **audio, int ch /** * Cleanup audio preprocessing module. */ -av_cold void ff_psy_preprocess_end(struct FFPsyPreprocessContext *ctx); +void ff_psy_preprocess_end(struct FFPsyPreprocessContext *ctx); #endif /* AVCODEC_PSYMODEL_H */ -- cgit v1.2.1