From 0aa8fa963f7965359d0eacc19b7e8db1f2288ce1 Mon Sep 17 00:00:00 2001 From: Aleksandr Slobodeniuk Date: Fri, 14 Jul 2017 14:03:20 +0300 Subject: avformat/riff.h : remove unused function parameter "const AVCodecTag *tags" of "void ff_put_bmp_header()" Reviewed-by: Derek Buitenhuis Signed-off-by: Michael Niedermayer --- libavformat/asfenc.c | 2 +- libavformat/avienc.c | 2 +- libavformat/matroskaenc.c | 2 +- libavformat/riff.h | 2 +- libavformat/riffenc.c | 2 +- libavformat/wtvenc.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libavformat') diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 1b67143afd..3cfe75a5d5 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -683,7 +683,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, avio_wl16(pb, 40 + par->extradata_size); /* size */ /* BITMAPINFOHEADER header */ - ff_put_bmp_header(pb, par, ff_codec_bmp_tags, 1, 0); + ff_put_bmp_header(pb, par, 1, 0); } end_header(pb, hpos); } diff --git a/libavformat/avienc.c b/libavformat/avienc.c index da3d3deb3b..483f5b54b1 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -450,7 +450,7 @@ static int avi_write_header(AVFormatContext *s) && par->bits_per_coded_sample == 15) par->bits_per_coded_sample = 16; avist->pal_offset = avio_tell(pb) + 40; - ff_put_bmp_header(pb, par, ff_codec_bmp_tags, 0, 0); + ff_put_bmp_header(pb, par, 0, 0); pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_avi, par->bits_per_coded_sample); if ( !par->codec_tag diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 24114d6755..9cc7be352e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -839,7 +839,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, ret = AVERROR(EINVAL); } - ff_put_bmp_header(dyn_cp, par, ff_codec_bmp_tags, 0, 0); + ff_put_bmp_header(dyn_cp, par, 0, 0); } } else if (par->codec_type == AVMEDIA_TYPE_AUDIO) { unsigned int tag; diff --git a/libavformat/riff.h b/libavformat/riff.h index d30d793cd1..c916d1a587 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -45,7 +45,7 @@ void ff_end_tag(AVIOContext *pb, int64_t start); */ int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize); -void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, const AVCodecTag *tags, int for_asf, int ignore_extradata); +void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int ignore_extradata); /** * Tell ff_put_wav_header() to use WAVEFORMATEX even for PCM codecs. diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index c96329da48..c04d55c423 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -207,7 +207,7 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, /* BITMAPINFOHEADER header */ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, - const AVCodecTag *tags, int for_asf, int ignore_extradata) + int for_asf, int ignore_extradata) { int keep_height = par->extradata_size >= 9 && !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9); diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index a7ca1c39aa..4925a60049 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -241,7 +241,7 @@ static void put_videoinfoheader2(AVIOContext *pb, AVStream *st) avio_wl32(pb, 0); avio_wl32(pb, 0); - ff_put_bmp_header(pb, st->codecpar, ff_codec_bmp_tags, 0, 1); + ff_put_bmp_header(pb, st->codecpar, 0, 1); if (st->codecpar->codec_id == AV_CODEC_ID_MPEG2VIDEO) { int padding = (st->codecpar->extradata_size & 3) ? 4 - (st->codecpar->extradata_size & 3) : 0; -- cgit v1.2.3