Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'

[ffmpeg] / libavutil / encryption_info.h

diff --git a/libavutil/encryption_info.h b/libavutil/encryption_info.h
index 47dc3a35caccea67a1466c8e5bf6606583b46b2d..8fe7ebfe43203f63e88c07c115e5c00c097fef1c 100644 (file)
--- a/libavutil/encryption_info.h
+++ b/libavutil/encryption_info.h
@@ -41,7 +41,7 @@ typedef struct AVSubsampleEncryptionInfo {
  * The size of this struct is not part of the public ABI.
  */
 typedef struct AVEncryptionInfo {
-    /** The fourcc encryption scheme. */
+    /** The fourcc encryption scheme, in big-endian byte order. */
     uint32_t scheme;
 
     /**
@@ -115,6 +115,11 @@ typedef struct AVEncryptionInitInfo {
      */
     uint8_t* data;
     uint32_t data_size;
+
+    /**
+     * An optional pointer to the next initialization info in the list.
+     */
+    struct AVEncryptionInitInfo *next;
 } AVEncryptionInitInfo;
 
 /**
@@ -124,7 +129,7 @@ typedef struct AVEncryptionInitInfo {
  *
  * @param subsample_count The number of subsamples.
  * @param key_id_size The number of bytes in the key ID, should be 16.
- * @param key_id_size The number of bytes in the IV, should be 16.
+ * @param iv_size The number of bytes in the IV, should be 16.
  *
  * @return The new AVEncryptionInfo structure, or NULL on error.
  */