summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-29 20:44:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-29 20:47:23 +0100
commit249cc58c3ada7b6017d11e665cf3fa1850651a8d (patch)
treea8059a3f7e9a856dee7d6d5b4b7b4b49692e612f /libavformat/avformat.h
parent4eb49fdde8f84d54a763cfb5d355527b525ee2bf (diff)
parent8b64c2ba0382892cad9e1a5ba601696d4cbb4d04 (diff)
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>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4e5683c66a..6bd54cec64 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;