# HG changeset patch # User bcoudurier # Date 1213917904 0 # Node ID 31a0f3b99ef72ec4a9252be4dd81e3b72a41356c # Parent e85a3d8478c1fe39cef073163384dbe8702622f6 remove useless close funcs diff -r e85a3d8478c1 -r 31a0f3b99ef7 au.c --- a/au.c Thu Jun 19 22:58:13 2008 +0000 +++ b/au.c Thu Jun 19 23:25:04 2008 +0000 @@ -172,11 +172,6 @@ return 0; } -static int au_read_close(AVFormatContext *s) -{ - return 0; -} - #ifdef CONFIG_AU_DEMUXER AVInputFormat au_demuxer = { "au", @@ -185,7 +180,7 @@ au_probe, au_read_header, au_read_packet, - au_read_close, + NULL, pcm_read_seek, .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0}, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 flic.c --- a/flic.c Thu Jun 19 22:58:13 2008 +0000 +++ b/flic.c Thu Jun 19 23:25:04 2008 +0000 @@ -185,13 +185,6 @@ 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 @@ flic_probe, flic_read_header, flic_read_packet, - flic_read_close, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 idcin.c --- a/idcin.c Thu Jun 19 22:58:13 2008 +0000 +++ b/idcin.c Thu Jun 19 23:25:04 2008 +0000 @@ -280,12 +280,6 @@ 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 @@ idcin_probe, idcin_read_header, idcin_read_packet, - idcin_read_close, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 idroq.c --- a/idroq.c Thu Jun 19 22:58:13 2008 +0000 +++ b/idroq.c Thu Jun 19 23:25:04 2008 +0000 @@ -270,13 +270,6 @@ 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 @@ roq_probe, roq_read_header, roq_read_packet, - roq_read_close, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 ipmovie.c --- a/ipmovie.c Thu Jun 19 22:58:13 2008 +0000 +++ b/ipmovie.c Thu Jun 19 23:25:04 2008 +0000 @@ -607,13 +607,6 @@ 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 @@ ipmovie_probe, ipmovie_read_header, ipmovie_read_packet, - ipmovie_read_close, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 mp3.c --- a/mp3.c Thu Jun 19 22:58:13 2008 +0000 +++ b/mp3.c Thu Jun 19 23:25:04 2008 +0000 @@ -549,11 +549,6 @@ return ret; } -static int mp3_read_close(AVFormatContext *s) -{ - return 0; -} - #ifdef CONFIG_MUXERS /* simple formats */ @@ -651,7 +646,6 @@ mp3_read_probe, mp3_read_header, mp3_read_packet, - mp3_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "mp2,mp3,m2a", /* XXX: use probe */ }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 mpeg.c --- a/mpeg.c Thu Jun 19 22:58:13 2008 +0000 +++ b/mpeg.c Thu Jun 19 23:25:04 2008 +0000 @@ -542,11 +542,6 @@ 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 @@ mpegps_probe, mpegps_read_header, mpegps_read_packet, - mpegps_read_close, + NULL, NULL, //mpegps_read_seek, mpegps_read_dts, .flags = AVFMT_SHOW_IDS, diff -r e85a3d8478c1 -r 31a0f3b99ef7 raw.c --- a/raw.c Thu Jun 19 22:58:13 2008 +0000 +++ b/raw.c Thu Jun 19 23:25:04 2008 +0000 @@ -188,11 +188,6 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ dirac_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .value = CODEC_ID_DIRAC, }; @@ -561,7 +551,6 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ mpegvideo_probe, video_read_header, raw_read_partial_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .value = CODEC_ID_MPEG1VIDEO, }; @@ -769,7 +751,6 @@ 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 @@ 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 @@ NULL /* vc1_probe */, video_read_header, raw_read_partial_packet, - raw_read_close, .extensions = "vc1", .value = CODEC_ID_VC1, }; @@ -825,7 +804,7 @@ NULL,\ raw_read_header,\ raw_read_packet,\ - raw_read_close,\ + NULL,\ pcm_read_seek,\ .flags= AVFMT_GENERIC_INDEX,\ .extensions = ext,\ @@ -925,7 +904,6 @@ NULL, raw_read_header, rawvideo_read_packet, - raw_read_close, .flags= AVFMT_GENERIC_INDEX, .extensions = "yuv,cif,qcif,rgb", .value = CODEC_ID_RAWVIDEO, diff -r e85a3d8478c1 -r 31a0f3b99ef7 sol.c --- a/sol.c Thu Jun 19 22:58:13 2008 +0000 +++ b/sol.c Thu Jun 19 23:25:04 2008 +0000 @@ -140,11 +140,6 @@ 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 @@ sol_probe, sol_read_header, sol_read_packet, - sol_read_close, + NULL, pcm_read_seek, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 txd.c --- a/txd.c Thu Jun 19 22:58:13 2008 +0000 +++ b/txd.c Thu Jun 19 23:25:04 2008 +0000 @@ -87,10 +87,6 @@ return ret <= 0 ? AVERROR(EIO) : ret; } -static int txd_read_close(AVFormatContext *s) { - return 0; -} - AVInputFormat txd_demuxer = { "txd", @@ -99,5 +95,4 @@ txd_probe, txd_read_header, txd_read_packet, - txd_read_close, }; diff -r e85a3d8478c1 -r 31a0f3b99ef7 wav.c --- a/wav.c Thu Jun 19 22:58:13 2008 +0000 +++ b/wav.c Thu Jun 19 23:25:04 2008 +0000 @@ -235,11 +235,6 @@ 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 @@ 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 -r e85a3d8478c1 -r 31a0f3b99ef7 westwood.c --- a/westwood.c Thu Jun 19 22:58:13 2008 +0000 +++ b/westwood.c Thu Jun 19 23:25:04 2008 +0000 @@ -196,14 +196,6 @@ 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 @@ 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 @@ wsaud_probe, wsaud_read_header, wsaud_read_packet, - wsaud_read_close, }; #endif #ifdef CONFIG_WSVQA_DEMUXER @@ -404,6 +388,5 @@ wsvqa_probe, wsvqa_read_header, wsvqa_read_packet, - wsvqa_read_close, }; #endif