remove unused crypto context uid
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 19 Jan 2008 16:18:32 +0000 (16:18 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 19 Jan 2008 16:18:32 +0000 (16:18 +0000)
Originally committed as revision 11564 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/mxf.c

index b719451..5ce7569 100644 (file)
@@ -67,7 +67,6 @@ enum MXFMetadataSetType {
 typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
 typedef struct {
     UID uid;
     enum MXFMetadataSetType type;
-    UID context_uid;
     UID source_container_ul;
 } MXFCryptoContext;
 
     UID source_container_ul;
 } MXFCryptoContext;
 
@@ -179,7 +178,6 @@ static const uint8_t mxf_header_partition_pack_key[]       = { 0x06,0x0e,0x2b,0x
 static const uint8_t mxf_essence_element_key[]             = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01 };
 static const uint8_t mxf_klv_key[]                         = { 0x06,0x0e,0x2b,0x34 };
 /* complete keys to match */
 static const uint8_t mxf_essence_element_key[]             = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01 };
 static const uint8_t mxf_klv_key[]                         = { 0x06,0x0e,0x2b,0x34 };
 /* complete keys to match */
-static const uint8_t mxf_crypto_context_uid[]              = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x01,0x01,0x15,0x11,0x00,0x00,0x00,0x00 };
 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 };
 static const uint8_t mxf_encrypted_triplet_key[]           = { 0x06,0x0e,0x2b,0x34,0x02,0x04,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x7e,0x01,0x00 };
 static const uint8_t mxf_encrypted_essence_container[]     = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0b,0x01,0x00 };
 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 };
 static const uint8_t mxf_encrypted_triplet_key[]           = { 0x06,0x0e,0x2b,0x34,0x02,0x04,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x7e,0x01,0x00 };
 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,9 +403,7 @@ static int mxf_read_metadata_cryptographic_context(MXFCryptoContext *cryptoconte
 {
     if (size != 16)
         return -1;
 {
     if (size != 16)
         return -1;
-    if (IS_KLV_KEY(uid, mxf_crypto_context_uid))
-        get_buffer(pb, cryptocontext->context_uid, 16);
-    else if (IS_KLV_KEY(uid, mxf_crypto_source_container_ul))
+    if (IS_KLV_KEY(uid, mxf_crypto_source_container_ul))
         get_buffer(pb, cryptocontext->source_container_ul, 16);
     return 0;
 }
         get_buffer(pb, cryptocontext->source_container_ul, 16);
     return 0;
 }