From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/3] avformat/av1dec: don't return EIO when the input file is truncated
Date: Sat, 3 Jun 2023 23:02:13 -0300
Message-ID: <20230604020214.1527-2-jamrial@gmail.com> (raw)
In-Reply-To: <20230604020214.1527-1-jamrial@gmail.com>
There was no problem reading the file, so EIO is not correct.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavformat/av1dec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index 79ad8a9411..501b0cc93f 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -134,7 +134,7 @@ static int leb(AVIOContext *pb, uint32_t *len, int eof) {
if (pb->error)
return pb->error;
if (pb->eof_reached)
- return (eof && !i) ? AVERROR_EOF : AVERROR(EIO);
+ return (eof && !i) ? AVERROR_EOF : AVERROR_INVALIDDATA;
more = byte & 0x80;
bits = byte & 0x7f;
if (i <= 3 || (i == 4 && bits < (1 << 4)))
@@ -231,7 +231,7 @@ static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt)
retry:
if (avio_feof(s->pb)) {
if (c->temporal_unit_size || c->frame_unit_size)
- return AVERROR(EIO);
+ return AVERROR_INVALIDDATA;
goto end;
}
@@ -260,7 +260,7 @@ retry:
if (ret < 0)
return ret;
if (ret != obu_unit_size)
- return AVERROR(EIO);
+ return AVERROR_INVALIDDATA;
c->temporal_unit_size -= obu_unit_size + len;
c->frame_unit_size -= obu_unit_size + len;
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-06-04 2:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-04 2:02 [FFmpeg-devel] [PATCH 1/3 v2] avformat/av1dec: fix EOF check in Annex-B demuxer James Almer
2023-06-04 2:02 ` James Almer [this message]
2023-06-04 2:02 ` [FFmpeg-devel] [PATCH 3/3] avformat/av1: reduce the scope of a variable James Almer
2023-06-06 12:27 ` [FFmpeg-devel] [PATCH 1/3 v2] avformat/av1dec: fix EOF check in Annex-B demuxer James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230604020214.1527-2-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git