diff options
| author | François Revol <revol@free.fr> | 2005-01-23 10:44:50 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2005-01-23 10:44:50 +0000 |
| commit | f2196640711ec564932b7a27e05874fc3a41d765 (patch) | |
| tree | 6b3150231e1dbcdfc9986f0f8bcfbf3aa49f3baa | |
| parent | 7fe5a3c0c7d26c11a8377c6f14b486a3d3131a06 (diff) | |
| download | ffmpeg-f2196640711ec564932b7a27e05874fc3a41d765.tar.gz | |
AAC fix by Thomas Raivio <tjraivio AT cc DOT hut DOT fi>
Originally committed as revision 3866 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 5cf5cabac5..e50f91f3f2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -137,7 +137,7 @@ static const CodecTag mov_audio_tags[] = { { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */ /* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ /* MP4 tags */ - { CODEC_ID_MPEG4AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */ + { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */ /* The standard for mpeg4 audio is still not normalised AFAIK anyway */ { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ @@ -1071,6 +1071,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) // 5 bits objectTypeIndex, 4 bits sampleRateIndex, 4 bits channels int samplerate_index = ((px[0] & 7) << 1) + ((px[1] >> 7) & 1); st->codec.sample_rate = samplerate_table[samplerate_index]; + st->codec.channels = (px[1] >> 3) & 15; } } else if(size>=(16+20)) |