summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2014-11-12 15:42:17 +0100
committerClément Bœsch <clement@stupeflix.com>2015-01-02 11:38:21 +0100
commit55faf56c7256f5c0afa7d90140b6595005529d4b (patch)
tree1fda16b375fcfa2ae29147239ba3637df6c4efcb /libavformat/isom.h
parent75cc57f73f9aee8721a101b3c6ef85312ea9e54c (diff)
avformat/mov: move edit list heuristics into mov_build_index()
mov_read_elst() is now only responsible from storing the table in a data structure; this is consistent with other table readers functions.
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r--libavformat/isom.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index b4f0202a77..d233839dab 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -53,6 +53,12 @@ typedef struct MOVStsc {
int id;
} MOVStsc;
+typedef struct MOVElst {
+ int64_t duration;
+ int64_t time;
+ float rate;
+} MOVElst;
+
typedef struct MOVDref {
uint32_t type;
char *path;
@@ -121,6 +127,8 @@ typedef struct MOVStreamContext {
MOVStsc *stsc_data;
unsigned int stps_count;
unsigned *stps_data; ///< partial sync sample for mpeg-2 open gop
+ MOVElst *elst_data;
+ unsigned int elst_count;
int ctts_index;
int ctts_sample;
unsigned int sample_size; ///< may contain value calculated from stsd or value from stsz atom
@@ -131,8 +139,6 @@ typedef struct MOVStreamContext {
unsigned int keyframe_count;
int *keyframes;
int time_scale;
- int64_t empty_duration; ///< empty duration of the first edit list entry
- int64_t start_time; ///< start time of the media
int64_t time_offset; ///< time offset of the edit list entries
int current_sample;
unsigned int bytes_per_frame;