Module: libav Branch: master Commit: 980e65f11994c3659451feb170bff085731693c2
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Jun 22 13:08:08 2012 +0200 ape: create audio stream before reading tags. Tags may contain attached picture, which will be exported as video streams. This ensures that the audio stream is always the first. --- libavformat/ape.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/ape.c b/libavformat/ape.c index b3fca23..76ad549 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -312,12 +312,6 @@ static int ape_read_header(AVFormatContext * s) ape_dumpinfo(s, ape); - /* try to read APE tags */ - if (pb->seekable) { - ff_ape_parse_tag(s); - avio_seek(pb, 0, SEEK_SET); - } - av_log(s, AV_LOG_DEBUG, "Decoding file - v%d.%02d, compression level %"PRIu16"\n", ape->fileversion / 1000, (ape->fileversion % 1000) / 10, ape->compressiontype); @@ -354,6 +348,12 @@ static int ape_read_header(AVFormatContext * s) pts += ape->blocksperframe / MAC_SUBFRAME_SIZE; } + /* try to read APE tags */ + if (pb->seekable) { + ff_ape_parse_tag(s); + avio_seek(pb, 0, SEEK_SET); + } + return 0; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
