har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vp9_raw_reorder_bsf: Merge close and flush

Browse Source 
Also mark the function as av_cold while at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-03-31 22:02:48 +02:00
parent ebec607941
commit 24fd3ff5a2
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/vp9_raw_reorder_bsf.c
View File

@ -390,7 +390,7 @@ fail:
return err; return err;
} }
static void vp9_raw_reorder_flush(AVBSFContext *bsf) static av_cold void vp9_raw_reorder_flush_close(AVBSFContext *bsf)
{ {
VP9RawReorderContext *ctx = bsf->priv_data; VP9RawReorderContext *ctx = bsf->priv_data;
@ -400,16 +400,6 @@ static void vp9_raw_reorder_flush(AVBSFContext *bsf)
ctx->sequence = 0; ctx->sequence = 0;
} }
static void vp9_raw_reorder_close(AVBSFContext *bsf)
{
VP9RawReorderContext *ctx = bsf->priv_data;
int s;
for (s = 0; s < FRAME_SLOTS; s++)
vp9_raw_reorder_clear_slot(ctx, s);
vp9_raw_reorder_frame_free(&ctx->next_frame);
}
static const enum AVCodecID vp9_raw_reorder_codec_ids[] = { static const enum AVCodecID vp9_raw_reorder_codec_ids[] = {
AV_CODEC_ID_VP9, AV_CODEC_ID_NONE, AV_CODEC_ID_VP9, AV_CODEC_ID_NONE,
}; };
@ -418,7 +408,7 @@ const FFBitStreamFilter ff_vp9_raw_reorder_bsf = {
.p.name = "vp9_raw_reorder", .p.name = "vp9_raw_reorder",
.p.codec_ids = vp9_raw_reorder_codec_ids, .p.codec_ids = vp9_raw_reorder_codec_ids,
.priv_data_size = sizeof(VP9RawReorderContext), .priv_data_size = sizeof(VP9RawReorderContext),
.close = &vp9_raw_reorder_close,
.flush = &vp9_raw_reorder_flush,
.filter = &vp9_raw_reorder_filter, .filter = &vp9_raw_reorder_filter,
.flush = &vp9_raw_reorder_flush_close,
.close = &vp9_raw_reorder_flush_close,
}; };