diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-04-22 12:24:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-22 14:41:57 +0200 |
| commit | 58fade2c68483d31f4bcaf1db49aafc45c2c3672 (patch) | |
| tree | f4ea03ea8385f3c1fbb3a32a7760571c9e988276 | |
| parent | c3a73666ad1eee93e49f25efae30fda5556c228e (diff) | |
| download | ffmpeg-58fade2c68483d31f4bcaf1db49aafc45c2c3672.tar.gz | |
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>
| -rw-r--r-- | libavformat/mp3dec.c | 2 | ||||
| -rw-r--r-- | 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" |