mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
* commit '24c788f4878729a42150581d7ed7e9a11daf874d': Remove obsolete FF_API_REFERENCE_DTS cruft. Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
329832d779
|
@ -934,11 +934,6 @@ typedef struct AVStream {
|
||||||
|
|
||||||
int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
|
int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
|
||||||
|
|
||||||
#if FF_API_REFERENCE_DTS
|
|
||||||
/* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
|
|
||||||
* though it should not */
|
|
||||||
int64_t do_not_use;
|
|
||||||
#endif
|
|
||||||
// Timestamp generation support:
|
// Timestamp generation support:
|
||||||
/**
|
/**
|
||||||
* Timestamp corresponding to the last dts sync point.
|
* Timestamp corresponding to the last dts sync point.
|
||||||
|
|
|
@ -48,9 +48,6 @@
|
||||||
* dropped at a future version bump. The defines themselves are not part of
|
* dropped at a future version bump. The defines themselves are not part of
|
||||||
* 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_REFERENCE_DTS
|
|
||||||
#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_LAVF_BITEXACT
|
#ifndef FF_API_LAVF_BITEXACT
|
||||||
#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57)
|
#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue