diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-09-09 11:54:35 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-09-09 11:54:35 +0000 |
| commit | f14a201b32e594d317640b4004dc9a342b6617f8 (patch) | |
| tree | d976d91b13926256f65f2b74f2d13903a530b6a6 /libavformat | |
| parent | 3fc9d7cec4ac4a04e7d60c39beae3be672d3792b (diff) | |
| download | ffmpeg-f14a201b32e594d317640b4004dc9a342b6617f8.tar.gz | |
matroskadec: move timecode calculation a little earlier
so as to be able to use it in other part of the code
Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31fc214173..45974235c9 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1423,6 +1423,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, uint64_t duration, int is_keyframe, int64_t cluster_pos) { + uint64_t timecode = AV_NOPTS_VALUE; MatroskaTrack *track; int res = 0; AVStream *st; @@ -1458,6 +1459,13 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if (is_keyframe == -1) is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0; + if (cluster_time != (uint64_t)-1 + && (block_time >= 0 || cluster_time >= -block_time)) { + timecode = cluster_time + block_time; + if (is_keyframe) + av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME); + } + if (matroska->skip_to_keyframe) { if (!is_keyframe || st != matroska->skip_to_stream) return res; @@ -1541,16 +1549,6 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, } if (res == 0) { - uint64_t timecode = AV_NOPTS_VALUE; - - if (cluster_time != (uint64_t)-1 - && (block_time >= 0 || cluster_time >= -block_time)) { - timecode = cluster_time + block_time; - if (is_keyframe) - av_add_index_entry(st, cluster_pos, timecode, - 0, 0, AVINDEX_KEYFRAME); - } - for (n = 0; n < laces; n++) { if (st->codec->codec_id == CODEC_ID_RA_288 || st->codec->codec_id == CODEC_ID_COOK || |