From 4cc32e5cad98e3037bce9ca945ea6e5fbcfd5d09 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 7 Jul 2013 12:37:07 +0200
Subject: [PATCH] avformat/mp3dec: read xing toc independant of usetoc, only
skip filling index if requested
Fixes hypothetical parsing bug with -usetoc 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/mp3dec.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index c822eb6f2a3..522ccf7baa9 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -94,9 +94,6 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration
int i;
MP3DecContext *mp3 = s->priv_data;
- if (!mp3->usetoc)
- return;
-
if (!filesize &&
!(filesize = avio_size(s->pb))) {
av_log(s, AV_LOG_WARNING, "Cannot determine file size, skipping TOC table.\n");
@@ -105,8 +102,8 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration
for (i = 0; i < XING_TOC_COUNT; i++) {
uint8_t b = avio_r8(s->pb);
-
- av_add_index_entry(s->streams[0],
+ if (mp3->usetoc)
+ av_add_index_entry(s->streams[0],
av_rescale(b, filesize, 256),
av_rescale(i, duration, XING_TOC_COUNT),
0, 0, AVINDEX_KEYFRAME);
--
GitLab