Message ID | 1497728616.3919.17.camel@tmm.cx |
---|---|
State | New |
Headers | show |
On 6/17/17, Hein-Pieter van Braam <hp@tmm.cx> wrote: > Interplay movies signal the end of the stream, currently decoding > continues and eventually returns AVERROR_INVALIDDATA. > > This honors the MVE CHUNK_END and CHUNK_SHUTDOWN types. > > Signed-off-by: Hein-Pieter van Braam <hp@tmm.cx> > --- > libavformat/ipmovie.c | 2 ++ > 1 file changed, 2 insertions(+) > lgtm
On 6/17/2017 4:53 PM, Paul B Mahol wrote: > On 6/17/17, Hein-Pieter van Braam <hp@tmm.cx> wrote: >> Interplay movies signal the end of the stream, currently decoding >> continues and eventually returns AVERROR_INVALIDDATA. >> >> This honors the MVE CHUNK_END and CHUNK_SHUTDOWN types. >> >> Signed-off-by: Hein-Pieter van Braam <hp@tmm.cx> >> --- >> libavformat/ipmovie.c | 2 ++ >> 1 file changed, 2 insertions(+) >> > > lgtm Pushed (You could have done it yourself, though).
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 5636156..b9c128d 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -702,6 +702,8 @@ static int ipmovie_read_packet(AVFormatContext *s, ret = AVERROR(EIO); else if (ret == CHUNK_NOMEM) ret = AVERROR(ENOMEM); + else if (ret == CHUNK_END || ret == CHUNK_SHUTDOWN) + ret = AVERROR_EOF; else if (ret == CHUNK_VIDEO) ret = 0; else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
Interplay movies signal the end of the stream, currently decoding continues and eventually returns AVERROR_INVALIDDATA. This honors the MVE CHUNK_END and CHUNK_SHUTDOWN types. Signed-off-by: Hein-Pieter van Braam <hp@tmm.cx> --- libavformat/ipmovie.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.4