diff --git a/libavformat/au.c b/libavformat/au.c index 0a6594b574..5e15517c91 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -172,11 +172,6 @@ static int au_read_packet(AVFormatContext *s, return 0; } -static int au_read_close(AVFormatContext *s) -{ - return 0; -} - #ifdef CONFIG_AU_DEMUXER AVInputFormat au_demuxer = { "au", @@ -185,7 +180,7 @@ AVInputFormat au_demuxer = { au_probe, au_read_header, au_read_packet, - au_read_close, + NULL, pcm_read_seek, .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0}, }; diff --git a/libavformat/flic.c b/libavformat/flic.c index adfa637f44..f22a5eec3e 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -185,13 +185,6 @@ static int flic_read_packet(AVFormatContext *s, return ret; } -static int flic_read_close(AVFormatContext *s) -{ -// FlicDemuxContext *flic = s->priv_data; - - return 0; -} - AVInputFormat flic_demuxer = { "flic", NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"), @@ -199,5 +192,4 @@ AVInputFormat flic_demuxer = { flic_probe, flic_read_header, flic_read_packet, - flic_read_close, }; diff --git a/libavformat/idcin.c b/libavformat/idcin.c index b84bf1c74a..1a8e558e5d 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -280,12 +280,6 @@ static int idcin_read_packet(AVFormatContext *s, return ret; } -static int idcin_read_close(AVFormatContext *s) -{ - - return 0; -} - AVInputFormat idcin_demuxer = { "idcin", NULL_IF_CONFIG_SMALL("id CIN format"), @@ -293,5 +287,4 @@ AVInputFormat idcin_demuxer = { idcin_probe, idcin_read_header, idcin_read_packet, - idcin_read_close, }; diff --git a/libavformat/idroq.c b/libavformat/idroq.c index 59e0bc5f7a..801f3dc450 100644 --- a/libavformat/idroq.c +++ b/libavformat/idroq.c @@ -270,13 +270,6 @@ static int roq_read_packet(AVFormatContext *s, return ret; } -static int roq_read_close(AVFormatContext *s) -{ -// RoqDemuxContext *roq = s->priv_data; - - return 0; -} - AVInputFormat roq_demuxer = { "RoQ", NULL_IF_CONFIG_SMALL("id RoQ format"), @@ -284,5 +277,4 @@ AVInputFormat roq_demuxer = { roq_probe, roq_read_header, roq_read_packet, - roq_read_close, }; diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index d00f788d9c..c2c5585daa 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -607,13 +607,6 @@ static int ipmovie_read_packet(AVFormatContext *s, return ret; } -static int ipmovie_read_close(AVFormatContext *s) -{ -// IPMVEContext *ipmovie = s->priv_data; - - return 0; -} - AVInputFormat ipmovie_demuxer = { "ipmovie", NULL_IF_CONFIG_SMALL("Interplay MVE format"), @@ -621,5 +614,4 @@ AVInputFormat ipmovie_demuxer = { ipmovie_probe, ipmovie_read_header, ipmovie_read_packet, - ipmovie_read_close, }; diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 5a75a95fbe..c54f0ee4ab 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -549,11 +549,6 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } -static int mp3_read_close(AVFormatContext *s) -{ - return 0; -} - #ifdef CONFIG_MUXERS /* simple formats */ @@ -651,7 +646,6 @@ AVInputFormat mp3_demuxer = { mp3_read_probe, mp3_read_header, mp3_read_packet, - mp3_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "mp2,mp3,m2a", /* XXX: use probe */ }; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 6e63c4342e..7c4f7d9313 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -542,11 +542,6 @@ static int mpegps_read_packet(AVFormatContext *s, return 0; } -static int mpegps_read_close(AVFormatContext *s) -{ - return 0; -} - static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) { @@ -588,7 +583,7 @@ AVInputFormat mpegps_demuxer = { mpegps_probe, mpegps_read_header, mpegps_read_packet, - mpegps_read_close, + NULL, NULL, //mpegps_read_seek, mpegps_read_dts, .flags = AVFMT_SHOW_IDS, diff --git a/libavformat/raw.c b/libavformat/raw.c index 3d91a29393..3d8dbd0f8b 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -188,11 +188,6 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } -static int raw_read_close(AVFormatContext *s) -{ - return 0; -} - int pcm_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { @@ -436,7 +431,6 @@ AVInputFormat shorten_demuxer = { NULL, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "shn", .value = CODEC_ID_SHORTEN, @@ -449,7 +443,6 @@ AVInputFormat mlp_demuxer = { NULL, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "mlp", .value = CODEC_ID_MLP, @@ -462,7 +455,6 @@ AVInputFormat flac_demuxer = { flac_probe, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "flac", .value = CODEC_ID_FLAC, @@ -491,7 +483,6 @@ AVInputFormat ac3_demuxer = { ac3_probe, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "ac3", .value = CODEC_ID_AC3, @@ -534,7 +525,6 @@ AVInputFormat dirac_demuxer = { dirac_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .value = CODEC_ID_DIRAC, }; @@ -561,7 +551,6 @@ AVInputFormat dts_demuxer = { dts_probe, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "dts", .value = CODEC_ID_DTS, @@ -574,7 +563,6 @@ AVInputFormat aac_demuxer = { NULL, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "aac", .value = CODEC_ID_AAC, @@ -587,7 +575,6 @@ AVInputFormat gsm_demuxer = { NULL, audio_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "gsm", .value = CODEC_ID_GSM, @@ -615,7 +602,6 @@ AVInputFormat h261_demuxer = { h261_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "h261", .value = CODEC_ID_H261, @@ -643,7 +629,6 @@ AVInputFormat h263_demuxer = { h263_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, // .extensions = "h263", //FIXME remove after writing mpeg4_probe .value = CODEC_ID_H263, @@ -671,7 +656,6 @@ AVInputFormat m4v_demuxer = { mpeg4video_probe, /** probing for mpeg4 data */ video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "m4v", //FIXME remove after writing mpeg4_probe .value = CODEC_ID_MPEG4, @@ -699,7 +683,6 @@ AVInputFormat h264_demuxer = { NULL /*mpegvideo_probe*/, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe .value = CODEC_ID_H264, @@ -727,7 +710,6 @@ AVInputFormat mpegvideo_demuxer = { mpegvideo_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .value = CODEC_ID_MPEG1VIDEO, }; @@ -769,7 +751,6 @@ AVInputFormat mjpeg_demuxer = { NULL, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "mjpg,mjpeg", .value = CODEC_ID_MJPEG, @@ -782,7 +763,6 @@ AVInputFormat ingenient_demuxer = { NULL, video_read_header, ingenient_read_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "cgi", // FIXME .value = CODEC_ID_MJPEG, @@ -810,7 +790,6 @@ AVInputFormat vc1_demuxer = { NULL /* vc1_probe */, video_read_header, raw_read_partial_packet, - raw_read_close, .extensions = "vc1", .value = CODEC_ID_VC1, }; @@ -825,7 +804,7 @@ AVInputFormat pcm_ ## name ## _demuxer = {\ NULL,\ raw_read_header,\ raw_read_packet,\ - raw_read_close,\ + NULL,\ pcm_read_seek,\ .flags= AVFMT_GENERIC_INDEX,\ .extensions = ext,\ @@ -925,7 +904,6 @@ AVInputFormat rawvideo_demuxer = { NULL, raw_read_header, rawvideo_read_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "yuv,cif,qcif,rgb", .value = CODEC_ID_RAWVIDEO, diff --git a/libavformat/sol.c b/libavformat/sol.c index 71b4fbe49b..775b4e0adf 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -140,11 +140,6 @@ static int sol_read_packet(AVFormatContext *s, return 0; } -static int sol_read_close(AVFormatContext *s) -{ - return 0; -} - AVInputFormat sol_demuxer = { "sol", NULL_IF_CONFIG_SMALL("Sierra SOL format"), @@ -152,6 +147,6 @@ AVInputFormat sol_demuxer = { sol_probe, sol_read_header, sol_read_packet, - sol_read_close, + NULL, pcm_read_seek, }; diff --git a/libavformat/txd.c b/libavformat/txd.c index e8e263c6fd..d2c399697b 100644 --- a/libavformat/txd.c +++ b/libavformat/txd.c @@ -87,10 +87,6 @@ next_chunk: return ret <= 0 ? AVERROR(EIO) : ret; } -static int txd_read_close(AVFormatContext *s) { - return 0; -} - AVInputFormat txd_demuxer = { "txd", @@ -99,5 +95,4 @@ AVInputFormat txd_demuxer = txd_probe, txd_read_header, txd_read_packet, - txd_read_close, }; diff --git a/libavformat/wav.c b/libavformat/wav.c index 44c245d13b..945ee39b32 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -235,11 +235,6 @@ static int wav_read_packet(AVFormatContext *s, return ret; } -static int wav_read_close(AVFormatContext *s) -{ - return 0; -} - static int wav_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { @@ -267,7 +262,7 @@ AVInputFormat wav_demuxer = { wav_probe, wav_read_header, wav_read_packet, - wav_read_close, + NULL, wav_read_seek, .flags= AVFMT_GENERIC_INDEX, .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0}, diff --git a/libavformat/westwood.c b/libavformat/westwood.c index f6ff7ec8d0..d1ac63c762 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -196,14 +196,6 @@ static int wsaud_read_packet(AVFormatContext *s, return ret; } -static int wsaud_read_close(AVFormatContext *s) -{ -// WsAudDemuxContext *wsaud = s->priv_data; - - return 0; -} - - static int wsvqa_probe(AVProbeData *p) { /* need 12 bytes to qualify */ @@ -378,13 +370,6 @@ static int wsvqa_read_packet(AVFormatContext *s, return ret; } -static int wsvqa_read_close(AVFormatContext *s) -{ -// WsVqaDemuxContext *wsvqa = s->priv_data; - - return 0; -} - #ifdef CONFIG_WSAUD_DEMUXER AVInputFormat wsaud_demuxer = { "wsaud", @@ -393,7 +378,6 @@ AVInputFormat wsaud_demuxer = { wsaud_probe, wsaud_read_header, wsaud_read_packet, - wsaud_read_close, }; #endif #ifdef CONFIG_WSVQA_DEMUXER @@ -404,6 +388,5 @@ AVInputFormat wsvqa_demuxer = { wsvqa_probe, wsvqa_read_header, wsvqa_read_packet, - wsvqa_read_close, }; #endif