| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 19:44:41 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 19:47:23 (GMT) |
| commit | 249cc58c3ada7b6017d11e665cf3fa1850651a8d (patch) | |
| tree | a8059a3f7e9a856dee7d6d5b4b7b4b49692e612f | |
| parent | 4eb49fdde8f84d54a763cfb5d355527b525ee2bf (diff) | |
| parent | 8b64c2ba0382892cad9e1a5ba601696d4cbb4d04 (diff) | |
| download | ffmpeg-249cc58c3ada7b6017d11e665cf3fa1850651a8d.zip ffmpeg-249cc58c3ada7b6017d11e665cf3fa1850651a8d.tar.gz ffmpeg-249cc58c3ada7b6017d11e665cf3fa1850651a8d.tar.bz2 | |
Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'
* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4e5683c..6bd54ce 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -775,6 +775,11 @@ 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. @@ -783,7 +788,6 @@ typedef struct AVStream { * a DTS is received from the underlying container. Otherwise set to * AV_NOPTS_VALUE by default. */ - int64_t reference_dts; int64_t first_dts; int64_t cur_dts; int64_t last_IP_pts; diff --git a/libavformat/version.h b/libavformat/version.h index 0028c9b..8305438 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -48,6 +48,9 @@ * 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_ALLOC_OUTPUT_CONTEXT #define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56) |