diff options
| -rw-r--r-- | doc/developer.texi | 2 | ||||
| -rw-r--r-- | libavcodec/aacsbr.h | 6 | ||||
| -rw-r--r-- | libavcodec/asv.h | 3 | ||||
| -rw-r--r-- | libavcodec/fmtconvert.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264.h | 6 | ||||
| -rw-r--r-- | libavcodec/ivi_common.h | 2 | ||||
| -rw-r--r-- | libavcodec/mss12.h | 6 | ||||
| -rw-r--r-- | libavcodec/mss2dsp.h | 2 | ||||
| -rw-r--r-- | libavcodec/pnm.h | 4 | ||||
| -rw-r--r-- | libavcodec/psymodel.h | 12 | ||||
| -rw-r--r-- | libavcodec/vc1.h | 6 | ||||
| -rw-r--r-- | libavcodec/wma_common.h | 6 |
12 files changed, 27 insertions, 30 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 5acdce9643..fe4b40ac4a 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -203,7 +203,7 @@ set softtabstop=4 set cindent set cinoptions=(0 " Allow tabs in Makefiles. -autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8 +autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8 " Trailing whitespace and tabs are forbidden, so highlight them. highlight ForbiddenWhitespace ctermbg=red guibg=red match ForbiddenWhitespace /\s\+$\|\t/ diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 5d5de8152a..f5e33ab688 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -34,11 +34,11 @@ #include "sbr.h" /** Initialize SBR. */ -av_cold void ff_aac_sbr_init(void); +void ff_aac_sbr_init(void); /** 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. */ -av_cold void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr); +void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr); /** Decode one SBR element. */ int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, GetBitContext *gb, int crc, int cnt, int id_aac); diff --git a/libavcodec/asv.h b/libavcodec/asv.h index 72d98c0b33..ca67c67daa 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -28,7 +28,6 @@ #include <stdint.h> -#include "libavutil/attributes.h" #include "libavutil/mem.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_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 */ diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index ab2caa2089..3fb9f4e46b 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -87,7 +87,7 @@ typedef struct FmtConvertContext { void ff_float_interleave_c(float *dst, const float **src, unsigned int len, 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_altivec(FmtConvertContext *c, AVCodecContext *avctx); diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ccaf8bb125..d391b229c7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -687,7 +687,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 * like SPS, PPS etc. */ -av_cold void ff_h264_free_context(H264Context *h); +void ff_h264_free_context(H264Context *h); /** * Reconstruct bitstream slice_type. @@ -734,8 +734,8 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma); void ff_h264_hl_decode_mb(H264Context *h); int ff_h264_frame_start(H264Context *h); int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size); -av_cold int ff_h264_decode_init(AVCodecContext *avctx); -av_cold void ff_h264_decode_init_vlc(void); +int ff_h264_decode_init(AVCodecContext *avctx); +void ff_h264_decode_init_vlc(void); /** * Decode a macroblock diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index fcea5f6b4f..86acbe67fc 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -317,6 +317,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, AVPacket *avpkt); -av_cold int ff_ivi_decode_close(AVCodecContext *avctx); +int ff_ivi_decode_close(AVCodecContext *avctx); #endif /* AVCODEC_IVI_COMMON_H */ diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index 42ceab568f..a3f9a7ca70 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -95,9 +95,9 @@ int ff_mss12_decode_rect(SliceContext *ctx, ArithCoder *acoder, int x, int y, int width, int height); void ff_mss12_model_update(Model *m, int val); void ff_mss12_slicecontext_reset(SliceContext *sc); -av_cold int ff_mss12_decode_init(MSS12Context *c, int version, - SliceContext* sc1, SliceContext *sc2); -av_cold int ff_mss12_decode_end(MSS12Context *ctx); +int ff_mss12_decode_init(MSS12Context *c, int version, + SliceContext *sc1, SliceContext *sc2); +int ff_mss12_decode_end(MSS12Context *ctx); #define ARITH_GET_BIT(VERSION) \ static int arith ## VERSION ## _get_bit(ArithCoder *c) \ diff --git a/libavcodec/mss2dsp.h b/libavcodec/mss2dsp.h index e04aab04d5..4d2966778b 100644 --- a/libavcodec/mss2dsp.h +++ b/libavcodec/mss2dsp.h @@ -45,6 +45,6 @@ typedef struct MSS2DSPContext { void (*upsample_plane)(uint8_t *plane, int plane_stride, int w, int h); } MSS2DSPContext; -av_cold void ff_mss2dsp_init(MSS2DSPContext* dsp); +void ff_mss2dsp_init(MSS2DSPContext *dsp); #endif /* AVCODEC_MSS2DSP_H */ diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h index ac4b1084fb..bb2cc77b87 100644 --- a/libavcodec/pnm.h +++ b/libavcodec/pnm.h @@ -34,7 +34,7 @@ typedef struct PNMContext { } PNMContext; int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); -av_cold int ff_pnm_end(AVCodecContext *avctx); -av_cold int ff_pnm_init(AVCodecContext *avctx); +int ff_pnm_end(AVCodecContext *avctx); +int ff_pnm_init(AVCodecContext *avctx); #endif /* AVCODEC_PNM_H */ diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 37c8191724..d1a126a88f 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -139,9 +139,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. @@ -158,7 +158,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); /************************************************************************** @@ -170,7 +170,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. @@ -184,6 +184,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 */ diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 3a580dc228..596d4d35e5 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -454,9 +454,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_init_common(VC1Context *v); -av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v); -av_cold void ff_vc1_init_transposed_scantables(VC1Context *v); -av_cold int ff_vc1_decode_end(AVCodecContext *avctx); +int ff_vc1_decode_init_alloc_tables(VC1Context *v); +void ff_vc1_init_transposed_scantables(VC1Context *v); +int ff_vc1_decode_end(AVCodecContext *avctx); void ff_vc1_decode_blocks(VC1Context *v); #endif /* AVCODEC_VC1_H */ diff --git a/libavcodec/wma_common.h b/libavcodec/wma_common.h index 84d2cda118..55404afc45 100644 --- a/libavcodec/wma_common.h +++ b/libavcodec/wma_common.h @@ -21,9 +21,7 @@ #ifndef AVCODEC_WMA_COMMON_H #define AVCODEC_WMA_COMMON_H -#include "libavutil/attributes.h" - -av_cold int ff_wma_get_frame_len_bits(int sample_rate, int version, - unsigned int decode_flags); +int ff_wma_get_frame_len_bits(int sample_rate, int version, + unsigned int decode_flags); #endif /* AVCODEC_WMA_COMMON_H */ |