From bd4c51312bf5b9cc37d98e8a66adf4fa06f8604c Mon Sep 17 00:00:00 2001 From: Anton Khirnov <anton@khirnov.net> Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: [PATCH] lavf: remove disabled FF_API_STREAM_COPY cruft --- libavformat/avformat.h | 4 ---- libavformat/version.h | 3 --- 2 files changed, 7 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7420dabc376..65f6730c360 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -562,10 +562,6 @@ typedef struct AVStream { AVRational time_base; #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 36f43665314..7b9790adb82 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 -- GitLab