mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-17 15:08:09 +08:00
avformat/av1dec: Avoid branch for setting position
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
@ -275,17 +275,18 @@ end:
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret = av_bsf_receive_packet(c->bsf, pkt);
|
ret = av_bsf_receive_packet(c->bsf, pkt);
|
||||||
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
|
if (ret < 0) {
|
||||||
av_log(s, AV_LOG_ERROR, "av1_frame_merge filter failed to "
|
if (ret == AVERROR(EAGAIN))
|
||||||
"send output packet\n");
|
goto retry;
|
||||||
|
if (ret != AVERROR_EOF)
|
||||||
|
av_log(s, AV_LOG_ERROR, "av1_frame_merge filter failed to "
|
||||||
|
"send output packet\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
if (ret == AVERROR(EAGAIN))
|
pkt->pos = pos;
|
||||||
goto retry;
|
|
||||||
|
|
||||||
if (!ret)
|
return 0;
|
||||||
pkt->pos = pos;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const FFInputFormat ff_av1_demuxer = {
|
const FFInputFormat ff_av1_demuxer = {
|
||||||
|
Reference in New Issue
Block a user