add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id
fields in AVFormatParameters Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -75,6 +75,9 @@
|
|||||||
#ifndef FF_API_LAVF_UNUSED
|
#ifndef FF_API_LAVF_UNUSED
|
||||||
#define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53)
|
#define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53)
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef FF_API_PARAMETERS_CODEC_ID
|
||||||
|
#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* I return the LIBAVFORMAT_VERSION_INT constant. You got
|
* I return the LIBAVFORMAT_VERSION_INT constant. You got
|
||||||
@@ -282,7 +285,7 @@ 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 LIBAVFORMAT_VERSION_INT < (53<<16)
|
#if FF_API_PARAMETERS_CODEC_ID
|
||||||
attribute_deprecated enum CodecID video_codec_id;
|
attribute_deprecated enum CodecID video_codec_id;
|
||||||
attribute_deprecated enum CodecID audio_codec_id;
|
attribute_deprecated enum CodecID audio_codec_id;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user