mirror of https://git.ffmpeg.org/ffmpeg.git
lavf: remove FF_API_PARAMETERS_CODEC_ID cruft
This commit is contained in:
parent
fc2d3a19c5
commit
583f6c67b6
|
@ -242,10 +242,6 @@ typedef struct AVFormatParameters {
|
||||||
unsigned int initial_pause:1; /**< Do not begin to play the stream
|
unsigned int initial_pause:1; /**< Do not begin to play the stream
|
||||||
immediately (RTSP only). */
|
immediately (RTSP only). */
|
||||||
unsigned int prealloced_context:1;
|
unsigned int prealloced_context:1;
|
||||||
#if FF_API_PARAMETERS_CODEC_ID
|
|
||||||
attribute_deprecated enum CodecID video_codec_id;
|
|
||||||
attribute_deprecated enum CodecID audio_codec_id;
|
|
||||||
#endif
|
|
||||||
} AVFormatParameters;
|
} AVFormatParameters;
|
||||||
|
|
||||||
//! Demuxer will use avio_open, no opened file should be provided by the caller.
|
//! Demuxer will use avio_open, no opened file should be provided by the caller.
|
||||||
|
|
|
@ -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_PARAMETERS_CODEC_ID
|
|
||||||
#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_FIRST_FORMAT
|
#ifndef FF_API_FIRST_FORMAT
|
||||||
#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
|
#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue