generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2014-09-14 21:24:35 -03:00
parent 903a0acba4
commit cc787709ee
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/avformat.h
View File

@ -1986,26 +1986,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
attribute_deprecated attribute_deprecated
int av_demuxer_open(AVFormatContext *ic); 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 * Read packets of a media file to get stream information. This
* is useful for file formats with no headers such as MPEG. This * is useful for file formats with no headers such as MPEG. This

7
libavformat/utils.c
View File

@ -2785,13 +2785,6 @@ static int tb_unreliable(AVCodecContext *c)
return 0; 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 ff_alloc_extradata(AVCodecContext *avctx, int size)
{ {
int ret; int ret;

3
libavformat/version.h
View File

@ -61,9 +61,6 @@
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_FORMAT_PARAMETERS
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_NEW_STREAM #ifndef FF_API_NEW_STREAM
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56) #define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif #endif