From a578b93c73a1f00d857664edea5bd84be6a7674b Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 14 Sep 2014 21:25:26 -0300
Subject: [PATCH] avformat: remove obsolete FF_API_NEW_STREAM cruft

Signed-off-by: James Almer <jamrial@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 daeb7d2f45..126765f1ae 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2175,21 +2175,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 d15af036ff..35b387d3ad 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3579,16 +3579,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 b7d5f73e49..248ee0bc34 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