diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-13 23:34:43 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-14 18:21:19 +0200 |
| commit | d05625bd04a59187a2c6d5cf775e2e167d9a54cc (patch) | |
| tree | 6be62e92fae5a7c60d2d70da2db34cda4eceaf0d | |
| parent | 4c53c66a21f18b2633bfd4894623f163258b2eee (diff) | |
| download | ffmpeg-d05625bd04a59187a2c6d5cf775e2e167d9a54cc.tar.gz | |
avidec: handle 0-size packets that exist only in index.
0-sized packets are used to implement variable fps.
However there seems to be a variation where these are not
even stored in the main file but as 0-size index entries
only.
This fixes the sample in trac issue #957, it now plays both
the same ways as in MPlayer and in a way that looks correct.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | libavformat/avidec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index b78a3d2a2b..44e98eedfd 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1236,6 +1236,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) AVIStream *ast; unsigned int index, tag, flags, pos, len, first_packet = 1; unsigned last_pos= -1; + unsigned last_len= 0; int64_t idx1_pos, first_packet_pos = 0, data_offset = 0; nb_index_entries = size / 16; @@ -1278,12 +1279,16 @@ static int avi_read_idx1(AVFormatContext *s, int size) av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len); + // even if we have only a single stream, we should + // switch to non-interleaved to get correct timestamps if(last_pos == pos) avi->non_interleaved= 1; - else if(len || !ast->sample_size) + if((last_pos != pos || !last_len) && (len || !ast->sample_size)) { av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0); + } ast->cum_len += get_duration(ast, len); last_pos= pos; + last_len= len; } return 0; } |