Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
2018-11-08 13:36 GMT+01:00, Paul B Mahol : > On 11/8/18, Carl Eugen Hoyos wrote: >> 2018-11-08 13:23 GMT+01:00, Paul B Mahol : >>> On 11/7/18, Carl Eugen Hoyos wrote: 2018-11-07 1:07 GMT+01:00, Marton Balint : > > > On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: > >> Hi! >> >> Attached patch silences the console flooding for incomplete apng files >> and fixes ticket #7536: >> In-stream tag=[0][0][0][0] (0x) len=0 is not implemented. >> Update your FFmpeg version... >> >> Please comment, Carl Eugen >> > >>+ >>+if (pb->eof_reached) >>+return AVERROR_EOF; >>+ > > Why not avio_feof(pb)? New patch attached. Please comment, Carl Eugen >>> >>> Isn't this same patch? >> >> Looks different here, the file name is the same though, >> is that an issue? > > Sorry, latest patch is ok. Thank you! Patch applied, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
On 11/8/18, Carl Eugen Hoyos wrote: > 2018-11-08 13:23 GMT+01:00, Paul B Mahol : >> On 11/7/18, Carl Eugen Hoyos wrote: >>> 2018-11-07 1:07 GMT+01:00, Marton Balint : On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: > Hi! > > Attached patch silences the console flooding for incomplete apng files > and fixes ticket #7536: > In-stream tag=[0][0][0][0] (0x) len=0 is not implemented. > Update your FFmpeg version... > > Please comment, Carl Eugen > >+ >+if (pb->eof_reached) >+return AVERROR_EOF; >+ Why not avio_feof(pb)? >>> >>> New patch attached. >>> >>> Please comment, Carl Eugen >>> >> >> Isn't this same patch? > > Looks different here, the file name is the same though, > is that an issue? Sorry, latest patch is ok. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
2018-11-08 13:23 GMT+01:00, Paul B Mahol : > On 11/7/18, Carl Eugen Hoyos wrote: >> 2018-11-07 1:07 GMT+01:00, Marton Balint : >>> >>> >>> On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: >>> Hi! Attached patch silences the console flooding for incomplete apng files and fixes ticket #7536: In-stream tag=[0][0][0][0] (0x) len=0 is not implemented. Update your FFmpeg version... Please comment, Carl Eugen >>> + +if (pb->eof_reached) +return AVERROR_EOF; + >>> >>> Why not avio_feof(pb)? >> >> New patch attached. >> >> Please comment, Carl Eugen >> > > Isn't this same patch? Looks different here, the file name is the same though, is that an issue? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
On 11/7/18, Carl Eugen Hoyos wrote: > 2018-11-07 1:07 GMT+01:00, Marton Balint : >> >> >> On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: >> >>> Hi! >>> >>> Attached patch silences the console flooding for incomplete apng files >>> and fixes ticket #7536: >>> In-stream tag=[0][0][0][0] (0x) len=0 is not implemented. >>> Update your FFmpeg version... >>> >>> Please comment, Carl Eugen >>> >> >>>+ >>>+if (pb->eof_reached) >>>+return AVERROR_EOF; >>>+ >> >> Why not avio_feof(pb)? > > New patch attached. > > Please comment, Carl Eugen > Isn't this same patch? ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
2018-11-07 1:07 GMT+01:00, Marton Balint :
>
>
> On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote:
>
>> Hi!
>>
>> Attached patch silences the console flooding for incomplete apng files
>> and fixes ticket #7536:
>> In-stream tag=[0][0][0][0] (0x) len=0 is not implemented.
>> Update your FFmpeg version...
>>
>> Please comment, Carl Eugen
>>
>
>>+
>>+if (pb->eof_reached)
>>+return AVERROR_EOF;
>>+
>
> Why not avio_feof(pb)?
New patch attached.
Please comment, Carl Eugen
From ec289871a5ee8e47c46a5c9afcc7385d673472c8 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos
Date: Wed, 7 Nov 2018 01:31:18 +0100
Subject: [PATCH] lavf/apngdec: Return EOF for incomplete files.
Fixes ticket #7536.
---
libavformat/apngdec.c |4
1 file changed, 4 insertions(+)
diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c
index f9a97e5..53cdd45 100644
--- a/libavformat/apngdec.c
+++ b/libavformat/apngdec.c
@@ -342,6 +342,10 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt)
len = avio_rb32(pb);
tag = avio_rl32(pb);
+
+if (avio_feof(pb))
+return AVERROR_EOF;
+
switch (tag) {
case MKTAG('f', 'c', 'T', 'L'):
if (len != 26)
--
1.7.10.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
On Wed, 7 Nov 2018, Carl Eugen Hoyos wrote: Hi! Attached patch silences the console flooding for incomplete apng files and fixes ticket #7536: In-stream tag=[0][0][0][0] (0x) len=0 is not implemented. Update your FFmpeg version... Please comment, Carl Eugen + +if (pb->eof_reached) +return AVERROR_EOF; + Why not avio_feof(pb)? Regards, Marton ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH]lavf/apngdec: Return eof for incomplete files
Hi!
Attached patch silences the console flooding for incomplete apng files
and fixes ticket #7536:
In-stream tag=[0][0][0][0] (0x) len=0 is not implemented.
Update your FFmpeg version...
Please comment, Carl Eugen
From dd384a34e1e8ca52f639132d3ba002c5b0534391 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos
Date: Wed, 7 Nov 2018 00:09:31 +0100
Subject: [PATCH] lavf/apngdec: Return EOF for incomplete files.
Fixes ticket #7536.
---
libavformat/apngdec.c |4
1 file changed, 4 insertions(+)
diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c
index f9a97e5..0ee3092 100644
--- a/libavformat/apngdec.c
+++ b/libavformat/apngdec.c
@@ -342,6 +342,10 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt)
len = avio_rb32(pb);
tag = avio_rl32(pb);
+
+if (pb->eof_reached)
+return AVERROR_EOF;
+
switch (tag) {
case MKTAG('f', 'c', 'T', 'L'):
if (len != 26)
--
1.7.10.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
