diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 23:02:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 23:02:02 +0100 |
commit | 4dc305d784ea01efd30871e9aa6625eff66e9e87 (patch) | |
tree | d5e2bbc63303011c50463d11b8d40a331d6830a0 /libavformat/movenc.h | |
parent | 3fa4351d6bea1b07a3dd71e2f61cef2af5130a7c (diff) | |
parent | 40ed1cbf147d09fc0894bee160f0b6b6d9159fc5 (diff) | |
download | ffmpeg-4dc305d784ea01efd30871e9aa6625eff66e9e87.tar.gz |
Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'
* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
movenc: Allow writing a DASH sidx atom at the start of files
Conflicts:
libavformat/movenc.c
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 19ff7ede4f..997a1fb1f9 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -74,6 +74,7 @@ typedef struct MOVFragmentInfo { int64_t time; int64_t duration; int64_t tfrf_offset; + int size; } MOVFragmentInfo; typedef struct MOVTrack { |