aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorami_stuff <ami_stuff@o2.pl>2011-07-18 13:59:30 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-07-18 14:11:04 +0200
commit93263dc19e441f347baf9c36b5bc83693f16d084 (patch)
tree867d8c70d52017972f11ff2086e7a50a36a27149 /libavformat
parent78accb876c173c881082018b169b5cf9fa13e6e1 (diff)
downloadffmpeg-93263dc19e441f347baf9c36b5bc83693f16d084.tar.gz
au: add computation for duration
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/au.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/au.c b/libavformat/au.c
index f01c853a59..593442807c 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -120,7 +120,7 @@ static int au_probe(AVProbeData *p)
static int au_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- int size;
+ int size, data_size = 0;
unsigned int tag;
AVIOContext *pb = s->pb;
unsigned int id, channels, rate;
@@ -132,7 +132,12 @@ static int au_read_header(AVFormatContext *s,
if (tag != MKTAG('.', 's', 'n', 'd'))
return -1;
size = avio_rb32(pb); /* header size */
- avio_rb32(pb); /* data size */
+ data_size = avio_rb32(pb); /* data size in bytes */
+
+ if (data_size < 0) {
+ av_log(s, AV_LOG_ERROR, "Invalid negative data size '%d' found\n", data_size);
+ return AVERROR_INVALIDDATA;
+ }
id = avio_rb32(pb);
rate = avio_rb32(pb);
@@ -159,6 +164,7 @@ static int au_read_header(AVFormatContext *s,
st->codec->codec_id = codec;
st->codec->channels = channels;
st->codec->sample_rate = rate;
+ st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * av_get_bits_per_sample(codec));
av_set_pts_info(st, 64, 1, rate);
return 0;
}