This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 6698195dc43a554824aa7715e911e02bd89a129f
Author:     Niklas Haas <[email protected]>
AuthorDate: Wed Jun 10 14:34:21 2026 +0200
Commit:     Niklas Haas <[email protected]>
CommitDate: Sun Jun 14 11:10:12 2026 +0200

    avformat/shared: propagate correct short seek size on failure
    
    This might be AVERROR(ENOSYS), which we shouldn't propagate.
    
    Sponsored-by: nxtedition AB
    Signed-off-by: Niklas Haas <[email protected]>
---
 libavformat/shared.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/shared.c b/libavformat/shared.c
index b08b5a8f06..a7dccb33df 100644
--- a/libavformat/shared.c
+++ b/libavformat/shared.c
@@ -858,9 +858,7 @@ static int shared_get_short_seek(URLContext *h)
 {
     SharedContext *s = h->priv_data;
     int ret = ffurl_get_short_seek(s->inner);
-    if (ret < 0)
-        return ret;
-    return FFMAX(ret, s->block_size);
+    return ret > 0 ? FFMAX(ret, s->block_size) : s->block_size;
 }
 
 #define OFFSET(x) offsetof(SharedContext, x)

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to