Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'

[ffmpeg] / libavformat / riff.h

diff --git a/libavformat/riff.h b/libavformat/riff.h
index 399c52738ff9a29b12611dba64882b8527609226..3b57bb45d38e3c3bc39c78bcb6f1edfc267d7069 100644 (file)
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -52,6 +52,11 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t
  */
 #define FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX    0x00000001
 
+/**
+ * Tell ff_put_wav_header() to write an empty channel mask.
+ */
+#define FF_PUT_WAV_HEADER_SKIP_CHANNELMASK      0x00000002
+
 /**
  * Write WAVEFORMAT header structure.
  *
@@ -102,6 +107,8 @@ extern const AVCodecGuid ff_codec_wav_guids[];
 
 #define FF_MEDIASUBTYPE_BASE_GUID \
     0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
+#define FF_AMBISONIC_BASE_GUID \
+    0x21, 0x07, 0xD3, 0x11, 0x86, 0x44, 0xC8, 0xC1, 0xCA, 0x00, 0x00, 0x00
 
 static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
 {