From 369684f1092427a3cfa1a62b43f2952a5554061d Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 7 Jun 2013 10:28:13 +0000 Subject: [PATCH] tta: unbreak demuxing of files with id3 tags at start of file Signed-off-by: Paul B Mahol --- libavformat/tta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/tta.c b/libavformat/tta.c index ec006a8e70..dec86c0a6c 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -59,12 +59,12 @@ static int tta_read_header(AVFormatContext *s) uint64_t framepos, start_offset; uint32_t nb_samples, crc; + ff_id3v1_read(s); if (s->pb->seekable) { + int64_t pos = avio_tell(s->pb); ff_ape_parse_tag(s); - avio_seek(s->pb, 0, SEEK_SET); + avio_seek(s->pb, pos, SEEK_SET); } - if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) - ff_id3v1_read(s); start_offset = avio_tell(s->pb); ffio_init_checksum(s->pb, tta_check_crc, UINT32_MAX);