diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-03-31 22:02:48 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-05 22:19:50 +0200 |
| commit | 24fd3ff5a2e93fd9761c8a050f98e20d74b6dc6c (patch) | |
| tree | a3048f6e947298786100cce541a989256ad9e7d4 | |
| parent | ebec6079414262fdc6e161b73f4ac38cd6e4a276 (diff) | |
| download | ffmpeg-24fd3ff5a2e93fd9761c8a050f98e20d74b6dc6c.tar.gz | |
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>
| -rw-r--r-- | libavcodec/vp9_raw_reorder_bsf.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c index 368dcb26c2..d36093316c 100644 --- a/libavcodec/vp9_raw_reorder_bsf.c +++ b/libavcodec/vp9_raw_reorder_bsf.c @@ -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, }; |