diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:01:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:01:34 +0200 |
| commit | 329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (patch) | |
| tree | c2345ac80aad15d9467f02808fef71280cf6dc7d | |
| parent | a973e01501bc3ca5c61d778f97f350837d4ed481 (diff) | |
| parent | 24c788f4878729a42150581d7ed7e9a11daf874d (diff) | |
| download | ffmpeg-329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8.tar.gz | |
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
Remove obsolete FF_API_REFERENCE_DTS cruft.
Conflicts:
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 5 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 9a7672f9e0..a4f7ed7ca8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -934,11 +934,6 @@ typedef struct AVStream { 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 corresponding to the last dts sync point. diff --git a/libavformat/version.h b/libavformat/version.h index 9686a58ccc..1cbb889707 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -48,9 +48,6 @@ * 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. */ -#ifndef FF_API_REFERENCE_DTS -#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56) -#endif #ifndef FF_API_LAVF_BITEXACT #define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57) #endif |