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 <michaelni@gmx.at>

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 8a4dfbd7bb4fb8facfd5fc4e3ec79dba0100cae1..a2d3dfe737754b24f0210824d996f04acd667229 100644 (file)
--- 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 93a878fadb2c68d4a252616532f0b69341fa976a..f0f5fd03d76b9ea4f4006d3a360f8c3888b4a9f0 100644 (file)
--- 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"