aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h20
-rw-r--r--libavformat/utils.c7
-rw-r--r--libavformat/version.h3
3 files changed, 0 insertions, 30 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index bab412ff64..daeb7d2f45 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1986,26 +1986,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
attribute_deprecated
int av_demuxer_open(AVFormatContext *ic);
-#if FF_API_FORMAT_PARAMETERS
-/**
- * Read packets of a media file to get stream information. This
- * is useful for file formats with no headers such as MPEG. This
- * function also computes the real framerate in case of MPEG-2 repeat
- * frame mode.
- * The logical file position is not changed by this function;
- * examined packets may be buffered for later processing.
- *
- * @param ic media file handle
- * @return >=0 if OK, AVERROR_xxx on error
- * @todo Let the user decide somehow what information is needed so that
- * we do not waste time getting stuff the user does not need.
- *
- * @deprecated use avformat_find_stream_info.
- */
-attribute_deprecated
-int av_find_stream_info(AVFormatContext *ic);
-#endif
-
/**
* Read packets of a media file to get stream information. This
* is useful for file formats with no headers such as MPEG. This
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0fd1568206..d15af036ff 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2785,13 +2785,6 @@ static int tb_unreliable(AVCodecContext *c)
return 0;
}
-#if FF_API_FORMAT_PARAMETERS
-int av_find_stream_info(AVFormatContext *ic)
-{
- return avformat_find_stream_info(ic, NULL);
-}
-#endif
-
int ff_alloc_extradata(AVCodecContext *avctx, int size)
{
int ret;
diff --git a/libavformat/version.h b/libavformat/version.h
index 28cd008f20..b7d5f73e49 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -61,9 +61,6 @@
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
#ifndef FF_API_NEW_STREAM
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif