diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 00:09:27 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 00:09:27 +0000 |
| commit | 95a07973cb43c43b6b03916ddb9d3af53bd205d8 (patch) | |
| tree | eb452e8300ff9ce198357ed2a5e1ada72cc2642c /libavformat/mov.c | |
| parent | c63b9a1123cc40328387d2c79a4e5301c157aa02 (diff) | |
| download | ffmpeg-95a07973cb43c43b6b03916ddb9d3af53bd205d8.tar.gz | |
support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov
Originally committed as revision 6951 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 582d6221d9..7f25bd9527 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -412,6 +412,8 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->codec_type = CODEC_TYPE_VIDEO; else if(type == MKTAG('s', 'o', 'u', 'n')) st->codec->codec_type = CODEC_TYPE_AUDIO; + else if(type == MKTAG('m', '1', 'a', ' ')) + st->codec->codec_id = CODEC_ID_MP2; get_be32(pb); /* component manufacture */ get_be32(pb); /* component flags */ get_be32(pb); /* component flags mask */ @@ -1037,6 +1039,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->channels= 1; /* really needed */ break; case CODEC_ID_MP2: + st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */ st->need_parsing = 1; break; default: |