diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 22:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 23:09:30 +0100 |
| commit | 66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2 (patch) | |
| tree | 5bb39ad7b744235495831856d4c1d5aa4635c3d0 /libavformat/avformat.h | |
| parent | ed736890d6a71606e1833a9707da52322f4e046e (diff) | |
| parent | 1384df641994bf3d6cb51084290aa94752737bae (diff) | |
| download | ffmpeg-66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2.tar.gz | |
Merge commit '1384df641994bf3d6cb51084290aa94752737bae'
* commit '1384df641994bf3d6cb51084290aa94752737bae':
lavf: Add an option for avoiding negative timestamps
Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9
See: a89c01253190b9eb9de8e28a3252423bf7732511
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f21a1d610e..3733549e72 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1475,6 +1475,18 @@ typedef struct AVFormatContext { */ int max_ts_probe; + /** + * Avoid negative timestamps during muxing. + * Any value of the AVFMT_AVOID_NEG_TS_* constants. + * Note, this only works when using av_interleaved_write_frame. (interleave_packet_per_dts is in use) + * - muxing: Set by user + * - demuxing: unused + */ + int avoid_negative_ts; +#define AVFMT_AVOID_NEG_TS_AUTO -1 ///< Enabled when required by target format +#define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative +#define AVFMT_AVOID_NEG_TS_MAKE_ZERO 2 ///< Shift timestamps so that they start at 0 + /** * Transport stream id. @@ -1515,17 +1527,6 @@ typedef struct AVFormatContext { int use_wallclock_as_timestamps; /** - * Avoid negative timestamps during muxing. - * 0 -> allow negative timestamps - * 1 -> avoid negative timestamps - * -1 -> choose automatically (default) - * Note, this 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; - - /** * avio flags, used to force AVIO_FLAG_DIRECT. * - encoding: unused * - decoding: Set by user via AVOptions (NO direct access) |