From 412b4367c5b93586b42ea95a90d7c2f9f3e4b710 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 16 Jul 2011 09:43:33 +0200 Subject: rmdec: remove useless ap parameter from rm_read_header_old() --- libavformat/rmdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index fbc4d0cee6..69c4ffe400 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -371,7 +371,7 @@ skip: return 0; } -static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap) +static int rm_read_header_old(AVFormatContext *s) { RMDemuxContext *rm = s->priv_data; AVStream *st; @@ -399,7 +399,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) tag = avio_rl32(pb); if (tag == MKTAG('.', 'r', 'a', 0xfd)) { /* very old .ra format */ - return rm_read_header_old(s, ap); + return rm_read_header_old(s); } else if (tag != MKTAG('.', 'R', 'M', 'F')) { return AVERROR(EIO); } -- cgit v1.2.3 From dfc2c4d900e48fa788ad9364ac408c01cfb62b94 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 16 Jul 2011 22:18:12 +0200 Subject: lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage. --- libavformat/rmdec.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 69c4ffe400..3f4d333c47 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -935,23 +935,19 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index, } AVInputFormat ff_rm_demuxer = { - "rm", - NULL_IF_CONFIG_SMALL("RealMedia format"), - sizeof(RMDemuxContext), - rm_probe, - rm_read_header, - rm_read_packet, - rm_read_close, - NULL, - rm_read_dts, + .name = "rm", + .long_name = NULL_IF_CONFIG_SMALL("RealMedia format"), + .priv_data_size = sizeof(RMDemuxContext), + .read_probe = rm_probe, + .read_header = rm_read_header, + .read_packet = rm_read_packet, + .read_close = rm_read_close, + .read_timestamp = rm_read_dts, }; AVInputFormat ff_rdt_demuxer = { - "rdt", - NULL_IF_CONFIG_SMALL("RDT demuxer"), - sizeof(RMDemuxContext), - NULL, - NULL, - NULL, - rm_read_close, + .name = "rdt", + .long_name = NULL_IF_CONFIG_SMALL("RDT demuxer"), + .priv_data_size = sizeof(RMDemuxContext), + .read_close = rm_read_close, }; -- cgit v1.2.3