[FFmpeg-cvslog] avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep 14 21:24:35 2014 -0300| [cc787709ee6f5917498ce0872447abb7a261c3d8] | committer: James Almer

avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc787709ee6f5917498ce0872447abb7a261c3d8
---

 libavformat/avformat.h |   20 --------------------
 libavformat/utils.c    |    7 -------
 libavformat/version.h  |    3 ---
 3 files changed, 30 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index bab412f..daeb7d2 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 0fd1568..d15af03 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 28cd008..b7d5f73 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