From d2ce10093e374709c5ea660d9b26f05043f1a6cd Mon Sep 17 00:00:00 2001 From: Rodger Combs Date: Sat, 20 Jun 2015 05:01:26 -0500 Subject: [PATCH] lavf/brstm: handle a BFSTM endianness oddity --- libavformat/brstm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/brstm.c b/libavformat/brstm.c index 0014b48b31..45bdb72867 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -296,7 +296,17 @@ static int read_header(AVFormatContext *s) ret = AVERROR(ENOMEM); goto fail; } - avio_read(s->pb, b->adpc, asize); + if (bfstm && codec != AV_CODEC_ID_ADPCM_THP_LE) { + // Big-endian BFSTMs have little-endian SEEK tables + // for some strange reason. + int i; + for (i = 0; i < asize; i += 2) { + b->adpc[i+1] = avio_r8(s->pb); + b->adpc[i] = avio_r8(s->pb); + } + } else { + avio_read(s->pb, b->adpc, asize); + } avio_skip(s->pb, size - asize); } break;