mov_finalize_stsd_codec parses stream information from the ALAC extradata,
so run it after the extradata processing is completed in mov_read_stsd.
Fixes playback of 96kHz ALAC streams muxed by qaac or the reference alac
encoder.
---
libavformat/mov.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a15c8d1..5ede1ed 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2288,7 +2288,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext
*pb, int entries)
if (pb->eof_reached)
return AVERROR_EOF;
- return mov_finalize_stsd_codec(c, pb, st, sc);
+ return 0;
}
static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
@@ -2340,7 +2340,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
memcpy(st->codecpar->extradata, sc->extradata[0],
sc->extradata_size[0]);
}
- return 0;
+ return mov_finalize_stsd_codec(c, pb, st, sc);
fail:
av_freep(&sc->extradata);
av_freep(&sc->extradata_size);
--
2.10.1.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
