Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove pointless av_cold attributes in header files

Browse Source 
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.
pull/10/head
Diego Biurrun 12 years ago
parent b5f536d24b
commit 94ee7da08d
11 changed files with 26 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/aacsbr.h
  2. 3
      libavcodec/asv.h
  3. 2
      libavcodec/fmtconvert.h
  4. 6
      libavcodec/h264.h
  5. 2
      libavcodec/ivi_common.h
  6. 4
      libavcodec/mss12.h
  7. 2
      libavcodec/mss2dsp.h
  8. 4
      libavcodec/pnm.h
  9. 8
      libavcodec/psymodel.h
  10. 6
      libavcodec/vc1.h
  11. 4
      libavcodec/wma_common.h

6
libavcodec/aacsbr.h
Unescape View File

@ -34,11 +34,11 @@
#include "sbr.h" #include "sbr.h"
/** Initialize SBR. */ /** Initialize SBR. */
av_cold void ff_aac_sbr_init(void); void ff_aac_sbr_init(void);
/** Initialize one SBR context. */ /** Initialize one SBR context. */
av_cold void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr); void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr);
/** Close one SBR context. */ /** Close one SBR context. */
av_cold void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr); void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr);
/** Decode one SBR element. */ /** Decode one SBR element. */
int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
GetBitContext *gb, int crc, int cnt, int id_aac); GetBitContext *gb, int crc, int cnt, int id_aac);

3
libavcodec/asv.h
Unescape View File

@ -28,7 +28,6 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
@ -62,6 +61,6 @@ extern const uint8_t ff_asv_dc_ccp_tab[8][2];
extern const uint8_t ff_asv_ac_ccp_tab[16][2]; extern const uint8_t ff_asv_ac_ccp_tab[16][2];
extern const uint8_t ff_asv2_level_tab[63][2]; extern const uint8_t ff_asv2_level_tab[63][2];
av_cold void ff_asv_common_init(AVCodecContext *avctx); void ff_asv_common_init(AVCodecContext *avctx);
#endif /* AVCODEC_ASV_H */ #endif /* AVCODEC_ASV_H */

2
libavcodec/fmtconvert.h
Unescape View File

@ -87,7 +87,7 @@ typedef struct FmtConvertContext {
void ff_float_interleave_c(float *dst, const float **src, unsigned int len, void ff_float_interleave_c(float *dst, const float **src, unsigned int len,
int channels); int channels);
av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx);
void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx);
void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx);

6
libavcodec/h264.h
Unescape View File

@ -660,7 +660,7 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src,
* Free any data that may have been allocated in the H264 context * Free any data that may have been allocated in the H264 context
* like SPS, PPS etc. * like SPS, PPS etc.
*/ */
av_cold void ff_h264_free_context(H264Context *h); void ff_h264_free_context(H264Context *h);
/** /**
* Reconstruct bitstream slice_type. * Reconstruct bitstream slice_type.
@ -707,8 +707,8 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma);
void ff_h264_hl_decode_mb(H264Context *h); void ff_h264_hl_decode_mb(H264Context *h);
int ff_h264_frame_start(H264Context *h); int ff_h264_frame_start(H264Context *h);
int ff_h264_decode_extradata(H264Context *h); int ff_h264_decode_extradata(H264Context *h);
av_cold int ff_h264_decode_init(AVCodecContext *avctx); int ff_h264_decode_init(AVCodecContext *avctx);
av_cold void ff_h264_decode_init_vlc(void); void ff_h264_decode_init_vlc(void);
/** /**
* Decode a macroblock * Decode a macroblock

2
libavcodec/ivi_common.h
Unescape View File

@ -314,6 +314,6 @@ int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height);
int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt); AVPacket *avpkt);
av_cold int ff_ivi_decode_close(AVCodecContext *avctx); int ff_ivi_decode_close(AVCodecContext *avctx);
#endif /* AVCODEC_IVI_COMMON_H */ #endif /* AVCODEC_IVI_COMMON_H */

4
libavcodec/mss12.h
Unescape View File

@ -95,9 +95,9 @@ int ff_mss12_decode_rect(SliceContext *ctx, ArithCoder *acoder,
int x, int y, int width, int height); int x, int y, int width, int height);
void ff_mss12_model_update(Model *m, int val); void ff_mss12_model_update(Model *m, int val);
void ff_mss12_slicecontext_reset(SliceContext *sc); void ff_mss12_slicecontext_reset(SliceContext *sc);
av_cold int ff_mss12_decode_init(MSS12Context *c, int version, int ff_mss12_decode_init(MSS12Context *c, int version,
SliceContext *sc1, SliceContext *sc2); SliceContext *sc1, SliceContext *sc2);
av_cold int ff_mss12_decode_end(MSS12Context *ctx); int ff_mss12_decode_end(MSS12Context *ctx);
#define ARITH_GET_BIT(VERSION) \ #define ARITH_GET_BIT(VERSION) \
static int arith ## VERSION ## _get_bit(ArithCoder *c) \ static int arith ## VERSION ## _get_bit(ArithCoder *c) \

2
libavcodec/mss2dsp.h
Unescape View File

@ -45,6 +45,6 @@ typedef struct MSS2DSPContext {
void (*upsample_plane)(uint8_t *plane, int plane_stride, int w, int h); void (*upsample_plane)(uint8_t *plane, int plane_stride, int w, int h);
} MSS2DSPContext; } MSS2DSPContext;
av_cold void ff_mss2dsp_init(MSS2DSPContext* dsp); void ff_mss2dsp_init(MSS2DSPContext *dsp);
#endif /* AVCODEC_MSS2DSP_H */ #endif /* AVCODEC_MSS2DSP_H */

4
libavcodec/pnm.h
Unescape View File

@ -34,7 +34,7 @@ typedef struct PNMContext {
} PNMContext; } PNMContext;
int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s);
av_cold int ff_pnm_end(AVCodecContext *avctx); int ff_pnm_end(AVCodecContext *avctx);
av_cold int ff_pnm_init(AVCodecContext *avctx); int ff_pnm_init(AVCodecContext *avctx);
#endif /* AVCODEC_PNM_H */ #endif /* AVCODEC_PNM_H */

8
libavcodec/psymodel.h
Unescape View File

@ -137,7 +137,7 @@ typedef struct FFPsyModel {
* *
* @return zero if successful, a negative value if not * @return zero if successful, a negative value if not
*/ */
av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens, int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens,
const uint8_t **bands, const int *num_bands, const uint8_t **bands, const int *num_bands,
int num_groups, const uint8_t *group_map); int num_groups, const uint8_t *group_map);
@ -156,7 +156,7 @@ FFPsyChannelGroup *ff_psy_find_group(FFPsyContext *ctx, int channel);
* *
* @param ctx model context * @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 * 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. * 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. * 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 */ #endif /* AVCODEC_PSYMODEL_H */

6
libavcodec/vc1.h
Unescape View File

@ -455,9 +455,9 @@ int ff_vc1_parse_frame_header (VC1Context *v, GetBitContext *gb);
int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb); int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb);
int ff_vc1_init_common(VC1Context *v); int ff_vc1_init_common(VC1Context *v);
av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v); int ff_vc1_decode_init_alloc_tables(VC1Context *v);
av_cold void ff_vc1_init_transposed_scantables(VC1Context *v); void ff_vc1_init_transposed_scantables(VC1Context *v);
av_cold int ff_vc1_decode_end(AVCodecContext *avctx); int ff_vc1_decode_end(AVCodecContext *avctx);
void ff_vc1_decode_blocks(VC1Context *v); void ff_vc1_decode_blocks(VC1Context *v);
#endif /* AVCODEC_VC1_H */ #endif /* AVCODEC_VC1_H */

4
libavcodec/wma_common.h
Unescape View File

@ -21,9 +21,7 @@
#ifndef AVCODEC_WMA_COMMON_H #ifndef AVCODEC_WMA_COMMON_H
#define AVCODEC_WMA_COMMON_H #define AVCODEC_WMA_COMMON_H
#include "libavutil/attributes.h" int ff_wma_get_frame_len_bits(int sample_rate, int version,
av_cold int ff_wma_get_frame_len_bits(int sample_rate, int version,
unsigned int decode_flags); unsigned int decode_flags);
#endif /* AVCODEC_WMA_COMMON_H */ #endif /* AVCODEC_WMA_COMMON_H */

Write Preview
Loading…
Cancel
Save