summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-01 16:31:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-01 16:31:57 +0200
commitfb318def5d3a65efcc6c1f54dabbc06c4959dbcc (patch)
tree7e45caeac327d50d1013a2a9761cffb9ad821412 /libavformat/isom.h
parent8d0c7031a846fe27c2a44831e743ee722174fdc0 (diff)
parent20f95f21f9b9595608ba668a6eca78f2d508be67 (diff)
Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67': mov: Support default-base-is-moof. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r--libavformat/isom.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 253451ef38..414b87cc9d 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -73,6 +73,7 @@ typedef struct MOVFragment {
unsigned track_id;
uint64_t base_data_offset;
uint64_t moof_offset;
+ uint64_t implicit_offset;
unsigned stsd_id;
unsigned duration;
unsigned size;
@@ -190,6 +191,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);
#define MOV_TFHD_DEFAULT_SIZE 0x10
#define MOV_TFHD_DEFAULT_FLAGS 0x20
#define MOV_TFHD_DURATION_IS_EMPTY 0x010000
+#define MOV_TFHD_DEFAULT_BASE_IS_MOOF 0x020000
#define MOV_TRUN_DATA_OFFSET 0x01
#define MOV_TRUN_FIRST_SAMPLE_FLAGS 0x04