Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / bit.c

diff --git a/libavformat/bit.c b/libavformat/bit.c
index 3449ce1b2112471928baa3e161afa6e2f63d5cf5..b0931f429b82fe557e02e3d50ad5f55b7605f6d3 100644 (file)
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -47,7 +47,7 @@ static int probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX/2;
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream* st;
 
@@ -113,7 +113,7 @@ AVInputFormat ff_bit_demuxer = {
     .extensions  = "bit",
 };
 
-#ifdef CONFIG_MUXERS
+#if CONFIG_MUXERS
 static int write_header(AVFormatContext *s)
 {
     AVCodecContext *enc = s->streams[0]->codec;