mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 11:19:55 +00:00
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
* commit 'bd8ac882140a38868c33c000a430a1292a352533': avcodec: Add av_cold attributes to end functions missing them Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b50ab3a4c7
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -1003,7 +1003,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);
|
||||
|
@ -136,7 +136,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);
|
||||
|
@ -26,6 +26,7 @@
|
||||
*/
|
||||
|
||||
//#define DEBUG
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "internal.h"
|
||||
#include "avcodec.h"
|
||||
@ -2472,7 +2473,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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -39,6 +39,8 @@
|
||||
* correctly decodes this file:
|
||||
* http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
|
||||
*/
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "internal.h"
|
||||
#include "avcodec.h"
|
||||
#include "mpegvideo.h"
|
||||
@ -1310,7 +1312,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;
|
||||
|
Loading…
Reference in New Issue
Block a user