Skip to content
Snippets Groups Projects
Commit 4cc32e5c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

avformat/mp3dec: read xing toc independant of usetoc, only skip filling index if requested


Fixes hypothetical parsing bug with -usetoc 0

Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent a71832f8
No related branches found
No related tags found
No related merge requests found
...@@ -94,9 +94,6 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration ...@@ -94,9 +94,6 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration
int i; int i;
MP3DecContext *mp3 = s->priv_data; MP3DecContext *mp3 = s->priv_data;
if (!mp3->usetoc)
return;
if (!filesize && if (!filesize &&
!(filesize = avio_size(s->pb))) { !(filesize = avio_size(s->pb))) {
av_log(s, AV_LOG_WARNING, "Cannot determine file size, skipping TOC table.\n"); 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 ...@@ -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++) { for (i = 0; i < XING_TOC_COUNT; i++) {
uint8_t b = avio_r8(s->pb); uint8_t b = avio_r8(s->pb);
if (mp3->usetoc)
av_add_index_entry(s->streams[0], av_add_index_entry(s->streams[0],
av_rescale(b, filesize, 256), av_rescale(b, filesize, 256),
av_rescale(i, duration, XING_TOC_COUNT), av_rescale(i, duration, XING_TOC_COUNT),
0, 0, AVINDEX_KEYFRAME); 0, 0, AVINDEX_KEYFRAME);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment