[FFmpeg-cvslog] avformat/subfile: Merge if into switch()

Michael Niedermayer git at videolan.org
Wed Jul 24 17:49:26 EEST 2024


ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Sat Jun  8 20:45:32 2024 +0200| [20aba0c184eff8300c53aff9204b570453197d4d] | committer: Michael Niedermayer

avformat/subfile: Merge if into switch()

Found while reviewing CID1452449 Uninitialized scalar variable

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 2a0a7d964bfd5da8859c715627eeb7a048bddb79)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20aba0c184eff8300c53aff9204b570453197d4d
---

 libavformat/subfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/subfile.c b/libavformat/subfile.c
index 300672e657..68d846ab15 100644
--- a/libavformat/subfile.c
+++ b/libavformat/subfile.c
@@ -125,9 +125,9 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence)
             return end;
     }
 
-    if (whence == AVSEEK_SIZE)
-        return end - c->start;
     switch (whence) {
+    case AVSEEK_SIZE:
+        return end - c->start;
     case SEEK_SET:
         new_pos = c->start + pos;
         break;



More information about the ffmpeg-cvslog mailing list