Patches attached.
- Andreas
From c92302e0c9d8ba4bb37cfec2568d0ad9c1f9d4ea Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Thu, 1 May 2025 19:53:24 +0200
Subject: [PATCH 1/2] avformat/av1dec: Remove redundant avio_tell()
AV1DemuxContext.temporal_unit_size is zero after reading the header,
so the position set when reading the header will not be used at all.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavformat/av1dec.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index 38001b124f..536422959e 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -97,8 +97,6 @@ static int av1_read_header(AVFormatContext *s)
if (ret < 0)
return ret;
- c->pos = avio_tell(s->pb);
-
return 0;
}
--
2.45.2
From 65eb79d35f8ffa1af0bb1e835b9cbf10d0a995b4 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Thu, 1 May 2025 20:11:25 +0200
Subject: [PATCH 2/2] avformat/av1dec: Avoid branch for setting position
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavformat/av1dec.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index 536422959e..0a81db4ef0 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -275,17 +275,18 @@ end:
}
ret = av_bsf_receive_packet(c->bsf, pkt);
- if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
- av_log(s, AV_LOG_ERROR, "av1_frame_merge filter failed to "
- "send output packet\n");
-
- if (ret == AVERROR(EAGAIN))
- goto retry;
+ if (ret < 0) {
+ if (ret == AVERROR(EAGAIN))
+ 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)
- pkt->pos = pos;
+ pkt->pos = pos;
- return ret;
+ return 0;
}
const FFInputFormat ff_av1_demuxer = {
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
