From 3d813e4c548c99368876f985a324eac689385311 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 23 Oct 2011 11:22:33 +0200 Subject: lavf: deprecate AVStream.stream_copy It's only used in avconv, so it properly belongs to OutputStream struct there. --- libavformat/avformat.h | 4 +++- libavformat/version.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 74c7140..1b67ee6 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -530,8 +530,10 @@ typedef struct AVStream { */ AVRational time_base; int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ +#if FF_API_STREAM_COPY /* ffmpeg.c private use */ - int stream_copy; /**< If set, just copy stream. */ + 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. #if FF_API_AVSTREAM_QUALITY diff --git a/libavformat/version.h b/libavformat/version.h index 3a6a4f6..6041dae 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -101,5 +101,8 @@ #ifndef FF_API_PRELOAD #define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54) #endif +#ifndef FF_API_STREAM_COPY +#define FF_API_STREAM_COPY (LIBAVFORMAT_VERSION_MAJOR < 54) +#endif #endif /* AVFORMAT_VERSION_H */ -- cgit v1.1