| @@ -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 | #if FF_API_SET_PTS_INFO | ||||
| /** | /** | ||||
| * @deprecated this function is not supposed to be called outside of lavf | * @deprecated this function is not supposed to be called outside of lavf | ||||
| @@ -2630,16 +2630,6 @@ void avformat_close_input(AVFormatContext **ps) | |||||
| avio_close(pb); | 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 *avformat_new_stream(AVFormatContext *s, AVCodec *c) | ||||
| { | { | ||||
| AVStream *st; | AVStream *st; | ||||
| @@ -47,9 +47,6 @@ | |||||
| * Those FF_API_* defines are not part of public API. | * Those FF_API_* defines are not part of public API. | ||||
| * They may change, break or disappear at any time. | * 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 | #ifndef FF_API_PRELOAD | ||||
| #define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54) | #define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54) | ||||
| #endif | #endif | ||||