summaryrefslogtreecommitdiff
path: root/libavformat/riffdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-16 14:03:13 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-09-16 14:03:13 +0200
commitf17ca460093bb01f711a5db43b3e65555a1a937f (patch)
tree6d86a96a03b43023de4ae4db9f7b288201e7dfde /libavformat/riffdec.c
parent2fc552b629d771c8357a1b0262af4b21e5bcd4b8 (diff)
lavf/riff: Support decoding Ambisonic wav files.
Reported and tested by Andy Furniss, adf d lists at gmail
Diffstat (limited to 'libavformat/riffdec.c')
-rw-r--r--libavformat/riffdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 7eecdb24b8..26779e1bfb 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -69,6 +69,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)
ff_get_guid(pb, &subformat);
if (!memcmp(subformat + 4,
+ (const uint8_t[]){ FF_AMBISONIC_BASE_GUID }, 12) ||
+ !memcmp(subformat + 4,
(const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
c->codec_tag = AV_RL32(subformat);
c->codec_id = ff_wav_codec_get_id(c->codec_tag,