Commit 52ef9547 authored by Michael Niedermayer's avatar Michael Niedermayer

ipmovie: Fix passing resolution changes on.

Fixes Ticket676
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent dd319f17
...@@ -624,6 +624,7 @@ static int ipmovie_read_packet(AVFormatContext *s, ...@@ -624,6 +624,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ret; int ret;
for (;;) {
ret = process_ipmovie_chunk(ipmovie, pb, pkt); ret = process_ipmovie_chunk(ipmovie, pb, pkt);
if (ret == CHUNK_BAD) if (ret == CHUNK_BAD)
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
...@@ -633,10 +634,13 @@ static int ipmovie_read_packet(AVFormatContext *s, ...@@ -633,10 +634,13 @@ static int ipmovie_read_packet(AVFormatContext *s,
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
else if (ret == CHUNK_VIDEO) else if (ret == CHUNK_VIDEO)
ret = 0; ret = 0;
else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
continue;
else else
ret = -1; ret = -1;
return ret; return ret;
}
} }
AVInputFormat ff_ipmovie_demuxer = { AVInputFormat ff_ipmovie_demuxer = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment