aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-26 04:00:02 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-26 04:00:02 +0200
commitc3361b3a8786f56428efb296dcc56c0f07d3b123 (patch)
tree686bd6d95db87719066b0ef1adfbfbb535a06358
parent8e0fdb03a2f17131c13df3fe9814d34c1fc972af (diff)
downloadffmpeg-c3361b3a8786f56428efb296dcc56c0f07d3b123.tar.gz
avformat/ipmovie: Fix late audio detection
Fixes audio in Ticket117 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/ipmovie.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index bebe8661bf..51aed323a2 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -631,7 +631,8 @@ static int ipmovie_read_header(AVFormatContext *s)
if (ipmovie->audio_type) {
return init_audio(s);
- }
+ } else
+ s->ctx_flags |= AVFMTCTX_NOHEADER;
return 0;
}
@@ -656,7 +657,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
continue;
else
- ret = -1;
+ continue;
return ret;
}