Browse Source

lavf: remove disabled FF_API_NEW_STREAM cruft

tags/n0.11
Anton Khirnov 13 years ago
parent
commit
1329827e79
3 changed files with 0 additions and 28 deletions
  1. +0
    -15
      libavformat/avformat.h
  2. +0
    -10
      libavformat/utils.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 15
libavformat/avformat.h View File

@@ -1379,21 +1379,6 @@ void avformat_close_input(AVFormatContext **s);
* @}
*/

#if FF_API_NEW_STREAM
/**
* Add a new stream to a media file.
*
* Can only be called in the read_header() function. If the flag
* AVFMTCTX_NOHEADER is in the format context, then new streams
* can be added in read_packet too.
*
* @param s media file handle
* @param id file-format-dependent stream ID
*/
attribute_deprecated
AVStream *av_new_stream(AVFormatContext *s, int id);
#endif

#if FF_API_SET_PTS_INFO
/**
* @deprecated this function is not supposed to be called outside of lavf


+ 0
- 10
libavformat/utils.c View File

@@ -2630,16 +2630,6 @@ void avformat_close_input(AVFormatContext **ps)
avio_close(pb);
}

#if FF_API_NEW_STREAM
AVStream *av_new_stream(AVFormatContext *s, int id)
{
AVStream *st = avformat_new_stream(s, NULL);
if (st)
st->id = id;
return st;
}
#endif

AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c)
{
AVStream *st;


+ 0
- 3
libavformat/version.h View File

@@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
#ifndef FF_API_NEW_STREAM
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_PRELOAD
#define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif


Loading…
Cancel
Save