Merge commit '5c437fb'

[ffmpeg] / libavutil / channel_layout.h

diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index ba4f96d2d04dfd215d0c07a4a7feb05f589edfa5..bc6befd8e386e7e088f22a154bfebafc52fcea90 100644 (file)
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -114,6 +114,10 @@ enum AVMatrixEncoding {
     AV_MATRIX_ENCODING_NONE,
     AV_MATRIX_ENCODING_DOLBY,
     AV_MATRIX_ENCODING_DPLII,
+    AV_MATRIX_ENCODING_DPLIIX,
+    AV_MATRIX_ENCODING_DPLIIZ,
+    AV_MATRIX_ENCODING_DOLBYEX,
+    AV_MATRIX_ENCODING_DOLBYHEADPHONE,
     AV_MATRIX_ENCODING_NB
 };