diff options
| -rw-r--r-- | libavcodec/aacdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv5te.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1.c | 4 | ||||
| -rw-r--r-- | libavcodec/fmtconvert.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/ivi_common.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodsp_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/tiffenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/wma_common.c | 2 | ||||
| -rw-r--r-- | libavcodec/wma_common.h | 2 | ||||
| -rw-r--r-- | libavcodec/wmaprodec.c | 2 | ||||
| -rw-r--r-- | libavdevice/fbdev.c | 4 | ||||
| -rw-r--r-- | libavutil/lfg.c | 2 |
15 files changed, 21 insertions, 21 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 3038e9a1c8..90840b5e87 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2760,7 +2760,7 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, return muxlength; } -av_cold static int latm_decode_init(AVCodecContext *avctx) +static av_cold int latm_decode_init(AVCodecContext *avctx) { struct LATMContext *latmctx = avctx->priv_data; int ret = aac_decode_init(avctx); diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index b5ac2068d5..ec7016ef20 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -25,7 +25,7 @@ void ff_dca_lfe_fir_neon(float *out, const float *in, const float *coefs, int decifactor, float scale); -void av_cold ff_dcadsp_init_arm(DCADSPContext *s) +av_cold void ff_dcadsp_init_arm(DCADSPContext *s) { if (HAVE_NEON) s->lfe_fir = ff_dca_lfe_fir_neon; diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c index e0224dabfb..d74ca424b9 100644 --- a/libavcodec/arm/dsputil_init_armv5te.c +++ b/libavcodec/arm/dsputil_init_armv5te.c @@ -27,7 +27,7 @@ void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, DCTELEM *data); void ff_prefetch_arm(void *mem, int stride, int h); -void av_cold ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_armv5te(DSPContext *c, AVCodecContext *avctx) { if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && (avctx->idct_algo == FF_IDCT_AUTO || diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index eff4ee38c2..aa6de3f7a7 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -70,7 +70,7 @@ int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int ff_pix_norm1_armv6(uint8_t *pix, int line_size); int ff_pix_sum_armv6(uint8_t *pix, int line_size); -void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index d2324fa41b..497c9a17e2 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -322,7 +322,7 @@ do{\ #undef put_rac } -static void av_noinline put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ +static av_noinline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){ put_symbol_inline(c, state, v, is_signed, NULL, NULL); } @@ -346,7 +346,7 @@ static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, in } } -static int av_noinline get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ +static av_noinline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){ return get_symbol_inline(c, state, is_signed); } diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index 1b534019f1..b879ee6422 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); -void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); +av_cold 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.c b/libavcodec/h264.c index 3b1fdb2ccf..fe11686941 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2424,17 +2424,17 @@ hl_decode_mb_simple(1, 16) /** * Process a macroblock; this handles edge cases, such as interlacing. */ -static void av_noinline hl_decode_mb_complex(H264Context *h) +static av_noinline void hl_decode_mb_complex(H264Context *h) { hl_decode_mb_internal(h, 0, h->pixel_shift); } -static void av_noinline hl_decode_mb_444_complex(H264Context *h) +static av_noinline void hl_decode_mb_444_complex(H264Context *h) { hl_decode_mb_444_internal(h, 0, h->pixel_shift); } -static void av_noinline hl_decode_mb_444_simple(H264Context *h) +static av_noinline void hl_decode_mb_444_simple(H264Context *h) { hl_decode_mb_444_internal(h, 1, 0); } diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 670be5e7f2..b930e1517d 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -164,7 +164,7 @@ void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src) memcpy(dst->xbits, src->xbits, src->num_rows); } -int av_cold ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg) +av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg) { int p, b; uint32_t b_width, b_height, align_fac, width_aligned, height_aligned, buf_size; @@ -226,7 +226,7 @@ int av_cold ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg) return 0; } -void av_cold ff_ivi_free_buffers(IVIPlaneDesc *planes) +av_cold void ff_ivi_free_buffers(IVIPlaneDesc *planes) { int p, b, t; @@ -246,7 +246,7 @@ void av_cold ff_ivi_free_buffers(IVIPlaneDesc *planes) } } -int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height) +av_cold int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height) { int p, b, x, y, x_tiles, y_tiles, t_width, t_height; IVIBandDesc *band; diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index d616f8aec9..8a521d9d0c 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -192,7 +192,7 @@ void RENAME(ff_mpa_synth_filter)(MPADSPContext *s, MPA_INT *synth_buf_ptr, *synth_buf_offset = offset; } -void av_cold RENAME(ff_mpa_synth_init)(MPA_INT *window) +av_cold void RENAME(ff_mpa_synth_init)(MPA_INT *window) { int i, j; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 50fee906e9..776a1489cf 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -74,7 +74,7 @@ typedef struct TiffEncoderContext { * @param need Needed bytes * @return 0 - ok, 1 - no free space */ -inline static int check_size(TiffEncoderContext * s, uint64_t need) +static inline int check_size(TiffEncoderContext * s, uint64_t need) { if (s->buf_size < *s->buf - s->buf_start + need) { *s->buf = s->buf_start + s->buf_size + 1; diff --git a/libavcodec/wma_common.c b/libavcodec/wma_common.c index 6ba5337f6a..d1d8045d62 100644 --- a/libavcodec/wma_common.c +++ b/libavcodec/wma_common.c @@ -28,7 +28,7 @@ *@param decode_flags codec compression features *@return log2 of the number of output samples per frame */ -int av_cold 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) { diff --git a/libavcodec/wma_common.h b/libavcodec/wma_common.h index cc4e38e149..3a786c3ae6 100644 --- a/libavcodec/wma_common.h +++ b/libavcodec/wma_common.h @@ -23,7 +23,7 @@ #include "libavutil/attributes.h" -int av_cold 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); #endif /* AVCODEC_WMA_COMMON_H */ diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index ce87aeffc2..6bc9fad983 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -237,7 +237,7 @@ typedef struct WMAProDecodeCtx { *@brief helper function to print the most important members of the context *@param s context */ -static void av_cold dump_context(WMAProDecodeCtx *s) +static av_cold void dump_context(WMAProDecodeCtx *s) { #define PRINT(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %d\n", a, b); #define PRINT_HEX(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %x\n", a, b); diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index f1889ef79e..f79893a6d4 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -95,7 +95,7 @@ typedef struct { uint8_t *data; ///< framebuffer data } FBDevContext; -av_cold static int fbdev_read_header(AVFormatContext *avctx) +static av_cold int fbdev_read_header(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; AVStream *st = NULL; @@ -233,7 +233,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) return fbdev->frame_size; } -av_cold static int fbdev_read_close(AVFormatContext *avctx) +static av_cold int fbdev_read_close(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; diff --git a/libavutil/lfg.c b/libavutil/lfg.c index 227af68993..c1f2861785 100644 --- a/libavutil/lfg.c +++ b/libavutil/lfg.c @@ -27,7 +27,7 @@ #include "intreadwrite.h" #include "attributes.h" -void av_cold av_lfg_init(AVLFG *c, unsigned int seed) +av_cold void av_lfg_init(AVLFG *c, unsigned int seed) { uint8_t tmp[16] = { 0 }; int i; |