[FFmpeg-cvslog] ipmovie: do not read audio packets before the codec is known

Janne Grunau git at videolan.org
Fri Jan 6 02:53:09 CET 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Thu Jan  5 21:57:22 2012 +0100| [f5be84cfbc9c132a867ae8a8c0e0de26ed1a4e88] | committer: Janne Grunau

ipmovie: do not read audio packets before the codec is known

Prevents a division by zero.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5be84cfbc9c132a867ae8a8c0e0de26ed1a4e88
---

 libavformat/ipmovie.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 4bd3580..bd5ec30 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -116,6 +116,11 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb,
     int chunk_type;
 
     if (s->audio_chunk_offset) {
+        if (s->audio_type == CODEC_ID_NONE) {
+            av_log(NULL, AV_LOG_ERROR, "Can not read audio packet before"
+                   "audio codec is known\n");
+                return CHUNK_BAD;
+        }
 
         /* adjust for PCM audio by skipping chunk header */
         if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) {



More information about the ffmpeg-cvslog mailing list