Merge commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7'

[ffmpeg] / libavutil / frame.h

diff --git a/libavutil/frame.h b/libavutil/frame.h
index b31cc3ec4cb72f7fc24bc422eaaed903fd7dcd2c..5e113fabb54aa144a22b178571ca469a78e5c458 100644 (file)
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -22,13 +22,12 @@
 
 #include <stdint.h>
 
-#include "libavcodec/version.h"
-
 #include "avutil.h"
 #include "buffer.h"
 #include "dict.h"
 #include "rational.h"
 #include "samplefmt.h"
+#include "version.h"
 
 enum AVColorSpace{
     AVCOL_SPC_RGB         =  0,
@@ -69,6 +68,10 @@ enum AVFrameSideDataType {
      * The data is the AVStereo3D struct defined in libavutil/stereo3d.h.
      */
     AV_FRAME_DATA_STEREO3D,
+    /**
+     * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h.
+     */
+    AV_FRAME_DATA_MATRIXENCODING,
 };
 
 typedef struct AVFrameSideData {