From 58fade2c68483d31f4bcaf1db49aafc45c2c3672 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 22 Apr 2015 12:24:39 +0200 Subject: [PATCH] avformat/mp3dec: make generic index mode the default It's the most useful mode, because it seeks accurately, and does not break features like gapless audio. Signed-off-by: Michael Niedermayer --- libavformat/mp3dec.c | 2 +- tests/fate/gapless.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 8a4dfbd7bb..a2d3dfe737 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -337,7 +337,7 @@ static int mp3_read_header(AVFormatContext *s) int i; if (mp3->usetoc < 0) - mp3->usetoc = 0; + mp3->usetoc = 2; st = avformat_new_stream(s, NULL); if (!st) diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak index 93a878fadb..f0f5fd03d7 100644 --- a/tests/fate/gapless.mak +++ b/tests/fate/gapless.mak @@ -1,5 +1,5 @@ FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3 fate-gapless-mp3-toc fate-gapless-mp3-notoc -fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-usetoc 2" +fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 fate-gapless-mp3-toc: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-usetoc 1" fate-gapless-mp3-notoc: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-usetoc 0"