aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-15 13:24:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-15 13:25:07 +0200
commita742a0536dbb8b5a280b21ffd76c8b4acdbd20a6 (patch)
tree894cad069b93b32e5c6eadeb4a71d7aa92a692a0
parent0842df2619a005ae8b02a2759a955e2e1248cd55 (diff)
downloadffmpeg-a742a0536dbb8b5a280b21ffd76c8b4acdbd20a6.tar.gz
avformat/mp3dec: Allow forcing the use of the xing TOC for CBR files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mp3dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 161f27d2ca..697dace018 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) {