[FFmpeg-cvslog] ipmovie: Fix passing resolution changes on.
Michael Niedermayer
git at videolan.org
Sun Jan 8 20:30:30 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 8 18:37:19 2012 +0100| [52ef95474ba1615fe261b001c07b107449866368] | committer: Michael Niedermayer
ipmovie: Fix passing resolution changes on.
Fixes Ticket676
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52ef95474ba1615fe261b001c07b107449866368
---
libavformat/ipmovie.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index bf9e5c0..4e5f116 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -624,6 +624,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
AVIOContext *pb = s->pb;
int ret;
+ for (;;) {
ret = process_ipmovie_chunk(ipmovie, pb, pkt);
if (ret == CHUNK_BAD)
ret = AVERROR_INVALIDDATA;
@@ -633,10 +634,13 @@ static int ipmovie_read_packet(AVFormatContext *s,
ret = AVERROR(ENOMEM);
else if (ret == CHUNK_VIDEO)
ret = 0;
+ else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
+ continue;
else
ret = -1;
return ret;
+ }
}
AVInputFormat ff_ipmovie_demuxer = {
More information about the ffmpeg-cvslog
mailing list