Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / bmv.c

diff --git a/libavformat/bmv.c b/libavformat/bmv.c
index 1077efa5738d6cbbfa9a2ba9bc3b454d9faa7c34..8c1eb787ce1f907bf2fa6316fcb9d87a07d7027f 100644 (file)
--- a/libavformat/bmv.c
+++ b/libavformat/bmv.c
@@ -38,7 +38,7 @@ typedef struct BMVContext {
     int64_t  audio_pos;
 } BMVContext;
 
-static int bmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int bmv_read_header(AVFormatContext *s)
 {
     AVStream *st, *ast;
     BMVContext *c = s->priv_data;
@@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = {
     .read_header    = bmv_read_header,
     .read_packet    = bmv_read_packet,
     .read_close     = bmv_read_close,
-    .extensions     = "bmv"
+    .extensions     = "bmv",
 };