summaryrefslogtreecommitdiff
path: root/libavcodec/av1_frame_merge_bsf.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-06 00:34:25 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-07 04:46:51 +0200
commit1bdbc50bf4379d3993b47b8510045e4d236de555 (patch)
treedeeaeb14d342a2c3a71068322362ab23731224e0 /libavcodec/av1_frame_merge_bsf.c
parentfc3f5cd149326b0a478c9a4a34acc22cf757ef02 (diff)
avcodec/cbs: Remove unused function parameters
Several cbs-functions had an unused CodedBitstreamContext parameter. This commit removes these. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/av1_frame_merge_bsf.c')
-rw-r--r--libavcodec/av1_frame_merge_bsf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/av1_frame_merge_bsf.c b/libavcodec/av1_frame_merge_bsf.c
index b5aa57e0ff..baea5596d7 100644
--- a/libavcodec/av1_frame_merge_bsf.c
+++ b/libavcodec/av1_frame_merge_bsf.c
@@ -34,8 +34,8 @@ static void av1_frame_merge_flush(AVBSFContext *bsf)
{
AV1FMergeContext *ctx = bsf->priv_data;
- ff_cbs_fragment_reset(ctx->cbc, &ctx->frag[0]);
- ff_cbs_fragment_reset(ctx->cbc, &ctx->frag[1]);
+ ff_cbs_fragment_reset(&ctx->frag[0]);
+ ff_cbs_fragment_reset(&ctx->frag[1]);
av_packet_unref(ctx->in);
av_packet_unref(ctx->pkt);
}
@@ -93,7 +93,7 @@ eof:
ctx->idx = !ctx->idx;
} else {
for (i = 0; i < frag->nb_units; i++) {
- err = ff_cbs_insert_unit_content(ctx->cbc, tu, -1, frag->units[i].type,
+ err = ff_cbs_insert_unit_content(tu, -1, frag->units[i].type,
frag->units[i].content, frag->units[i].content_ref);
if (err < 0)
goto fail;
@@ -108,7 +108,7 @@ eof:
else
av_packet_unref(in);
- ff_cbs_fragment_reset(ctx->cbc, &ctx->frag[ctx->idx]);
+ ff_cbs_fragment_reset(&ctx->frag[ctx->idx]);
fail:
if (err < 0 && err != AVERROR(EAGAIN))
@@ -133,8 +133,8 @@ static void av1_frame_merge_close(AVBSFContext *bsf)
{
AV1FMergeContext *ctx = bsf->priv_data;
- ff_cbs_fragment_free(ctx->cbc, &ctx->frag[0]);
- ff_cbs_fragment_free(ctx->cbc, &ctx->frag[1]);
+ ff_cbs_fragment_free(&ctx->frag[0]);
+ ff_cbs_fragment_free(&ctx->frag[1]);
av_packet_free(&ctx->in);
av_packet_free(&ctx->pkt);
ff_cbs_close(&ctx->cbc);