[FFmpeg-devel] [PATCH 10/18] avformat: remove obsolete FF_API_NEW_STREAM cruft
James Almer
jamrial at gmail.com
Mon Sep 15 03:46:12 CEST 2014
Signed-off-by: James Almer <jamrial at gmail.com>
---
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 43d036d..0a33bc1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2160,21 +2160,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 f882318..9eb7846 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3558,16 +3558,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, const AVCodec *c)
{
AVStream *st;
diff --git a/libavformat/version.h b/libavformat/version.h
index 1a63946..14a490b 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_NEW_STREAM
-#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
#ifndef FF_API_SET_PTS_INFO
#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
--
1.8.5.5
More information about the ffmpeg-devel
mailing list