virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes hypothetical parsing bug with -usetoc 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-07 12:37:07 +02:00
parent a71832f826
commit 4cc32e5cad
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mp3dec.c
View File

@ -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,7 +102,7 @@ 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),