[FFmpeg-cvslog] avformat/mp3dec: Allow forcing the use of the xing TOC for CBR files

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 15 13:24:19 2015 +0200| [a742a0536dbb8b5a280b21ffd76c8b4acdbd20a6] | committer: Michael Niedermayer

avformat/mp3dec: Allow forcing the use of the xing TOC for CBR files

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a742a0536dbb8b5a280b21ffd76c8b4acdbd20a6
---

 libavformat/mp3dec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 161f27d..697dace 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -428,6 +428,7 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
     int best_score;
 
     if (   mp3->is_cbr
+        && (mp3->usetoc <= 0 || !mp3->xing_toc)
         && st->duration > 0
         && mp3->header_filesize > s->internal->data_offset
         && mp3->frames) {