diff options
| author | Peter Ross <pross@xvid.org> | 2010-02-23 11:15:18 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2010-02-23 11:15:18 +0000 |
| commit | 02cd6f542630771bac040a712b0ab025496cded9 (patch) | |
| tree | de93ba235c4389fece020a13ca8e772c8182dadc | |
| parent | 939939333359432596858ce7bcc031003d7e18be (diff) | |
| download | ffmpeg-02cd6f542630771bac040a712b0ab025496cded9.tar.gz | |
Set video stream duration for Bink demuxer
Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/bink.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/bink.c b/libavformat/bink.c index e75bacda02..62bb114276 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -44,7 +44,6 @@ enum BinkAudFlags { typedef struct { uint32_t file_size; - uint32_t total_frames; uint32_t num_audio_tracks; int current_track; ///< audio track to return in next packet @@ -86,9 +85,9 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) vst->codec->codec_tag = get_le32(pb); bink->file_size = get_le32(pb) + 8; - bink->total_frames = get_le32(pb); + vst->duration = get_le32(pb); - if (bink->total_frames > 1000000) { + if (vst->duration > 1000000) { av_log(s, AV_LOG_ERROR, "invalid header: more than 1000000 frames\n"); return AVERROR(EIO); } @@ -149,9 +148,9 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) /* frame index table */ pos = get_le32(pb) & ~1; - for (i = 0; i < bink->total_frames; i++) { + for (i = 0; i < vst->duration; i++) { prev_pos = pos; - if (i == bink->total_frames - 1) { + if (i == vst->duration - 1) { pos = bink->file_size; keyframe = 0; } else { @@ -183,7 +182,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) int index_entry; AVStream *st = s->streams[0]; // stream 0 is video stream with index - if (bink->video_pts >= bink->total_frames) + if (bink->video_pts >= st->duration) return AVERROR(EIO); index_entry = av_index_search_timestamp(st, bink->video_pts, |