Commit 83be17cf authored by Andreas Rheinhardt's avatar Andreas Rheinhardt Committed by Mark Thompson

filter_units: Don't use fake loop

According to the BSF API, when a BSF is finished with an input packet,
it should return AVERROR(EAGAIN) to signal that another packet should be
sent to the BSF via av_bsf_send_packet that the actual BSF can receive
via ff_bsf_get_packet[_ref]. filter_units on the other hand simply called
ff_bsf_get_packet again if the first packet received didn't result in
any output. This call of course returned AVERROR(EAGAIN) which was
returned, but it is nevertheless better to not include a fake loop.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent 45fd7e44
...@@ -105,7 +105,6 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out) ...@@ -105,7 +105,6 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out)
AVPacket *in = NULL; AVPacket *in = NULL;
int err, i, j; int err, i, j;
while (1) {
err = ff_bsf_get_packet(bsf, &in); err = ff_bsf_get_packet(bsf, &in);
if (err < 0) if (err < 0)
return err; return err;
...@@ -134,12 +133,10 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out) ...@@ -134,12 +133,10 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out)
} }
} }
if (frag->nb_units > 0) if (frag->nb_units == 0) {
break;
// Don't return packets with nothing in them. // Don't return packets with nothing in them.
av_packet_free(&in); err = AVERROR(EAGAIN);
ff_cbs_fragment_reset(ctx->cbc, frag); goto fail;
} }
err = ff_cbs_write_packet(ctx->cbc, out, frag); err = ff_cbs_write_packet(ctx->cbc, out, frag);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment