From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/thirdparty/ffmpeg/include/libavutil/encryption_info.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/csrc/thirdparty/ffmpeg/include/libavutil/encryption_info.h b/csrc/thirdparty/ffmpeg/include/libavutil/encryption_info.h
index 47dc3a3..8fe7ebf 100644
--- a/csrc/thirdparty/ffmpeg/include/libavutil/encryption_info.h
+++ b/csrc/thirdparty/ffmpeg/include/libavutil/encryption_info.h
@@ -41,7 +41,7 @@
* 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 @@
*/
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 @@
*
* @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.
*/
--
Gitblit v1.8.0