lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
This commit is contained in:
@@ -1449,16 +1449,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
|
|||||||
*/
|
*/
|
||||||
int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
|
int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
|
||||||
|
|
||||||
#if FF_API_INTERLEAVE_PACKET
|
|
||||||
/**
|
|
||||||
* @deprecated this function was never meant to be called by the user
|
|
||||||
* programs.
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
|
|
||||||
AVPacket *pkt, int flush);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write the stream trailer to an output media file and free the
|
* Write the stream trailer to an output media file and free the
|
||||||
* file private data.
|
* file private data.
|
||||||
|
@@ -495,15 +495,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FF_API_INTERLEAVE_PACKET
|
|
||||||
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
|
|
||||||
AVPacket *pkt, int flush)
|
|
||||||
{
|
|
||||||
return ff_interleave_packet_per_dts(s, out, pkt, flush);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interleave an AVPacket correctly so it can be muxed.
|
* Interleave an AVPacket correctly so it can be muxed.
|
||||||
* @param out the interleaved packet will be output here
|
* @param out the interleaved packet will be output here
|
||||||
|
@@ -49,9 +49,6 @@
|
|||||||
* the public API and may change, break or disappear at any time.
|
* the public API and may change, break or disappear at any time.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FF_API_INTERLEAVE_PACKET
|
|
||||||
#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_AV_GETTIME
|
#ifndef FF_API_AV_GETTIME
|
||||||
#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)
|
#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user