mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-10-28 10:04:37 +08:00
avcodec/vp9_raw_reorder_bsf: Merge close and flush
Also mark the function as av_cold while at it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
1 parent
ebec607941
commit
24fd3ff5a2
1 file changed
+3
-13
@@ -390,7 +390,7 @@ fail:
|
||||
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;
|
||||
|
||||
@@ -400,16 +400,6 @@ static void vp9_raw_reorder_flush(AVBSFContext *bsf)
|
||||
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[] = {
|
||||
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.codec_ids = vp9_raw_reorder_codec_ids,
|
||||
.priv_data_size = sizeof(VP9RawReorderContext),
|
||||
.close = &vp9_raw_reorder_close,
|
||||
.flush = &vp9_raw_reorder_flush,
|
||||
.filter = &vp9_raw_reorder_filter,
|
||||
.flush = &vp9_raw_reorder_flush_close,
|
||||
.close = &vp9_raw_reorder_flush_close,
|
||||
};
|
||||
Reference in new issue
Block a user