X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fisom.h;h=8f92caed0ccaf07ccf2cd8a70508626dcbb8d48c;hb=c130428ab5a17911d0bfa11f804ec05e6f7a53e6;hp=7fc2b546f87f00f45615672cc72f1f701d83c147;hpb=eae3cf06a5410cf6d06235de4ceea28e33e53be3;p=ffmpeg diff --git a/libavformat/isom.h b/libavformat/isom.h index 7fc2b546f87..8f92caed0cc 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -109,7 +109,9 @@ typedef struct MOVStreamContext { unsigned int keyframe_count; int *keyframes; int time_scale; - int64_t time_offset; ///< time offset of the first edit list entry + 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; unsigned int samples_per_frame; @@ -148,10 +150,12 @@ int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag); int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb); void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id); +#define MP4ODescrTag 0x01 #define MP4IODescrTag 0x02 #define MP4ESDescrTag 0x03 #define MP4DecConfigDescrTag 0x04 #define MP4DecSpecificDescrTag 0x05 +#define MP4SLDescrTag 0x06 int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom); enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags);