On Sun, 5 May 2013, Diego Biurrun wrote:
---Drops two inappropriate av_cold markings noticed by Martin. libavcodec/avfft.c | 8 ++++---- libavcodec/bgmc.c | 2 +- libavcodec/dnxhdenc.c | 2 +- libavcodec/libxvid_rc.c | 3 ++- libavcodec/mpeg12dec.c | 3 ++- libavcodec/roqvideoenc.c | 2 +- libavcodec/svq3.c | 4 +++- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 8ef5797..513f57e 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -45,7 +45,7 @@ void av_fft_calc(FFTContext *s, FFTComplex *z) s->fft_calc(s, z); } -void av_fft_end(FFTContext *s) +av_cold void av_fft_end(FFTContext *s) { if (s) { ff_fft_end(s); @@ -80,7 +80,7 @@ void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input) s->mdct_calc(s, output, input); } -void av_mdct_end(FFTContext *s) +av_cold void av_mdct_end(FFTContext *s) { if (s) { ff_mdct_end(s); @@ -107,7 +107,7 @@ void av_rdft_calc(RDFTContext *s, FFTSample *data) s->rdft_calc(s, data); } -void av_rdft_end(RDFTContext *s) +av_cold void av_rdft_end(RDFTContext *s) { if (s) { ff_rdft_end(s); @@ -134,7 +134,7 @@ void av_dct_calc(DCTContext *s, FFTSample *data) s->dct_calc(s, data); } -void av_dct_end(DCTContext *s) +av_cold void av_dct_end(DCTContext *s) { if (s) { ff_dct_end(s); diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index b8f4bee..c0ebcac 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -477,7 +477,7 @@ av_cold int ff_bgmc_init(AVCodecContext *avctx, /** Release the lookup table arrays */ -void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status) +av_cold void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status) { av_freep(cf_lut); av_freep(cf_lut_status); diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 5b59e64..920fa45 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -990,7 +990,7 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static int dnxhd_encode_end(AVCodecContext *avctx) +static av_cold int dnxhd_encode_end(AVCodecContext *avctx) { DNXHDEncContext *ctx = avctx->priv_data; int max_level = 1<<(ctx->cid_table->bit_depth+2); diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index 9c45804..9084d33 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -170,7 +170,8 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){ return xvid_plg_data.quant * FF_QP2LAMBDA; } -void ff_xvid_rate_control_uninit(MpegEncContext *s){ +av_cold void ff_xvid_rate_control_uninit(MpegEncContext *s) +{ xvid_plg_destroy_t xvid_plg_destroy; xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, &xvid_plg_destroy, NULL); diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 3bf20c6..16c8523 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -26,6 +26,7 @@ */ //#define DEBUG +#include "libavutil/attributes.h" #include "libavutil/internal.h" #include "internal.h" #include "avcodec.h" @@ -2355,7 +2356,7 @@ static void flush(AVCodecContext *avctx) ff_mpeg_flush(avctx); } -static int mpeg_decode_end(AVCodecContext *avctx) +static av_cold int mpeg_decode_end(AVCodecContext *avctx) { Mpeg1Context *s = avctx->priv_data; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index db95282..650db67 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -937,7 +937,7 @@ static void roq_encode_video(RoqContext *enc) enc->framesSinceKeyframe++; } -static int roq_encode_end(AVCodecContext *avctx) +static av_cold int roq_encode_end(AVCodecContext *avctx) { RoqContext *enc = avctx->priv_data; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 1ecc1b2..6455821 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -39,6 +39,8 @@ * correctly decodes this file: * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ + +#include "libavutil/attributes.h" #include "internal.h" #include "avcodec.h" #include "mpegvideo.h" @@ -1281,7 +1283,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return buf_size; } -static int svq3_decode_end(AVCodecContext *avctx) +static av_cold int svq3_decode_end(AVCodecContext *avctx) { SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; -- 1.7.9.5
Ok // Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
