Revision 3a9c08be

View differences:

libavformat/mxf.c
67 67
typedef struct {
68 68
    UID uid;
69 69
    enum MXFMetadataSetType type;
70
    UID context_uid;
71 70
    UID source_container_ul;
72 71
} MXFCryptoContext;
73 72

  
......
179 178
static const uint8_t mxf_essence_element_key[]             = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01 };
180 179
static const uint8_t mxf_klv_key[]                         = { 0x06,0x0e,0x2b,0x34 };
181 180
/* complete keys to match */
182
static const uint8_t mxf_crypto_context_uid[]              = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x01,0x01,0x15,0x11,0x00,0x00,0x00,0x00 };
183 181
static const uint8_t mxf_crypto_source_container_ul[]      = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x06,0x01,0x01,0x02,0x02,0x00,0x00,0x00 };
184 182
static const uint8_t mxf_encrypted_triplet_key[]           = { 0x06,0x0e,0x2b,0x34,0x02,0x04,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x7e,0x01,0x00 };
185 183
static const uint8_t mxf_encrypted_essence_container[]     = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0b,0x01,0x00 };
......
405 403
{
406 404
    if (size != 16)
407 405
        return -1;
408
    if (IS_KLV_KEY(uid, mxf_crypto_context_uid))
409
        get_buffer(pb, cryptocontext->context_uid, 16);
410
    else if (IS_KLV_KEY(uid, mxf_crypto_source_container_ul))
406
    if (IS_KLV_KEY(uid, mxf_crypto_source_container_ul))
411 407
        get_buffer(pb, cryptocontext->source_container_ul, 16);
412 408
    return 0;
413 409
}

Also available in: Unified diff