Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavf: remove FF_API_LAVF_UNUSED cruft

Browse source
This commit is contained in:
Anton Khirnov 2011-02-03 12:45:30 +01:00
parent 58d5ff0abf
commit fc2d3a19c5
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libavformat/avformat.h
View file

@ -545,10 +545,6 @@ typedef struct AVStream {
int64_t nb_frames; ///< number of frames in this stream if known or 0 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 */ int disposition; /**< AV_DISPOSITION_* bit field */
AVProbeData probe_data; AVProbeData probe_data;
@ -701,11 +697,6 @@ typedef struct AVFormatContext {
/* av_read_frame() support */ /* av_read_frame() support */
AVStream *cur_st; 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 */ /* av_seek_frame() support */
int64_t data_offset; /**< offset of the first packet */ int64_t data_offset; /**< offset of the first packet */

3
libavformat/version.h
View file

@ -50,9 +50,6 @@
#ifndef FF_API_READ_SEEK #ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_LAVF_UNUSED
#define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_PARAMETERS_CODEC_ID #ifndef FF_API_PARAMETERS_CODEC_ID
#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif