Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / tiertexseq.c

diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
index 4e845d777ce77edd1a27a9ef9f104b814e2978fc..a0c06deab6d8bbd323b2ec212ee42e4a2d174002 100644 (file)
--- a/libavformat/tiertexseq.c
+++ b/libavformat/tiertexseq.c
@@ -181,7 +181,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, AVIOContext *pb)
     return 0;
 }
 
-static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int seq_read_header(AVFormatContext *s)
 {
     int i, rc;
     SeqDemuxContext *seq = s->priv_data;
@@ -224,6 +224,7 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (!st)
         return AVERROR(ENOMEM);
 
+    st->start_time = 0;
     avpriv_set_pts_info(st, 32, 1, SEQ_SAMPLE_RATE);
     seq->audio_stream_index = st->index;
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -233,7 +234,7 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->sample_rate = SEQ_SAMPLE_RATE;
     st->codec->bits_per_coded_sample = 16;
     st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
-    st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
+    st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample / 8;
 
     return 0;
 }