Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / ipmovie.c

diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 4e5f1164e571f71698a3311d6cc314a7abd471a3..a60b96157386b90232edf607932600c1b91d4897 100644 (file)
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -144,7 +144,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb,
             (s->audio_chunk_size / s->audio_channels / (s->audio_bits / 8));
         else
             s->audio_frame_count +=
-                (s->audio_chunk_size - 6) / s->audio_channels;
+                (s->audio_chunk_size - 6 - s->audio_channels) / s->audio_channels;
 
         av_dlog(NULL, "sending audio frame with pts %"PRId64" (%d audio frames)\n",
                 pkt->pts, s->audio_frame_count);
@@ -536,8 +536,7 @@ static int ipmovie_probe(AVProbeData *p)
     return 0;
 }
 
-static int ipmovie_read_header(AVFormatContext *s,
-                               AVFormatParameters *ap)
+static int ipmovie_read_header(AVFormatContext *s)
 {
     IPMVEContext *ipmovie = s->priv_data;
     AVIOContext *pb = s->pb;