]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mp3dec: Allow forcing the use of the xing TOC for CBR files
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 11:24:19 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 11:25:07 +0000 (13:25 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mp3dec.c

index 161f27d2caaec695ae4af7281132f6938cbc1c25..697dace0185b6c843c1ef01038eb5a7d6608e115 100644 (file)
@@ -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) {