From: xiong zedong <zedong....@gmail.com> Signed-off-by: xiong zedong <zedong....@gmail.com> --- libavformat/mov.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c index d7be593a86..a3a79679ad 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1552,10 +1552,23 @@ static int mov_read_enda(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - little_endian = avio_rb16(pb) & 0xFF; + /* ISO/IEC 23003-5 Part 5: Uncompressed audio in MPEG-4 file format */ + if (atom.type == MKTAG('p','c','m','C')) { + avio_r8(pb); /* version */ + avio_rb24(pb); /* flags */ + little_endian = avio_r8(pb) & 0x01; /* format_flags */ + avio_r8(pb); /* PCM_sample_size */ + } else { + little_endian = avio_rb16(pb) & 0xFF; + } + av_log(c->fc, AV_LOG_TRACE, "enda %d\n", little_endian); if (little_endian == 1) { switch (st->codecpar->codec_id) { + /* for 16 bits in pcmC */ + case AV_CODEC_ID_PCM_S16BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; + break; case AV_CODEC_ID_PCM_S24BE: st->codecpar->codec_id = AV_CODEC_ID_PCM_S24LE; break; @@ -7584,6 +7597,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('e','d','t','s'), mov_read_default }, { MKTAG('e','l','s','t'), mov_read_elst }, { MKTAG('e','n','d','a'), mov_read_enda }, +{ MKTAG('p','c','m','C'), mov_read_enda }, { MKTAG('f','i','e','l'), mov_read_fiel }, { MKTAG('a','d','r','m'), mov_read_adrm }, { MKTAG('f','t','y','p'), mov_read_ftyp }, -- 2.24.2 (Apple Git-127) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".