# HG changeset patch # User bcoudurier # Date 1168734745 0 # Node ID eeb3521e4d0981f1d6f1480ce23b53b47e734ce1 # Parent 2593a455c3f0c4e8b50ab980c5cd7244785bb2e7 AnyType is needed, descriptor_ref can reference Descriptor or MultipleDescriptor diff -r 2593a455c3f0 -r eeb3521e4d09 mxf.c --- a/mxf.c Sat Jan 13 21:13:26 2007 +0000 +++ b/mxf.c Sun Jan 14 00:32:25 2007 +0000 @@ -50,6 +50,7 @@ typedef uint8_t UID[16]; enum MXFMetadataSetType { + AnyType, MaterialPackage, SourcePackage, SourceClip, @@ -648,7 +649,7 @@ return NULL; for (i = 0; i < mxf->metadata_sets_count; i++) { if (!memcmp(*strong_ref, mxf->metadata_sets[i]->uid, 16) && - mxf->metadata_sets[i]->type == type) { + (type == AnyType || mxf->metadata_sets[i]->type == type)) { return mxf->metadata_sets[i]; } } @@ -749,7 +750,7 @@ #endif st->codec->codec_type = mxf_get_codec_type(mxf_data_definition_uls, &source_track->sequence->data_definition_ul); - source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref, Descriptor); + source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref, AnyType); if (source_package->descriptor) { if (source_package->descriptor->type == MultipleDescriptor) { for (j = 0; j < source_package->descriptor->sub_descriptors_count; j++) { @@ -764,7 +765,7 @@ break; } } - } else + } else if (source_package->descriptor->type == Descriptor) descriptor = source_package->descriptor; } if (!descriptor) {