summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 13:31:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:52:43 +0100
commitbd4c51312bf5b9cc37d98e8a66adf4fa06f8604c (patch)
treee0111c3642f2085d00e999e8d8c01fdf3016f557
parent2a0f868cfacd548d39665392cf4791c67bc2ea06 (diff)
lavf: remove disabled FF_API_STREAM_COPY cruft
-rw-r--r--libavformat/avformat.h4
-rw-r--r--libavformat/version.h3
2 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7420dabc37..65f6730c36 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 36f4366531..7b9790adb8 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