diff options
| author | Jacob Trimble <modmaker@google.com> | 2017-12-06 16:17:54 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-04-19 03:15:32 +0200 |
| commit | f7221d8e670ec05471a16cc4cc1cc8e0040b5b5f (patch) | |
| tree | c9254af6d7032623a477b53cd6f5f35217568756 /libavutil | |
| parent | 37175122824d2706e8d2f67fc067b189ac400cd2 (diff) | |
| download | ffmpeg-f7221d8e670ec05471a16cc4cc1cc8e0040b5b5f.tar.gz | |
avformat/mov: Increase support for common encryption.
- Parse schm atom to get different encryption schemes.
- Allow senc atom to appear in track fragments.
- Allow 16-byte IVs.
- Allow constant IVs (specified in tenc).
- Allow only tenc to specify encryption (i.e. no senc/saiz/saio).
- Use sample descriptor to detect clear fragments.
This doesn't support:
- Different sample descriptor holding different encryption info.
- Only first sample descriptor can be encrypted.
- Encrypted sample groups (i.e. seig).
- Non-'cenc' encryption scheme when using -decryption_key.
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/encryption_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/encryption_info.h b/libavutil/encryption_info.h index 47dc3a35ca..ec5501aac7 100644 --- 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; /** |