Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / iff.c

diff --git a/libavformat/iff.c b/libavformat/iff.c
index ebc1c35ba5dd9f01a42bb4b1cac644fec7f7dd58..6566a15ddb4c8b5550fdbc6bbb75b9d81dabf4b1 100644 (file)
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -126,8 +126,7 @@ static int iff_probe(AVProbeData *p)
     return 0;
 }
 
-static int iff_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int iff_read_header(AVFormatContext *s)
 {
     IffDemuxContext *iff = s->priv_data;
     AVIOContext *pb = s->pb;