From 94ee7da08d2af875f485d4f784d50726cf3078f4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 9 Feb 2013 16:19:27 +0100 Subject: [PATCH 1/2] 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/aacsbr.h | 6 +++--- libavcodec/asv.h | 3 +-- libavcodec/fmtconvert.h | 2 +- libavcodec/h264.h | 6 +++--- libavcodec/ivi_common.h | 2 +- libavcodec/mss12.h | 6 +++--- libavcodec/mss2dsp.h | 2 +- libavcodec/pnm.h | 4 ++-- libavcodec/psymodel.h | 12 ++++++------ libavcodec/vc1.h | 6 +++--- libavcodec/wma_common.h | 6 ++---- 11 files changed, 26 insertions(+), 29 deletions(-) diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 153070d3f2..9bc5e29d33 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 c353d05ea2..228bd18186 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -28,7 +28,6 @@ #include -#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 b879ee6422..1b534019f1 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 6216cb64ba..6eda2a693f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -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 * like SPS, PPS etc. */ -av_cold void ff_h264_free_context(H264Context *h); +void ff_h264_free_context(H264Context *h); /** * 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); int ff_h264_frame_start(H264Context *h); int ff_h264_decode_extradata(H264Context *h); -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 8ac41a5554..a3fb3140e2 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -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, 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 f5d03662b8..5b1fee8913 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 b3d67a1e57..34b095bdc5 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 702921fbdf..efba0d8183 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 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 */ diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 466a58ecde..6f24c0e4af 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -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_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 3a786c3ae6..61b1a35e02 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 */ From 040c565e51985477a8fa5e42d2ddfb26ebde6608 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 22 Feb 2013 22:06:37 +0100 Subject: [PATCH 2/2] doc: developer: Allow tabs in the vim configuration for Automake files While we do not use Automake in libav, this allows our config to be used more globally without introducing unwanted breakage. --- doc/developer.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer.texi b/doc/developer.texi index a30cc9dfaa..54c1ec667a 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -229,7 +229,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/