lavf: remove AVFormatParameters from AVFormatContext.read_header signature

116 files changed, 128 insertions, 179 deletions

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index ccbe3add3f..fa6a26bcc2 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 25c59108fe..df94d15831 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 ab11d832d8..243160940c 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 b33b45f927..b62e56030a 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 0e69d02c8c..46396cda6f 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 b52ac49128..708eace1f9 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 7ceb2d8918..f236ce6eed 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 47ab5c821b..30ddae3665 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 a60626e133..080e0ba8f6 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 f62e2d074f..32a51fede1 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 91d285e8b5..c5391a9d62 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 b100f2c5d1..bb1f525616 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 c6fb8dbaa9..e56869b4b9 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 18a80ac291..ec343ba90d 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 b4ccfb50f8..26ccaadd12 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 9449c1b608..3b695a9a0a 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 c6ccbb2cd2..32e7546d60 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 7705fcb5f6..2c8a980730 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 bb02e85581..718e721356 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 ecf6905843..d6af54f96e 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 1077efa573..ebf59e9f23 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 d82086d296..21058da727 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 4efc40f1af..abde78d56c 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 0980df7ebf..c0adf3b917 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 9deca33bde..8de4aad119 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 ac49b6104b..283a607168 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 801ca6af22..f8ba68d962 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 805f25271c..4106dfdce3 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 0cc803d7bf..13d2060465 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 8fe144e6a9..ff9f1c8ef5 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 01ba479fac..a10e64592c 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 9cee3ad64f..259b6ead3f 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 21e5ee9da4..9774e946b2 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 648fb4f384..8d7b304472 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 9e083d116c..d127dc209f 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 7edc46e2a7..849ec6912d 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 2f770b30f2..9296ef9d31 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 443f820ad8..5d6495860a 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 ebc4eeafa5..fcf6c93858 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 b26f2aaa8b..eb2cb8bf55 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 d63c395b79..5c1528de0f 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 b895cf2e67..f5f39f06aa 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 e3e7d11e43..7203cb62d9 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 daa44b173f..152b40ec7b 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 ec6509c8b0..c2ba1f0eb5 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 4f25441e8c..903de6f8a4 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 03f799556d..ae84a6fd81 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 c24b0c2b1a..82d96ca071 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 56e8bfc98d..3bb355852e 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 5f26c4beca..8daf7b45c4 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 b3afa7e857..ee12dfbb98 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 5b919449f5..8f34289eb5 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 341cf26a1c..d25c978ac4 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 8e4f2de767..4d34cf2ac4 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 9fb4a21c8c..b7d8a55933 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 185d7b8676..11f57ce1a9 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 943121e5fd..86e6f8e5b8 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 d9560496f7..3c51ccd037 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 f740a25f89..6a26d6d292 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 15688a9747..b105d8c108 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 7e76c07ca6..9c0c3c79f4 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 2243733812..2af9c2dd56 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 4782aad479..6e937b2acd 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 bbe862ff6a..96b662f431 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 a74036436f..3f8c3e339e 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 ab1d302a82..44e227ad8f 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 18dfde2867..b5bc87aa8c 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 9cec89e622..8d1b17ddc9 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 262c4c58e9..86be778e4c 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 36e2c452da..79aa98f83d 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 0beed7165d..3bff790a56 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 96c7048570..9df39be0a1 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 d22de0887f..988d1f095e 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 263fb5fdc1..21373a5367 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 191e9dd85b..6545a1cdfd 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 73e73986ff..7f0e8de0e4 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 3e2dd05940..9400a0bd32 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 136f6c2d48..cfb1689cd9 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 b2be7c0ca9..8ec76ff921 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 75e4833c4c..ee8abdd800 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 0fa00f3f52..3454fbe491 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 54a3faa076..c148b2ee57 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 487e910c17..0c42829d39 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 1b4982f212..785d162b41 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 531cfd204d..aa176c73ee 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 5c346a75bb..83ba4f06ad 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 81ff46fea0..48b192e04c 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 9f4d73374c..7e5b0b4d8c 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 770f5364d3..adc67e727e 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 d7ff9799ef..05a92839da 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 31c84ceba0..4b3a5adbc0 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 1074b3fb2a..29d13d4f7b 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 3daf23fb69..106dd8f479 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 ca0a304993..d170f9f856 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 1fc301b696..842cda3349 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 25efcbba82..731f5af968 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 0590190312..194c83abc1 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 73b44bbc1d..0f8ab597ad 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 6bf097975a..4d6bc0aff2 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 8041900987..84f99377da 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 a601ea0853..acf15554ff 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 17eec072d0..51774e0ff2 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 6789b9d283..3354ad4b8f 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 638c15ae4b..6b3438f758 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 4f8f07c919..08ffa734c1 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 47cb5f8040..7b3a0f44f3 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 af5470f6f2..05e25fc44d 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 f083a86baf..a7148eb08b 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 c2aebe5e80..c4e19a9981 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 c6198680c7..07549b2cc5 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 5f7b3b442a..c39cc6843c 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 0a1ad59f2c..c5e5cf5864 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 bc4b23917a..6fa9a6a0a7 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 5839bdcd22..2c6ee114bd 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 e5ace8b805..e50025970d 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 698ee6814d..afb5bfaab2 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