diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:38:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 13:38:25 +0100 |
| commit | b5448e66b0b88da95a3c8f08a2b2d416049585a5 (patch) | |
| tree | 80dee250d35d2fb54621ba430d452d0900037465 /libavformat/movenc.h | |
| parent | 25d7e3ad594a8b5ed1b840d75185df34efdde6ad (diff) | |
| parent | 67a2912307c3c08f2725ccae162cfe3426b80184 (diff) | |
| download | ffmpeg-b5448e66b0b88da95a3c8f08a2b2d416049585a5.tar.gz | |
Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'
* commit '67a2912307c3c08f2725ccae162cfe3426b80184':
movenc: Don't assume that fragment durations in pts is equal to duration in dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 159e5f37d0..744d14e5b2 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -113,6 +113,7 @@ typedef struct MOVTrack { int tref_id; ///< trackID of the referenced track int64_t start_dts; int64_t start_cts; + int64_t end_pts; int hint_track; ///< the track that hints this track, -1 if no hint track is set int src_track; ///< the track that this hint (or tmcd) track describes |