Message ID | 20190817194105.16492-3-cus@passwd.hu |
---|---|
State | Accepted |
Commit | 3a09dbdb4a2f66558367a1350b37ad470aa71fac |
Headers | show |
On Sat, 17 Aug 2019, Marton Balint wrote: > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavcodec/bsf.c | 1 - > libavcodec/decode.c | 1 - > 2 files changed, 2 deletions(-) Applied this as well, as it was trivial enough. Regards, Marton > > diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c > index 5081307603..71915dea85 100644 > --- a/libavcodec/bsf.c > +++ b/libavcodec/bsf.c > @@ -306,7 +306,6 @@ static int bsf_list_filter(AVBSFContext *bsf, AVPacket *out) > ret = av_bsf_receive_packet(lst->bsfs[lst->idx-1], out); > if (ret == AVERROR(EAGAIN)) { > /* no more packets from idx-1, try with previous */ > - ret = 0; > lst->idx--; > continue; > } else if (ret == AVERROR_EOF) { > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 6c31166ec2..cf9676e2ac 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -300,7 +300,6 @@ static int bsfs_poll(AVCodecContext *avctx, AVPacket *pkt) > ret = av_bsf_receive_packet(s->bsfs[idx], pkt); > if (ret == AVERROR(EAGAIN)) { > /* no packets available, try the next filter up the chain */ > - ret = 0; > idx--; > continue; > } else if (ret < 0 && ret != AVERROR_EOF) { > -- > 2.16.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 5081307603..71915dea85 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -306,7 +306,6 @@ static int bsf_list_filter(AVBSFContext *bsf, AVPacket *out) ret = av_bsf_receive_packet(lst->bsfs[lst->idx-1], out); if (ret == AVERROR(EAGAIN)) { /* no more packets from idx-1, try with previous */ - ret = 0; lst->idx--; continue; } else if (ret == AVERROR_EOF) { diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6c31166ec2..cf9676e2ac 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -300,7 +300,6 @@ static int bsfs_poll(AVCodecContext *avctx, AVPacket *pkt) ret = av_bsf_receive_packet(s->bsfs[idx], pkt); if (ret == AVERROR(EAGAIN)) { /* no packets available, try the next filter up the chain */ - ret = 0; idx--; continue; } else if (ret < 0 && ret != AVERROR_EOF) {
Signed-off-by: Marton Balint <cus@passwd.hu> --- libavcodec/bsf.c | 1 - libavcodec/decode.c | 1 - 2 files changed, 2 deletions(-)