summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-26 15:55:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-26 15:55:16 +0200
commit3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9 (patch)
tree220fbc9a57cab1990672a8a5beb1b29fd17d3aee /libavformat/avformat.h
parente9350c44ad97b7d85478696912c88142b0d25e3b (diff)
lavf: Add support offset timestamps on muxing.
This allows avoiding negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 166fdbb228..de53c26ee5 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -832,6 +832,13 @@ typedef struct AVStream {
* its lifetime differs from info which is why its not in that structure.
*/
int nb_decoded_frames;
+
+ /**
+ * Timestamp offset added to timestamps before muxing
+ * NOT PART OF PUBLIC API
+ */
+ int64_t mux_ts_offset;
+
} AVStream;
#define AV_PROGRAM_RUNNING 1
@@ -1111,6 +1118,17 @@ typedef struct AVFormatContext {
*/
int use_wallclock_as_timestamps;
+ /**
+ * Avoids negative timestamps during muxing
+ * 0 -> allow negative timestamps
+ * 1 -> avoid negative timestamps
+ * -1 -> choose automatically (default)
+ * Note, this is only works when interleave_packet_per_dts is in use
+ * - encoding: Set by user via AVOptions (NO direct access)
+ * - decoding: unused
+ */
+ int avoid_negative_ts;
+
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavformat and can be changed and