From 0a071f7124beaf0929f772a8618ac1b6c17b0222 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 14 Apr 2021 00:29:37 +0200 Subject: avformat: Remove deprecated av_demuxer_open() Deprecate in e37f161e66e042d6c2c7470c4d9881df9427fc4a. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavformat/utils.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'libavformat/utils.c') diff --git a/libavformat/utils.c b/libavformat/utils.c index d8b44ce896..ba664f6214 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -370,27 +370,6 @@ FF_ENABLE_DEPRECATION_WARNINGS /************************************************************/ /* input media file */ -#if FF_API_DEMUXER_OPEN -int av_demuxer_open(AVFormatContext *ic) { - int err; - - if (ic->format_whitelist && av_match_list(ic->iformat->name, ic->format_whitelist, ',') <= 0) { - av_log(ic, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", ic->format_whitelist); - return AVERROR(EINVAL); - } - - if (ic->iformat->read_header) { - err = ic->iformat->read_header(ic); - if (err < 0) - return err; - } - - if (ic->pb && !ic->internal->data_offset) - ic->internal->data_offset = avio_tell(ic->pb); - - return 0; -} -#endif /* Open input file and probe the format if necessary. */ static int init_input(AVFormatContext *s, const char *filename, AVDictionary **options) @@ -603,11 +582,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, if (s->pb) ff_id3v2_read_dict(s->pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); -#if FF_API_DEMUXER_OPEN - if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header) -#else if (s->iformat->read_header) -#endif if ((ret = s->iformat->read_header(s)) < 0) goto fail; @@ -636,11 +611,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, if ((ret = avformat_queue_attached_pictures(s)) < 0) goto close; -#if FF_API_DEMUXER_OPEN - if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->pb && !s->internal->data_offset) -#else if (s->pb && !s->internal->data_offset) -#endif s->internal->data_offset = avio_tell(s->pb); s->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; -- cgit v1.2.3