diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-10 13:35:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-10 13:36:03 +0200 |
| commit | 5d0f836f6270d08bb1238dac8e484a743623cb47 (patch) | |
| tree | ba3376e35c12e238de32cab028af27a7bd646875 | |
| parent | 578d99e7c6d1d8d3eabd24501b6758797e14fb33 (diff) | |
| parent | 7b39d853b88e4be03f2cfb346df3ad55ccae3377 (diff) | |
| download | ffmpeg-5d0f836f6270d08bb1238dac8e484a743623cb47.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/flac: Autodetect raw flac files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flacdec.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 1a8dc19af3..4207fd2bf6 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -176,8 +176,26 @@ fail: return ret; } +static int raw_flac_probe(AVProbeData *p) +{ + if ((p->buf[2] & 0xF0) == 0) // blocksize code invalid + return 0; + if ((p->buf[2] & 0x0F) == 0x0F) // sample rate code invalid + return 0; + if ((p->buf[3] & 0xF0) >= FLAC_MAX_CHANNELS + FLAC_CHMODE_MID_SIDE << 4) + // channel mode invalid + return 0; + if ((p->buf[3] & 0x06) == 0x06) // bits per sample code invalid + return 0; + if ((p->buf[3] & 0x01) == 0x01) // reserved bit set + return 0; + return AVPROBE_SCORE_EXTENSION / 4 + 1; +} + static int flac_probe(AVProbeData *p) { + if ((AV_RB16(p->buf) & 0xFFFE) == 0xFFF8) + return raw_flac_probe(p); if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4)) return 0; return AVPROBE_SCORE_EXTENSION; |