diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:45:30 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:39 +0200 |
| commit | fc2d3a19c54ad6b272eb7d5142148a01568a9b77 (patch) | |
| tree | bae7ca92aae3a4b7053ab80887b69c15f96165bc | |
| parent | 58d5ff0abf657fe0ec3564433ebbde9fc8f71ffd (diff) | |
| download | ffmpeg-fc2d3a19c54ad6b272eb7d5142148a01568a9b77.tar.gz | |
lavf: remove FF_API_LAVF_UNUSED cruft
| -rw-r--r-- | libavformat/avformat.h | 9 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 289834627a..d507c2048b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -545,10 +545,6 @@ typedef struct AVStream { int64_t nb_frames; ///< number of frames in this stream if known or 0 -#if FF_API_LAVF_UNUSED - attribute_deprecated int64_t unused[4+1]; -#endif - int disposition; /**< AV_DISPOSITION_* bit field */ AVProbeData probe_data; @@ -701,11 +697,6 @@ typedef struct AVFormatContext { /* av_read_frame() support */ AVStream *cur_st; -#if FF_API_LAVF_UNUSED - const uint8_t *cur_ptr_deprecated; - int cur_len_deprecated; - AVPacket cur_pkt_deprecated; -#endif /* av_seek_frame() support */ int64_t data_offset; /**< offset of the first packet */ diff --git a/libavformat/version.h b/libavformat/version.h index 08dc566425..484ebecb9c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -50,9 +50,6 @@ #ifndef FF_API_READ_SEEK #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -#ifndef FF_API_LAVF_UNUSED -#define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_PARAMETERS_CODEC_ID #define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53) #endif |