summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-12-18 09:17:19 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-12-18 09:17:19 +0000
commita15328249d8244c5a60b9740709fc88e4964080f (patch)
tree92e343eafd4cbe1cb41422e84f7a9cd71a094e90 /libavformat
parentefeb298ea0d3132ed62a15da89f76db7aabe4bfa (diff)
set alac channels from extradata, fix alac mono in m4a
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index dd44bab15d..e196365231 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1033,8 +1033,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
st->codec->block_align = sc->bytes_per_frame;
break;
case CODEC_ID_ALAC:
- if (st->codec->extradata_size == 36)
+ if (st->codec->extradata_size == 36) {
st->codec->frame_size = AV_RB32((st->codec->extradata+12));
+ st->codec->channels = AV_RB8 (st->codec->extradata+21);
+ }
break;
default:
break;