generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipmovie: Fix passing resolution changes on.

Browse Source 
Fixes Ticket676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-01-08 18:37:19 +01:00
parent dd319f17e6
commit 52ef95474b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ipmovie.c
View File

@ -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,
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 = {