From 6e9651d1064b6a3e18c24f15d5b03bb9c5fc3393 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:20:36 +0100
Subject: [PATCH] lavf: remove AVFormatParameters from
 AVFormatContext.read_header signature

---
 libavdevice/alsa-audio-dec.c |  3 +--
 libavdevice/bktr.c           |  2 +-
 libavdevice/dv1394.c         |  2 +-
 libavdevice/fbdev.c          |  3 +--
 libavdevice/jack_audio.c     |  2 +-
 libavdevice/libcdio.c        |  2 +-
 libavdevice/libdc1394.c      | 10 +++++-----
 libavdevice/oss_audio.c      |  2 +-
 libavdevice/pulse.c          |  3 +--
 libavdevice/sndio_dec.c      |  3 +--
 libavdevice/v4l2.c           |  6 +++---
 libavdevice/vfwcap.c         |  2 +-
 libavdevice/x11grab.c        |  2 +-
 libavformat/4xm.c            |  3 +--
 libavformat/aacdec.c         |  3 +--
 libavformat/adxdec.c         |  2 +-
 libavformat/aea.c            |  3 +--
 libavformat/aiffdec.c        |  3 +--
 libavformat/amr.c            |  3 +--
 libavformat/anm.c            |  3 +--
 libavformat/apc.c            |  2 +-
 libavformat/ape.c            |  2 +-
 libavformat/applehttp.c      |  2 +-
 libavformat/asfdec.c         |  2 +-
 libavformat/assdec.c         |  2 +-
 libavformat/au.c             |  3 +--
 libavformat/avformat.h       |  3 +--
 libavformat/avidec.c         |  2 +-
 libavformat/avisynth.c       |  2 +-
 libavformat/avs.c            |  2 +-
 libavformat/bethsoftvid.c    |  3 +--
 libavformat/bfi.c            |  2 +-
 libavformat/bink.c           |  2 +-
 libavformat/bmv.c            |  2 +-
 libavformat/c93.c            |  3 +--
 libavformat/cafdec.c         |  3 +--
 libavformat/cdg.c            |  2 +-
 libavformat/daud.c           |  2 +-
 libavformat/dfa.c            |  3 +--
 libavformat/dsicin.c         |  2 +-
 libavformat/dv.c             |  3 +--
 libavformat/dxa.c            |  2 +-
 libavformat/eacdata.c        |  2 +-
 libavformat/electronicarts.c |  3 +--
 libavformat/ffmdec.c         |  2 +-
 libavformat/ffmetadec.c      |  2 +-
 libavformat/filmstripdec.c   |  3 +--
 libavformat/flacdec.c        |  3 +--
 libavformat/flic.c           |  3 +--
 libavformat/flvdec.c         |  3 +--
 libavformat/gsmdec.c         |  2 +-
 libavformat/gxf.c            |  2 +-
 libavformat/idcin.c          |  3 +--
 libavformat/idroqdec.c       |  3 +--
 libavformat/iff.c            |  3 +--
 libavformat/img2.c           |  2 +-
 libavformat/ipmovie.c        |  3 +--
 libavformat/iss.c            |  2 +-
 libavformat/iv8.c            |  2 +-
 libavformat/ivfdec.c         |  2 +-
 libavformat/jvdec.c          |  3 +--
 libavformat/libnut.c         |  2 +-
 libavformat/lmlm4.c          |  2 +-
 libavformat/lxfdec.c         |  2 +-
 libavformat/matroskadec.c    |  2 +-
 libavformat/mm.c             |  3 +--
 libavformat/mmf.c            |  3 +--
 libavformat/mov.c            |  2 +-
 libavformat/mp3dec.c         |  3 +--
 libavformat/mpc.c            |  2 +-
 libavformat/mpc8.c           |  2 +-
 libavformat/mpeg.c           |  3 +--
 libavformat/mpegts.c         |  3 +--
 libavformat/msnwc_tcp.c      |  2 +-
 libavformat/mtv.c            |  2 +-
 libavformat/mvi.c            |  2 +-
 libavformat/mxfdec.c         |  2 +-
 libavformat/mxg.c            |  2 +-
 libavformat/ncdec.c          |  2 +-
 libavformat/nsvdec.c         | 12 ++++++------
 libavformat/nutdec.c         |  2 +-
 libavformat/nuv.c            |  2 +-
 libavformat/oggdec.c         |  2 +-
 libavformat/omadec.c         |  3 +--
 libavformat/pmpdec.c         |  2 +-
 libavformat/psxstr.c         |  3 +--
 libavformat/pva.c            |  2 +-
 libavformat/qcp.c            |  2 +-
 libavformat/r3d.c            |  2 +-
 libavformat/rawdec.c         |  8 +++-----
 libavformat/rawdec.h         |  6 +++---
 libavformat/rl2.c            |  3 +--
 libavformat/rmdec.c          |  2 +-
 libavformat/rpl.c            |  2 +-
 libavformat/rsodec.c         |  2 +-
 libavformat/rtsp.c           |  7 +++----
 libavformat/rtspdec.c        |  3 +--
 libavformat/sapdec.c         |  3 +--
 libavformat/segafilm.c       |  3 +--
 libavformat/sierravmd.c      |  3 +--
 libavformat/siff.c           |  2 +-
 libavformat/smacker.c        |  2 +-
 libavformat/smjpegdec.c      |  2 +-
 libavformat/sol.c            |  3 +--
 libavformat/soxdec.c         |  3 +--
 libavformat/spdifdec.c       |  2 +-
 libavformat/srtdec.c         |  2 +-
 libavformat/swfdec.c         |  2 +-
 libavformat/thp.c            |  3 +--
 libavformat/tiertexseq.c     |  2 +-
 libavformat/tmv.c            |  2 +-
 libavformat/tta.c            |  2 +-
 libavformat/tty.c            |  3 +--
 libavformat/txd.c            |  2 +-
 libavformat/utils.c          |  3 +--
 libavformat/vc1test.c        |  3 +--
 libavformat/vocdec.c         |  2 +-
 libavformat/vqf.c            |  2 +-
 libavformat/wav.c            |  5 ++---
 libavformat/wc3movie.c       |  3 +--
 libavformat/westwood_aud.c   |  3 +--
 libavformat/westwood_vqa.c   |  3 +--
 libavformat/wtv.c            |  2 +-
 libavformat/wv.c             |  3 +--
 libavformat/xa.c             |  3 +--
 libavformat/xmv.c            |  3 +--
 libavformat/xwma.c           |  2 +-
 libavformat/yop.c            |  2 +-
 libavformat/yuv4mpeg.c       |  2 +-
 129 files changed, 147 insertions(+), 202 deletions(-)

diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
index 5344b19..b6a7ac2 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@@ -52,8 +52,7 @@
 
 #include "alsa-audio.h"
 
-static av_cold int audio_read_header(AVFormatContext *s1,
-                                     AVFormatParameters *ap)
+static av_cold int audio_read_header(AVFormatContext *s1)
 {
     AlsaData *s = s1->priv_data;
     AVStream *st;
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 8abe5ef..b35ec7c 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -243,7 +243,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
     return video_buf_size;
 }
 
-static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
+static int grab_read_header(AVFormatContext *s1)
 {
     VideoData *s = s1->priv_data;
     AVStream *st;
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 69e59ec..f48d2b1 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -81,7 +81,7 @@ static int dv1394_start(struct dv1394_data *dv)
     return 0;
 }
 
-static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap)
+static int dv1394_read_header(AVFormatContext * context)
 {
     struct dv1394_data *dv = context->priv_data;
 
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c
index 7444f47..f1889ef 100644
--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@@ -95,8 +95,7 @@ typedef struct {
     uint8_t *data;           ///< framebuffer data
 } FBDevContext;
 
-av_cold static int fbdev_read_header(AVFormatContext *avctx,
-                                     AVFormatParameters *ap)
+av_cold static int fbdev_read_header(AVFormatContext *avctx)
 {
     FBDevContext *fbdev = avctx->priv_data;
     AVStream *st = NULL;
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index e68559e..9f1bb23 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -221,7 +221,7 @@ static void stop_jack(JackData *self)
     ff_timefilter_destroy(self->timefilter);
 }
 
-static int audio_read_header(AVFormatContext *context, AVFormatParameters *params)
+static int audio_read_header(AVFormatContext *context)
 {
     JackData *self = context->priv_data;
     AVStream *stream;
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index e00272c..747adf9 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -46,7 +46,7 @@ typedef struct CDIOContext {
     int paranoia_mode;
 } CDIOContext;
 
-static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
+static av_cold int read_header(AVFormatContext *ctx)
 {
     CDIOContext *s = ctx->priv_data;
     AVStream *st;
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index ac4bb09..934e128 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -117,7 +117,7 @@ static const AVClass libdc1394_class = {
 };
 
 
-static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap,
+static inline int dc1394_read_common(AVFormatContext *c,
                                      struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps)
 {
     dc1394_data* dc1394 = c->priv_data;
@@ -191,7 +191,7 @@ out:
 }
 
 #if HAVE_LIBDC1394_1
-static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
+static int dc1394_v1_read_header(AVFormatContext *c)
 {
     dc1394_data* dc1394 = c->priv_data;
     AVStream* vst;
@@ -200,7 +200,7 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
     struct dc1394_frame_format *fmt = NULL;
     struct dc1394_frame_rate *fps = NULL;
 
-    if (dc1394_read_common(c,ap,&fmt,&fps) != 0)
+    if (dc1394_read_common(c, &fmt, &fps) != 0)
         return -1;
 
     /* Now let us prep the hardware. */
@@ -285,7 +285,7 @@ static int dc1394_v1_close(AVFormatContext * context)
 }
 
 #elif HAVE_LIBDC1394_2
-static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap)
+static int dc1394_v2_read_header(AVFormatContext *c)
 {
     dc1394_data* dc1394 = c->priv_data;
     dc1394camera_list_t *list;
@@ -293,7 +293,7 @@ static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap)
     struct dc1394_frame_format *fmt = NULL;
     struct dc1394_frame_rate *fps = NULL;
 
-    if (dc1394_read_common(c,ap,&fmt,&fps) != 0)
+    if (dc1394_read_common(c, &fmt, &fps) != 0)
        return -1;
 
     /* Now let us prep the hardware. */
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 308fc0d..e592c32 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -204,7 +204,7 @@ static int audio_write_trailer(AVFormatContext *s1)
 
 /* grab support */
 
-static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
+static int audio_read_header(AVFormatContext *s1)
 {
     AudioData *s = s1->priv_data;
     AVStream *st;
diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
index bffe391..da6ee72 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -66,8 +66,7 @@ static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
     }
 }
 
-static av_cold int pulse_read_header(AVFormatContext *s,
-                                     AVFormatParameters *ap)
+static av_cold int pulse_read_header(AVFormatContext *s)
 {
     PulseData *pd = s->priv_data;
     AVStream *st;
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index cc74c38..840dd09 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -28,8 +28,7 @@
 
 #include "sndio_common.h"
 
-static av_cold int audio_read_header(AVFormatContext *s1,
-                                     AVFormatParameters *ap)
+static av_cold int audio_read_header(AVFormatContext *s1)
 {
     SndioData *s = s1->priv_data;
     AVStream *st;
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 191decd..b9941d2 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -543,7 +543,7 @@ static void mmap_close(struct video_data *s)
     av_free(s->buf_len);
 }
 
-static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
+static int v4l2_set_parameters(AVFormatContext *s1)
 {
     struct video_data *s = s1->priv_data;
     struct v4l2_input input = { 0 };
@@ -678,7 +678,7 @@ static uint32_t device_try_init(AVFormatContext *s1,
     return desired_format;
 }
 
-static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
+static int v4l2_read_header(AVFormatContext *s1)
 {
     struct video_data *s = s1->priv_data;
     AVStream *st;
@@ -766,7 +766,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
 
     s->frame_format = desired_format;
 
-    if ((res = v4l2_set_parameters(s1, ap) < 0))
+    if ((res = v4l2_set_parameters(s1) < 0))
         goto out;
 
     st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index b5baee3..44cb813 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -238,7 +238,7 @@ static int vfw_read_close(AVFormatContext *s)
     return 0;
 }
 
-static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int vfw_read_header(AVFormatContext *s)
 {
     struct vfw_ctx *ctx = s->priv_data;
     AVCodecContext *codec;
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 9d12b2f..bf3011b 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -154,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s)
  *         </ul>
  */
 static int
-x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
+x11grab_read_header(AVFormatContext *s1)
 {
     struct x11_grab *x11grab = s1->priv_data;
     Display *dpy;
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index ccbe3ad..fa6a26b 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -91,8 +91,7 @@ static int fourxm_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int fourxm_read_header(AVFormatContext *s,
-                              AVFormatParameters *ap)
+static int fourxm_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     unsigned int fourcc_tag;
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 25c5910..df94d15 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -61,8 +61,7 @@ static int adts_aac_probe(AVProbeData *p)
     else                   return 0;
 }
 
-static int adts_aac_read_header(AVFormatContext *s,
-                                AVFormatParameters *ap)
+static int adts_aac_read_header(AVFormatContext *s)
 {
     AVStream *st;
 
diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index ab11d83..2431609 100644
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -62,7 +62,7 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-static int adx_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int adx_read_header(AVFormatContext *s)
 {
     ADXDemuxerContext *c = s->priv_data;
     AVCodecContext *avctx;
diff --git a/libavformat/aea.c b/libavformat/aea.c
index b33b45f..b62e560 100644
--- a/libavformat/aea.c
+++ b/libavformat/aea.c
@@ -54,8 +54,7 @@ static int aea_read_probe(AVProbeData *p)
     return 0;
 }
 
-static int aea_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int aea_read_header(AVFormatContext *s)
 {
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 0e69d02..46396cd 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -174,8 +174,7 @@ static int aiff_probe(AVProbeData *p)
 }
 
 /* aiff input */
-static int aiff_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int aiff_read_header(AVFormatContext *s)
 {
     int size, filesize;
     int64_t offset = 0;
diff --git a/libavformat/amr.c b/libavformat/amr.c
index b52ac49..708eace 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -76,8 +76,7 @@ static int amr_probe(AVProbeData *p)
 }
 
 /* amr input */
-static int amr_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int amr_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 7ceb2d8..f236ce6 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -76,8 +76,7 @@ static int find_record(const AnmDemuxContext *anm, int record)
     return AVERROR_INVALIDDATA;
 }
 
-static int read_header(AVFormatContext *s,
-                       AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AnmDemuxContext *anm = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/apc.c b/libavformat/apc.c
index 47ab5c8..30ddae3 100644
--- a/libavformat/apc.c
+++ b/libavformat/apc.c
@@ -30,7 +30,7 @@ static int apc_probe(AVProbeData *p)
     return 0;
 }
 
-static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int apc_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/ape.c b/libavformat/ape.c
index a60626e..080e0ba 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -152,7 +152,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
 #endif
 }
 
-static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
+static int ape_read_header(AVFormatContext * s)
 {
     AVIOContext *pb = s->pb;
     APEContext *ape = s->priv_data;
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index f62e2d0..32a51fe 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -443,7 +443,7 @@ reload:
     goto restart;
 }
 
-static int applehttp_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int applehttp_read_header(AVFormatContext *s)
 {
     AppleHTTPContext *c = s->priv_data;
     int ret = 0, i, j, stream_offset = 0;
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 91d285e..c5391a9 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -580,7 +580,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
     return 0;
 }
 
-static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int asf_read_header(AVFormatContext *s)
 {
     ASFContext *asf = s->priv_data;
     ff_asf_guid g;
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index b100f2c..bb1f525 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -73,7 +73,7 @@ static int event_cmp(uint8_t **a, uint8_t **b)
     return get_pts(*a) - get_pts(*b);
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     int i, len, header_remaining;
     ASSContext *ass = s->priv_data;
diff --git a/libavformat/au.c b/libavformat/au.c
index c6fb8db..e56869b 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -118,8 +118,7 @@ static int au_probe(AVProbeData *p)
 }
 
 /* au input */
-static int au_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int au_read_header(AVFormatContext *s)
 {
     int size;
     unsigned int tag;
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 18a80ac..ec343ba 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -491,8 +491,7 @@ typedef struct AVInputFormat {
      * additional parameters. Only used in raw format right
      * now. 'av_new_stream' should be called to create new streams.
      */
-    int (*read_header)(struct AVFormatContext *,
-                       AVFormatParameters *ap);
+    int (*read_header)(struct AVFormatContext *);
 
     /**
      * Read one packet and put it in 'pkt'. pts and flags are also
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index b4ccfb5..26ccaad 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -325,7 +325,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
     }
 }
 
-static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int avi_read_header(AVFormatContext *s)
 {
     AVIContext *avi = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 9449c1b..3b695a9 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -41,7 +41,7 @@ typedef struct {
   int next_stream;
 } AVISynthContext;
 
-static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int avisynth_read_header(AVFormatContext *s)
 {
   AVISynthContext *avs = s->priv_data;
   HRESULT res;
diff --git a/libavformat/avs.c b/libavformat/avs.c
index c6ccbb2..32e7546 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -55,7 +55,7 @@ static int avs_probe(AVProbeData * p)
     return 0;
 }
 
-static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap)
+static int avs_read_header(AVFormatContext * s)
 {
     AvsFormat *avs = s->priv_data;
 
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index 7705fcb..2c8a980 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -57,8 +57,7 @@ static int vid_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int vid_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int vid_read_header(AVFormatContext *s)
 {
     BVID_DemuxContext *vid = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index bb02e85..718e721 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -47,7 +47,7 @@ static int bfi_probe(AVProbeData * p)
         return 0;
 }
 
-static int bfi_read_header(AVFormatContext * s, AVFormatParameters * ap)
+static int bfi_read_header(AVFormatContext * s)
 {
     BFIContext *bfi = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/bink.c b/libavformat/bink.c
index ecf6905..d6af54f 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -68,7 +68,7 @@ static int probe(AVProbeData *p)
     return 0;
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     BinkDemuxContext *bink = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/bmv.c b/libavformat/bmv.c
index 1077efa..ebf59e9 100644
--- 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;
diff --git a/libavformat/c93.c b/libavformat/c93.c
index d82086d..21058da 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -57,8 +57,7 @@ static int probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream *video;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 4efc40f..abde78d 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -194,8 +194,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
     }
 }
 
-static int read_header(AVFormatContext *s,
-                       AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     CaffContext *caf  = s->priv_data;
diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index 0980df7..c0adf3b 100644
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -26,7 +26,7 @@
 #define CDG_COMMAND        0x09
 #define CDG_MASK           0x3F
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream *vst;
     int ret;
diff --git a/libavformat/daud.c b/libavformat/daud.c
index 9deca33..8de4aad 100644
--- a/libavformat/daud.c
+++ b/libavformat/daud.c
@@ -20,7 +20,7 @@
  */
 #include "avformat.h"
 
-static int daud_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int daud_header(AVFormatContext *s) {
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
diff --git a/libavformat/dfa.c b/libavformat/dfa.c
index ac49b61..283a607 100644
--- a/libavformat/dfa.c
+++ b/libavformat/dfa.c
@@ -31,8 +31,7 @@ static int dfa_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int dfa_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int dfa_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
index 801ca6a..f8ba68d 100644
--- a/libavformat/dsicin.c
+++ b/libavformat/dsicin.c
@@ -91,7 +91,7 @@ static int cin_read_file_header(CinDemuxContext *cin, AVIOContext *pb) {
     return 0;
 }
 
-static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int cin_read_header(AVFormatContext *s)
 {
     int rc;
     CinDemuxContext *cin = s->priv_data;
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 805f252..4106dfd 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -402,8 +402,7 @@ typedef struct RawDVContext {
     uint8_t         buf[DV_MAX_FRAME_SIZE];
 } RawDVContext;
 
-static int dv_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int dv_read_header(AVFormatContext *s)
 {
     unsigned state, marker_pos = 0;
     RawDVContext *c = s->priv_data;
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 0cc803d..13d2060 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -51,7 +51,7 @@ static int dxa_probe(AVProbeData *p)
         return 0;
 }
 
-static int dxa_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int dxa_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     DXAContext *c = s->priv_data;
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 8fe144e..ff9f1c8 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -45,7 +45,7 @@ static int cdata_probe(AVProbeData *p)
     return 0;
 }
 
-static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int cdata_read_header(AVFormatContext *s)
 {
     CdataDemuxContext *cdata = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 01ba479..a10e645 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -400,8 +400,7 @@ static int ea_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int ea_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int ea_read_header(AVFormatContext *s)
 {
     EaDemuxContext *ea = s->priv_data;
     AVStream *st;
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 9cee3ad..259b6ea 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -259,7 +259,7 @@ static int ffm_close(AVFormatContext *s)
 }
 
 
-static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int ffm_read_header(AVFormatContext *s)
 {
     FFMContext *ffm = s->priv_data;
     AVStream *st;
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index 21e5ee9..9774e94 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -123,7 +123,7 @@ static int read_tag(uint8_t *line, AVDictionary **m)
     return 0;
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVDictionary **m = &s->metadata;
     uint8_t line[1024];
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index 648fb4f..8d7b304 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -34,8 +34,7 @@ typedef struct {
     int leading;
 } FilmstripDemuxContext;
 
-static int read_header(AVFormatContext *s,
-                       AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     FilmstripDemuxContext *film = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 9e083d1..d127dc2 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -27,8 +27,7 @@
 #include "vorbiscomment.h"
 #include "libavcodec/bytestream.h"
 
-static int flac_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+static int flac_read_header(AVFormatContext *s)
 {
     int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
     uint8_t header[4];
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 7edc46e..849ec69 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -83,8 +83,7 @@ static int flic_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int flic_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int flic_read_header(AVFormatContext *s)
 {
     FlicDemuxContext *flic = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2f770b3..9296ef9 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -368,8 +368,7 @@ static AVStream *create_stream(AVFormatContext *s, int is_audio){
     return st;
 }
 
-static int flv_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int flv_read_header(AVFormatContext *s)
 {
     int offset, flags;
 
diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c
index 443f820..5d64958 100644
--- a/libavformat/gsmdec.c
+++ b/libavformat/gsmdec.c
@@ -54,7 +54,7 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-static int gsm_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int gsm_read_header(AVFormatContext *s)
 {
     GSMDemuxerContext *c = s->priv_data;
     AVStream *st = avformat_new_stream(s, NULL);
diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index ebc4eea..fcf6c93 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -259,7 +259,7 @@ static void gxf_read_index(AVFormatContext *s, int pkt_len) {
     avio_skip(pb, pkt_len);
 }
 
-static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int gxf_header(AVFormatContext *s) {
     AVIOContext *pb = s->pb;
     GXFPktType pkt_type;
     int map_len;
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index b26f2aa..eb2cb8b 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -138,8 +138,7 @@ static int idcin_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX / 2;
 }
 
-static int idcin_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+static int idcin_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     IdcinDemuxContext *idcin = s->priv_data;
diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
index d63c395..5c1528d 100644
--- a/libavformat/idroqdec.c
+++ b/libavformat/idroqdec.c
@@ -66,8 +66,7 @@ static int roq_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int roq_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int roq_read_header(AVFormatContext *s)
 {
     RoqDemuxContext *roq = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/iff.c b/libavformat/iff.c
index b895cf2..f5f39f0 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -107,8 +107,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;
diff --git a/libavformat/img2.c b/libavformat/img2.c
index e3e7d11..7203cb6 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -205,7 +205,7 @@ enum CodecID av_guess_image2_codec(const char *filename){
 }
 #endif
 
-static int read_header(AVFormatContext *s1, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s1)
 {
     VideoData *s = s1->priv_data;
     int first_index, last_index, ret = 0;
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index daa44b1..152b40e 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -535,8 +535,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;
diff --git a/libavformat/iss.c b/libavformat/iss.c
index ec6509c..c2ba1f0 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -65,7 +65,7 @@ static int iss_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static av_cold int iss_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static av_cold int iss_read_header(AVFormatContext *s)
 {
     IssDemuxContext *iss = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index 4f25441..903de6f 100644
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -37,7 +37,7 @@ static int probe(AVProbeData *p)
     return 0;
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream *st;
 
diff --git a/libavformat/ivfdec.c b/libavformat/ivfdec.c
index 03f7995..ae84a6f 100644
--- a/libavformat/ivfdec.c
+++ b/libavformat/ivfdec.c
@@ -32,7 +32,7 @@ static int probe(AVProbeData *p)
     return 0;
 }
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream *st;
     AVRational time_base;
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
index c24b0c2..82d96ca 100644
--- a/libavformat/jvdec.c
+++ b/libavformat/jvdec.c
@@ -58,8 +58,7 @@ static int read_probe(AVProbeData *pd)
     return 0;
 }
 
-static int read_header(AVFormatContext *s,
-                       AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     JVDemuxContext *jv = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index 56e8bfc..3bb3558 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -186,7 +186,7 @@ static off_t av_seek(void * h, long long pos, int whence) {
     return avio_seek(bc, pos, whence);
 }
 
-static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
+static int nut_read_header(AVFormatContext * avf) {
     NUTContext * priv = avf->priv_data;
     AVIOContext * bc = avf->pb;
     nut_demuxer_opts_tt dopts = {
diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index 5f26c4b..8daf7b4 100644
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -58,7 +58,7 @@ static int lmlm4_probe(AVProbeData * pd) {
     return 0;
 }
 
-static int lmlm4_read_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int lmlm4_read_header(AVFormatContext *s) {
     AVStream *st;
 
     if (!(st = avformat_new_stream(s, NULL)))
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index b3afa7e..ee12dfb 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -196,7 +196,7 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form
     return ret;
 }
 
-static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int lxf_read_header(AVFormatContext *s)
 {
     LXFDemuxContext *lxf = s->priv_data;
     AVIOContext   *pb  = s->pb;
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5b91944..8f34289 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1269,7 +1269,7 @@ static int matroska_aac_sri(int samplerate)
     return sri;
 }
 
-static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int matroska_read_header(AVFormatContext *s)
 {
     MatroskaDemuxContext *matroska = s->priv_data;
     EbmlList *attachements_list = &matroska->attachments;
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 341cf26..d25c978 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -81,8 +81,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)
 {
     MmDemuxContext *mm = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 8e4f2de..4d34cf2 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -180,8 +180,7 @@ static int mmf_probe(AVProbeData *p)
 }
 
 /* mmf input */
-static int mmf_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int mmf_read_header(AVFormatContext *s)
 {
     MMFContext *mmf = s->priv_data;
     unsigned int tag;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9fb4a21..b7d8a55 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2551,7 +2551,7 @@ finish:
     avio_seek(sc->pb, cur_pos, SEEK_SET);
 }
 
-static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mov_read_header(AVFormatContext *s)
 {
     MOVContext *mov = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 185d7b8..11f57ce 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -132,8 +132,7 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
     return 0;
 }
 
-static int mp3_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int mp3_read_header(AVFormatContext *s)
 {
     AVStream *st;
     int64_t off;
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 943121e..86e6f8e 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -52,7 +52,7 @@ static int mpc_probe(AVProbeData *p)
     return 0;
 }
 
-static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mpc_read_header(AVFormatContext *s)
 {
     MPCContext *c = s->priv_data;
     AVStream *st;
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index d956049..3c51ccd 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -188,7 +188,7 @@ static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, in
     }
 }
 
-static int mpc8_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mpc8_read_header(AVFormatContext *s)
 {
     MPCContext *c = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index f740a25..6a26d6d 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -104,8 +104,7 @@ typedef struct MpegDemuxContext {
     int sofdec;
 } MpegDemuxContext;
 
-static int mpegps_read_header(AVFormatContext *s,
-                              AVFormatParameters *ap)
+static int mpegps_read_header(AVFormatContext *s)
 {
     MpegDemuxContext *m = s->priv_data;
     const char *sofdec = "Sofdec";
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 15688a9..b105d8c 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1870,8 +1870,7 @@ static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
     return 0;
 }
 
-static int mpegts_read_header(AVFormatContext *s,
-                              AVFormatParameters *ap)
+static int mpegts_read_header(AVFormatContext *s)
 {
     MpegTSContext *ts = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c
index 7e76c07..9c0c3c7 100644
--- a/libavformat/msnwc_tcp.c
+++ b/libavformat/msnwc_tcp.c
@@ -70,7 +70,7 @@ static int msnwc_tcp_probe(AVProbeData *p)
     return -1;
 }
 
-static int msnwc_tcp_read_header(AVFormatContext *ctx, AVFormatParameters *ap)
+static int msnwc_tcp_read_header(AVFormatContext *ctx)
 {
     AVIOContext *pb = ctx->pb;
     AVCodecContext *codec;
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 2243733..2af9c2d 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -75,7 +75,7 @@ static int mtv_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mtv_read_header(AVFormatContext *s)
 {
     MTVDemuxContext *mtv = s->priv_data;
     AVIOContext   *pb  = s->pb;
diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 4782aad..6e937b2 100644
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -36,7 +36,7 @@ typedef struct MviDemuxContext {
     int video_frame_size;
 } MviDemuxContext;
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     MviDemuxContext *mvi = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index bbe862f..96b662f 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1648,7 +1648,7 @@ static inline void compute_partition_essence_offset(AVFormatContext *s,
     }
 }
 
-static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mxf_read_header(AVFormatContext *s)
 {
     MXFContext *mxf = s->priv_data;
     KLVPacket klv;
diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index a740364..3f8c3e3 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -37,7 +37,7 @@ typedef struct MXGContext {
     unsigned int cache_size;
 } MXGContext;
 
-static int mxg_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mxg_read_header(AVFormatContext *s)
 {
     AVStream *video_st, *audio_st;
     MXGContext *mxg = s->priv_data;
diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c
index ab1d302..44e227a 100644
--- a/libavformat/ncdec.c
+++ b/libavformat/ncdec.c
@@ -44,7 +44,7 @@ static int nc_probe(AVProbeData *probe_packet)
     return 0;
 }
 
-static int nc_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int nc_read_header(AVFormatContext *s)
 {
     AVStream *st = avformat_new_stream(s, NULL);
 
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 18dfde2..b5bc87a 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -269,7 +269,7 @@ static int nsv_resync(AVFormatContext *s)
     return -1;
 }
 
-static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
+static int nsv_parse_NSVf_header(AVFormatContext *s)
 {
     NSVContext *nsv = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -391,7 +391,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
     return 0;
 }
 
-static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap)
+static int nsv_parse_NSVs_header(AVFormatContext *s)
 {
     NSVContext *nsv = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -512,7 +512,7 @@ fail:
     return -1;
 }
 
-static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int nsv_read_header(AVFormatContext *s)
 {
     NSVContext *nsv = s->priv_data;
     int i, err;
@@ -527,10 +527,10 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         if (nsv_resync(s) < 0)
             return -1;
         if (nsv->state == NSV_FOUND_NSVF)
-            err = nsv_parse_NSVf_header(s, ap);
+            err = nsv_parse_NSVf_header(s);
             /* we need the first NSVs also... */
         if (nsv->state == NSV_FOUND_NSVS) {
-            err = nsv_parse_NSVs_header(s, ap);
+            err = nsv_parse_NSVs_header(s);
             break; /* we just want the first one */
         }
     }
@@ -571,7 +571,7 @@ null_chunk_retry:
     if (err < 0)
         return err;
     if (nsv->state == NSV_FOUND_NSVS)
-        err = nsv_parse_NSVs_header(s, NULL);
+        err = nsv_parse_NSVs_header(s);
     if (err < 0)
         return err;
     if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 9cec89e..8d1b17d 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -596,7 +596,7 @@ fail:
     return ret;
 }
 
-static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int nut_read_header(AVFormatContext *s)
 {
     NUTContext *nut = s->priv_data;
     AVIOContext *bc = s->pb;
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 262c4c5..86be778 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -122,7 +122,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst,
     return 0;
 }
 
-static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int nuv_header(AVFormatContext *s) {
     NUVContext *ctx = s->priv_data;
     AVIOContext *pb = s->pb;
     char id_string[12];
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 36e2c45..79aa98f 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -494,7 +494,7 @@ static int ogg_get_length(AVFormatContext *s)
     return 0;
 }
 
-static int ogg_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int ogg_read_header(AVFormatContext *s)
 {
     struct ogg *ogg = s->priv_data;
     int ret, i;
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 0beed71..3bff790 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -256,8 +256,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
     return 0;
 }
 
-static int oma_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int oma_read_header(AVFormatContext *s)
 {
     int     ret, framesize, jsflag, samplerate;
     uint32_t codec_params;
diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c
index 96c7048..9df39be 100644
--- a/libavformat/pmpdec.c
+++ b/libavformat/pmpdec.c
@@ -39,7 +39,7 @@ static int pmp_probe(AVProbeData *p)
     return 0;
 }
 
-static int pmp_header(AVFormatContext *s, AVFormatParameters *ap)
+static int pmp_header(AVFormatContext *s)
 {
     PMPContext *pmp = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index d22de08..988d1f0 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -96,8 +96,7 @@ static int str_probe(AVProbeData *p)
     return 50;
 }
 
-static int str_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int str_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     StrDemuxContext *str = s->priv_data;
diff --git a/libavformat/pva.c b/libavformat/pva.c
index 263fb5f..21373a5 100644
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -41,7 +41,7 @@ static int pva_probe(AVProbeData * pd) {
     return 0;
 }
 
-static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int pva_read_header(AVFormatContext *s) {
     AVStream *st;
 
     if (!(st = avformat_new_stream(s, NULL)))
diff --git a/libavformat/qcp.c b/libavformat/qcp.c
index 191e9dd..6545a1c 100644
--- a/libavformat/qcp.c
+++ b/libavformat/qcp.c
@@ -80,7 +80,7 @@ static int qcp_probe(AVProbeData *pd)
     return 0;
 }
 
-static int qcp_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int qcp_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     QCPContext    *c  = s->priv_data;
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 73e7398..7f0e8de 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -159,7 +159,7 @@ static void r3d_read_reos(AVFormatContext *s)
     avio_skip(s->pb, 6*4);
 }
 
-static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int r3d_read_header(AVFormatContext *s)
 {
     R3DContext *r3d = s->priv_data;
     Atom atom;
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 3e2dd05..9400a0b 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -29,7 +29,7 @@
 #include "libavutil/pixdesc.h"
 
 /* raw input */
-int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
+int ff_raw_read_header(AVFormatContext *s)
 {
     AVStream *st;
     enum CodecID id;
@@ -120,8 +120,7 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-int ff_raw_audio_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+int ff_raw_audio_read_header(AVFormatContext *s)
 {
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
@@ -136,8 +135,7 @@ int ff_raw_audio_read_header(AVFormatContext *s,
 }
 
 /* MPEG-1/H.263 input */
-int ff_raw_video_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+int ff_raw_video_read_header(AVFormatContext *s)
 {
     AVStream *st;
     FFRawVideoDemuxerContext *s1 = s->priv_data;
diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h
index 136f6c2..cfb1689 100644
--- a/libavformat/rawdec.h
+++ b/libavformat/rawdec.h
@@ -41,13 +41,13 @@ typedef struct FFRawVideoDemuxerContext {
 
 extern const AVOption ff_rawvideo_options[];
 
-int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap);
+int ff_raw_read_header(AVFormatContext *s);
 
 int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
 
-int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap);
+int ff_raw_audio_read_header(AVFormatContext *s);
 
-int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap);
+int ff_raw_video_read_header(AVFormatContext *s);
 
 #define FF_RAWVIDEO_DEMUXER_CLASS(name)\
 static const AVClass name ## _demuxer_class = {\
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index b2be7c0..8ec76ff 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -72,8 +72,7 @@ static int rl2_probe(AVProbeData *p)
  * @param ap format parameters
  * @return 0 on success, AVERROR otherwise
  */
-static av_cold int rl2_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static av_cold int rl2_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 75e4833..ee8abdd 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -403,7 +403,7 @@ static int rm_read_header_old(AVFormatContext *s)
     return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1);
 }
 
-static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int rm_read_header(AVFormatContext *s)
 {
     RMDemuxContext *rm = s->priv_data;
     AVStream *st;
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 0fa00f3..3454fbe 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -110,7 +110,7 @@ static AVRational read_fps(const char* line, int* error)
     return result;
 }
 
-static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int rpl_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     RPLContext *rpl = s->priv_data;
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index 54a3faa..c148b2e 100644
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -27,7 +27,7 @@
 #include "riff.h"
 #include "rso.h"
 
-static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int rso_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     int id, rate, bps;
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 487e910..0c42829 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1849,7 +1849,7 @@ static int sdp_probe(AVProbeData *p1)
     return 0;
 }
 
-static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int sdp_read_header(AVFormatContext *s)
 {
     RTSPState *rt = s->priv_data;
     RTSPStream *rtsp_st;
@@ -1935,8 +1935,7 @@ static int rtp_probe(AVProbeData *p)
     return 0;
 }
 
-static int rtp_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int rtp_read_header(AVFormatContext *s)
 {
     uint8_t recvbuf[1500];
     char host[500], sdp[500];
@@ -2013,7 +2012,7 @@ static int rtp_read_header(AVFormatContext *s,
 
     rt->media_type_mask = (1 << (AVMEDIA_TYPE_DATA+1)) - 1;
 
-    ret = sdp_read_header(s, ap);
+    ret = sdp_read_header(s);
     s->pb = NULL;
     return ret;
 
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 1b4982f..785d162 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -150,8 +150,7 @@ static int rtsp_probe(AVProbeData *p)
     return 0;
 }
 
-static int rtsp_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int rtsp_read_header(AVFormatContext *s)
 {
     RTSPState *rt = s->priv_data;
     int ret;
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c
index 531cfd2..aa176c7 100644
--- a/libavformat/sapdec.c
+++ b/libavformat/sapdec.c
@@ -60,8 +60,7 @@ static int sap_read_close(AVFormatContext *s)
     return 0;
 }
 
-static int sap_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int sap_read_header(AVFormatContext *s)
 {
     struct SAPState *sap = s->priv_data;
     char host[1024], path[1024], url[1024];
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 5c346a7..83ba4f0 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -75,8 +75,7 @@ static int film_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int film_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int film_read_header(AVFormatContext *s)
 {
     FilmDemuxContext *film = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 81ff46f..48b192e 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -78,8 +78,7 @@ static int vmd_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX / 2;
 }
 
-static int vmd_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int vmd_read_header(AVFormatContext *s)
 {
     VmdDemuxContext *vmd = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/siff.c b/libavformat/siff.c
index 9f4d733..7e5b0b4 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -153,7 +153,7 @@ static int siff_parse_soun(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
     return create_audio_stream(s, c);
 }
 
-static int siff_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int siff_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     SIFFContext *c = s->priv_data;
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 770f536..adc67e7 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -98,7 +98,7 @@ static int smacker_probe(AVProbeData *p)
         return 0;
 }
 
-static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int smacker_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     SmackerContext *smk = s->priv_data;
diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c
index d7ff979..05a9283 100644
--- a/libavformat/smjpegdec.c
+++ b/libavformat/smjpegdec.c
@@ -41,7 +41,7 @@ static int smjpeg_probe(AVProbeData *p)
     return 0;
 }
 
-static int smjpeg_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int smjpeg_read_header(AVFormatContext *s)
 {
     SMJPEGContext *sc = s->priv_data;
     AVStream *ast = NULL, *vst = NULL;
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 31c84ce..4b3a5ad 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -82,8 +82,7 @@ static int sol_channels(int magic, int type)
     return 2;
 }
 
-static int sol_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int sol_read_header(AVFormatContext *s)
 {
     unsigned int magic,tag;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index 1074b3f..29d13d4 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -44,8 +44,7 @@ static int sox_probe(AVProbeData *p)
     return 0;
 }
 
-static int sox_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int sox_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     unsigned header_size, comment_size;
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index 3daf23f..106dd8f 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -155,7 +155,7 @@ static int spdif_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX / 8;
 }
 
-static int spdif_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int spdif_read_header(AVFormatContext *s)
 {
     s->ctx_flags |= AVFMTCTX_NOHEADER;
     return 0;
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index ca0a304..d170f9f 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -40,7 +40,7 @@ static int srt_probe(AVProbeData *p)
     return 0;
 }
 
-static int srt_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int srt_read_header(AVFormatContext *s)
 {
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 1fc301b..842cda3 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -52,7 +52,7 @@ static int swf_probe(AVProbeData *p)
         return 0;
 }
 
-static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int swf_read_header(AVFormatContext *s)
 {
     SWFContext *swf = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/thp.c b/libavformat/thp.c
index 25efcbb..731f5af 100644
--- a/libavformat/thp.c
+++ b/libavformat/thp.c
@@ -54,8 +54,7 @@ static int thp_probe(AVProbeData *p)
         return 0;
 }
 
-static int thp_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int thp_read_header(AVFormatContext *s)
 {
     ThpDemuxContext *thp = s->priv_data;
     AVStream *st;
diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
index 0590190..194c83a 100644
--- a/libavformat/tiertexseq.c
+++ b/libavformat/tiertexseq.c
@@ -181,7 +181,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, AVIOContext *pb)
     return 0;
 }
 
-static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int seq_read_header(AVFormatContext *s)
 {
     int i, rc;
     SeqDemuxContext *seq = s->priv_data;
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index 73b44bb..0f8ab59 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -63,7 +63,7 @@ static int tmv_probe(AVProbeData *p)
     return 0;
 }
 
-static int tmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int tmv_read_header(AVFormatContext *s)
 {
     TMVContext *tmv   = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/tta.c b/libavformat/tta.c
index 6bf0979..4d6bc0a 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -38,7 +38,7 @@ static int tta_probe(AVProbeData *p)
     return 0;
 }
 
-static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int tta_read_header(AVFormatContext *s)
 {
     TTAContext *c = s->priv_data;
     AVStream *st;
diff --git a/libavformat/tty.c b/libavformat/tty.c
index 8041900..84f9937 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -72,8 +72,7 @@ static int efi_read(AVFormatContext *avctx, uint64_t start_pos)
     return 0;
 }
 
-static int read_header(AVFormatContext *avctx,
-                       AVFormatParameters *ap)
+static int read_header(AVFormatContext *avctx)
 {
     TtyDemuxContext *s = avctx->priv_data;
     int width = 0, height = 0, ret = 0;
diff --git a/libavformat/txd.c b/libavformat/txd.c
index a601ea0..acf1555 100644
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -37,7 +37,7 @@ static int txd_probe(AVProbeData * pd) {
     return 0;
 }
 
-static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int txd_read_header(AVFormatContext *s) {
     AVStream *st;
 
     st = avformat_new_stream(s, NULL);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 17eec07..51774e0 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -608,7 +608,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
 {
     AVFormatContext *s = *ps;
     int ret = 0;
-    AVFormatParameters ap = { { 0 } };
     AVDictionary *tmp = NULL;
 
     if (!s && !(s = avformat_alloc_context()))
@@ -655,7 +654,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
         ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC);
 
     if (s->iformat->read_header)
-        if ((ret = s->iformat->read_header(s, &ap)) < 0)
+        if ((ret = s->iformat->read_header(s)) < 0)
             goto fail;
 
     if (s->pb && !s->data_offset)
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index 6789b9d..3354ad4 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -42,8 +42,7 @@ static int vc1t_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX/2;
 }
 
-static int vc1t_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int vc1t_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 638c15a..6b3438f 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -38,7 +38,7 @@ static int voc_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int voc_read_header(AVFormatContext *s)
 {
     VocDecContext *voc = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index 4f8f07c..08ffa73 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -86,7 +86,7 @@ static const AVMetadataConv vqf_metadata_conv[] = {
     { 0 },
 };
 
-static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int vqf_read_header(AVFormatContext *s)
 {
     VqfContext *c = s->priv_data;
     AVStream *st  = avformat_new_stream(s, NULL);
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 47cb5f8..7b3a0f4 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -379,8 +379,7 @@ static const AVMetadataConv wav_metadata_conv[] = {
 };
 
 /* wav input */
-static int wav_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int wav_read_header(AVFormatContext *s)
 {
     int64_t size, av_uninit(data_size);
     int64_t sample_count=0;
@@ -621,7 +620,7 @@ static int w64_probe(AVProbeData *p)
         return 0;
 }
 
-static int w64_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int w64_read_header(AVFormatContext *s)
 {
     int64_t size;
     AVIOContext *pb  = s->pb;
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index af5470f..05e25fc 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -83,8 +83,7 @@ static int wc3_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int wc3_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int wc3_read_header(AVFormatContext *s)
 {
     Wc3DemuxContext *wc3 = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index f083a86..a7148eb 100644
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -81,8 +81,7 @@ static int wsaud_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX / 2;
 }
 
-static int wsaud_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+static int wsaud_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     AVStream *st;
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index c2aebe5..c4e19a9 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -73,8 +73,7 @@ static int wsvqa_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int wsvqa_read_header(AVFormatContext *s,
-                             AVFormatParameters *ap)
+static int wsvqa_read_header(AVFormatContext *s)
 {
     WsVqaDemuxContext *wsvqa = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index c619868..07549b2 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -945,7 +945,7 @@ static const uint8_t timeline_table_0_entries_Events_le16[] =
     {'t'_'i'_'m'_'e'_'l'_'i'_'n'_'e'_'.'_'t'_'a'_'b'_'l'_'e'_'.'_'0'_'.'_'e'_'n'_'t'_'r'_'i'_'e'_'s'_'.'_'E'_'v'_'e'_'n'_'t'_'s', 0};
 #undef _
 
-static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     WtvContext *wtv = s->priv_data;
     int root_sector, root_size;
diff --git a/libavformat/wv.c b/libavformat/wv.c
index 5f7b3b4..c39cc68 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -203,8 +203,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb, int appen
     return 0;
 }
 
-static int wv_read_header(AVFormatContext *s,
-                          AVFormatParameters *ap)
+static int wv_read_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
     WVContext *wc = s->priv_data;
diff --git a/libavformat/xa.c b/libavformat/xa.c
index 0a1ad59..c5e5cf5 100644
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -63,8 +63,7 @@ static int xa_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX/2;
 }
 
-static int xa_read_header(AVFormatContext *s,
-               AVFormatParameters *ap)
+static int xa_read_header(AVFormatContext *s)
 {
     MaxisXADemuxContext *xa = s->priv_data;
     AVIOContext *pb = s->pb;
diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index bc4b239..6fa9a6a 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -126,8 +126,7 @@ static int xmv_probe(AVProbeData *p)
     return 0;
 }
 
-static int xmv_read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int xmv_read_header(AVFormatContext *s)
 {
     XMVDemuxContext *xmv = s->priv_data;
     AVIOContext     *pb  = s->pb;
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 5839bdc..2c6ee11 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -40,7 +40,7 @@ static int xwma_probe(AVProbeData *p)
     return 0;
 }
 
-static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int xwma_read_header(AVFormatContext *s)
 {
     int64_t size, av_uninit(data_size);
     int ret;
diff --git a/libavformat/yop.c b/libavformat/yop.c
index e5ace8b..e500259 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -47,7 +47,7 @@ static int yop_probe(AVProbeData *probe_packet)
     return 0;
 }
 
-static int yop_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int yop_read_header(AVFormatContext *s)
 {
     YopDecContext *yop = s->priv_data;
     AVIOContext *pb  = s->pb;
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 698ee68..afb5bfa 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -190,7 +190,7 @@ AVOutputFormat ff_yuv4mpegpipe_muxer = {
 #define MAX_YUV4_HEADER 80
 #define MAX_FRAME_HEADER 80
 
-static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int yuv4_read_header(AVFormatContext *s)
 {
     char header[MAX_YUV4_HEADER + 10];  // Include headroom for
                                         // the longest option
-- 
2.7.4