Mercurial > libavformat.hg
diff mxfdec.c @ 4404:7cf3b77ad6ff libavformat
reuse MXFCodecUL for data def and simplify
author | bcoudurier |
---|---|
date | Sun, 08 Feb 2009 05:12:30 +0000 |
parents | 39f6b190c772 |
children | a079bfd0192b |
line wrap: on
line diff
--- a/mxfdec.c Sun Feb 08 04:42:38 2009 +0000 +++ b/mxfdec.c Sun Feb 08 05:12:30 2009 +0000 @@ -618,7 +618,7 @@ static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid) { - while (uls->id != CODEC_ID_NONE) { + while (uls->uid[0]) { if(mxf_match_uid(uls->uid, *uid, uls->matching_len)) break; uls++; @@ -626,16 +626,6 @@ return uls; } -static enum CodecType mxf_get_codec_type(const MXFDataDefinitionUL *uls, UID *uid) -{ - while (uls->type != CODEC_TYPE_DATA) { - if(mxf_match_uid(uls->uid, *uid, 16)) - break; - uls++; - } - return uls->type; -} - static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMetadataSetType type) { int i; @@ -757,7 +747,8 @@ } PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul); - st->codec->codec_type = mxf_get_codec_type(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul); + codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul); + st->codec->codec_type = codec_ul->id; source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref, AnyType); if (source_package->descriptor) {