diff options
| author | Frank Galligan <fgalligan@chromium.org> | 2013-03-07 08:11:38 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 21:29:55 +0100 |
| commit | b853103fe0e59edc8970462abc6c181610ad9216 (patch) | |
| tree | 456ca7420742880b5015572be4187b0fdbcaf714 /libavformat/matroska.h | |
| parent | 710cd0fddf39d4eea68f7dcdd3e98da179a4cd7b (diff) | |
| download | ffmpeg-b853103fe0e59edc8970462abc6c181610ad9216.tar.gz | |
matroskadec: Add support for parsing Matroska ContentEncKeyID
This patch adds the enums for the ContentEncryption elements.
This patch also adds support for parsing the ContentEncKeyID. The
ContentEncKeyID is then base64 encoded and stored in the stream's
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
| -rw-r--r-- | libavformat/matroska.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 8e6f8cc339..8a7e10b64d 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -137,6 +137,15 @@ #define MATROSKA_ID_ENCODINGCOMPALGO 0x4254 #define MATROSKA_ID_ENCODINGCOMPSETTINGS 0x4255 +#define MATROSKA_ID_ENCODINGENCRYPTION 0x5035 +#define MATROSKA_ID_ENCODINGENCAESSETTINGS 0x47E7 +#define MATROSKA_ID_ENCODINGENCALGO 0x47E1 +#define MATROSKA_ID_ENCODINGENCKEYID 0x47E2 +#define MATROSKA_ID_ENCODINGSIGALGO 0x47E5 +#define MATROSKA_ID_ENCODINGSIGHASHALGO 0x47E6 +#define MATROSKA_ID_ENCODINGSIGKEYID 0x47E4 +#define MATROSKA_ID_ENCODINGSIGNATURE 0x47E3 + /* ID in the cues master */ #define MATROSKA_ID_POINTENTRY 0xBB |