[FFmpeg-cvslog] avformat/flacdec: Avoid double AVERRORS

Michael Niedermayer git at videolan.org
Sun Apr 14 23:59:35 EEST 2024


ffmpeg | branch: release/3.4 | Michael Niedermayer <michael at niedermayer.cc> | Mon Oct  2 16:10:22 2023 +0200| [2c30c938f9d015a97464bed7de6d0956ab2279d4] | committer: Michael Niedermayer

avformat/flacdec: Avoid double AVERRORS

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 029294ff541c9c85092f81dd45f18081d234f0d5)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/flacdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index a032378045..96dad46afa 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -66,7 +66,7 @@ static int flac_read_header(AVFormatContext *s)
     /* process metadata blocks */
     while (!avio_feof(s->pb) && !metadata_last) {
         if (avio_read(s->pb, header, 4) != 4)
-            return AVERROR(AVERROR_INVALIDDATA);
+            return AVERROR_INVALIDDATA;
         flac_parse_block_header(header, &metadata_last, &metadata_type,
                                    &metadata_size);
         switch (metadata_type) {



More information about the ffmpeg-cvslog mailing list