From 1329827e79766e21277a575d7abfdd0f07eb854c Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:31:55 +0100
Subject: [PATCH] lavf: remove disabled FF_API_NEW_STREAM cruft
---
libavformat/avformat.h | 15 ---------------
libavformat/utils.c | 10 ----------
libavformat/version.h | 3 ---
3 files changed, 28 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 970ca340d73..1bd2c49c10c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d241200d81a..24e0e8f6d75 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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;
diff --git a/libavformat/version.h b/libavformat/version.h
index 0e1be85cbb7..a54a075624d 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -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
--
GitLab