diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:24:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:10:13 -0300 |
| commit | cc787709ee6f5917498ce0872447abb7a261c3d8 (patch) | |
| tree | 768d7e718f5c5f7b8c423c359411c8e8fd8ed42a | |
| parent | 903a0acba46e66f3a7c3fd59e9ca14b38cfb731b (diff) | |
| download | ffmpeg-cc787709ee6f5917498ce0872447abb7a261c3d8.tar.gz | |
avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/avformat.h | 20 | ||||
| -rw-r--r-- | libavformat/utils.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
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 |