diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:00:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:00:09 +0200 |
| commit | 0842e32f99105f06ad6b53f580ee777bc4bf9dee (patch) | |
| tree | b0b5b9ffcb9463556f7be33fdd5f43ba68d5fdfb /libavformat/oggdec.h | |
| parent | 4c273eb64c1faa47ced1cfcf15a7a1af4d27dc44 (diff) | |
| parent | d1f05dd18375f2f8e68372edee11436927e43ba8 (diff) | |
| download | ffmpeg-0842e32f99105f06ad6b53f580ee777bc4bf9dee.tar.gz | |
Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'
* commit 'd1f05dd18375f2f8e68372edee11436927e43ba8':
ogg: calculate the start position once all the headers are parsed
Conflicts:
libavformat/oggdec.c
libavformat/oggparseskeleton.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.h')
| -rw-r--r-- | libavformat/oggdec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 79d8179d9d..7b93175383 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -67,6 +67,7 @@ struct ogg_stream { unsigned int pduration; uint32_t serial; uint64_t granule; + uint64_t start_granule; int64_t lastpts; int64_t lastdts; int64_t sync_pos; ///< file offset of the first page needed to reconstruct the current packet @@ -105,6 +106,8 @@ struct ogg { #define OGG_FLAG_BOS 2 #define OGG_FLAG_EOS 4 +#define OGG_NOGRANULE_VALUE -1ull + extern const struct ogg_codec ff_celt_codec; extern const struct ogg_codec ff_dirac_codec; extern const struct ogg_codec ff_flac_codec; |