aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorPiotr Bandurski <ami_stuff@o2.pl>2013-01-01 16:57:01 +0000
committerPaul B Mahol <onemda@gmail.com>2013-01-01 17:03:22 +0000
commitfde13052fb82772396da68d0fdc714464c4b986f (patch)
treedf778838675db207d1748d1ce6c2ad9f84fbc587 /libavformat
parent7d66bc7920240cc0e8df6c44b2d2cdbe4b228fbe (diff)
downloadffmpeg-fde13052fb82772396da68d0fdc714464c4b986f.tar.gz
aiffdec: set block duration for QDM2
Fixes #1697.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/aiffdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 79b78533e3..8d466fa815 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -280,8 +280,10 @@ static int aiff_read_header(AVFormatContext *s)
return AVERROR(ENOMEM);
st->codec->extradata_size = size;
avio_read(pb, st->codec->extradata, size);
- if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align)
+ if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) {
st->codec->block_align = AV_RB32(st->codec->extradata+11*4);
+ aiff->block_duration = AV_RB32(st->codec->extradata+9*4);
+ }
break;
case MKTAG('C','H','A','N'):
if(ff_mov_read_chan(s, pb, st, size) < 0)