diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 21:46:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 21:46:35 +0200 |
| commit | 5864ce13d188260998bbf49a2a774fa9bd445c10 (patch) | |
| tree | 149cc5b73142b5a876068d33ec1c127c65e6f37f /libavformat/isom.h | |
| parent | 8c51ea54897c2d8671b38efecc1422ad4ad344f9 (diff) | |
| parent | 50d1f4437be88a4b7e412e90d71153cae68017cc (diff) | |
| download | ffmpeg-5864ce13d188260998bbf49a2a774fa9bd445c10.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3dec: read Xing frame TOC index
mp3dec: use named constants for Xing header flags
libx264: add support for nal-hrd, required for Blu-ray streams.
mov: support random access point grouping
matroskadec: properly support BlockDuration
Conflicts:
libavcodec/libx264.c
libavformat/isom.h
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
| -rw-r--r-- | libavformat/isom.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index 6565bdcc17..875c3a9fdf 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -87,6 +87,11 @@ typedef struct { unsigned flags; } MOVTrackExt; +typedef struct { + unsigned int count; + unsigned int index; +} MOVSbgp; + typedef struct MOVStreamContext { AVIOContext *pb; int ffindex; ///< AVStream index @@ -136,6 +141,8 @@ typedef struct MOVStreamContext { uint32_t tmcd_flags; ///< tmcd track flags int64_t track_end; ///< used for dts generation in fragmented movie files int start_pad; ///< amount of samples to skip due to enc-dec delay + unsigned int rap_group_count; + MOVSbgp *rap_group; } MOVStreamContext; typedef struct MOVContext { |