[FFmpeg-cvslog] lavf: remove disabled FF_API_STREAM_COPY cruft

Anton Khirnov git at videolan.org
Sat Jan 28 08:05:13 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 12 13:31:55 2012 +0100| [bd4c51312bf5b9cc37d98e8a66adf4fa06f8604c] | committer: Anton Khirnov

lavf: remove disabled FF_API_STREAM_COPY cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd4c51312bf5b9cc37d98e8a66adf4fa06f8604c
---

 libavformat/avformat.h |    4 ----
 libavformat/version.h  |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7420dab..65f6730 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -563,10 +563,6 @@ typedef struct AVStream {
 #if FF_API_REORDER_PRIVATE
     int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 #endif
-#if FF_API_STREAM_COPY
-    /* ffmpeg.c private use */
-    attribute_deprecated int stream_copy; /**< If set, just copy stream. */
-#endif
     enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
 
     /**
diff --git a/libavformat/version.h b/libavformat/version.h
index 36f4366..7b9790a 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_STREAM_COPY
-#define FF_API_STREAM_COPY             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_SEEK_PUBLIC
 #define FF_API_SEEK_PUBLIC             (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif



More information about the ffmpeg-cvslog mailing list