diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-01-14 23:31:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-01-14 23:31:30 +0000 |
| commit | 8b621afbd127ff181d251087f90198445266ad87 (patch) | |
| tree | 30e9e95e909451e4fe64b6839f8263c30c1ab6e0 /libavformat/mxf.c | |
| parent | 0fc3a83159b328b7aac0f8958fee7b13e5049ac6 (diff) | |
remove useless preface parsing for now, will reintroduce it if needed
Originally committed as revision 7515 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxf.c')
| -rw-r--r-- | libavformat/mxf.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 039eb452c3..f7a3f4350f 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -135,10 +135,6 @@ typedef struct MXFContext { int packages_count; UID *essence_container_data_sets_refs; int essence_container_data_sets_count; - UID *essence_containers_uls; /* Universal Labels SMPTE RP224 */ - int essence_containers_uls_count; - UID operational_pattern_ul; - UID content_storage_uid; MXFMetadataSet **metadata_sets; int metadata_sets_count; const uint8_t *sync_key; @@ -300,27 +296,6 @@ static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set) return 0; } -static int mxf_read_metadata_preface(MXFContext *mxf, ByteIOContext *pb, int tag) -{ - switch (tag) { - case 0x3B03: - get_buffer(pb, mxf->content_storage_uid, 16); - break; - case 0x3B09: - get_buffer(pb, mxf->operational_pattern_ul, 16); - break; - case 0x3B0A: - mxf->essence_containers_uls_count = get_be32(pb); - if (mxf->essence_containers_uls_count >= UINT_MAX / sizeof(UID)) - return -1; - mxf->essence_containers_uls = av_malloc(mxf->essence_containers_uls_count * sizeof(UID)); - url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ - get_buffer(pb, (uint8_t *)mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID)); - break; - } - return 0; -} - static int mxf_read_metadata_content_storage(MXFContext *mxf, ByteIOContext *pb, int tag) { switch (tag) { @@ -780,7 +755,6 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) } static const MXFMetadataReadTableEntry mxf_metadata_read_table[] = { - { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x2F,0x00 }, mxf_read_metadata_preface, 0, AnyType }, { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x18,0x00 }, mxf_read_metadata_content_storage, 0, AnyType }, { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x37,0x00 }, mxf_read_metadata_source_package, sizeof(MXFPackage), SourcePackage }, { { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x36,0x00 }, mxf_read_metadata_material_package, sizeof(MXFPackage), MaterialPackage }, @@ -887,7 +861,6 @@ static int mxf_read_close(AVFormatContext *s) av_freep(&mxf->packages_refs); av_freep(&mxf->essence_container_data_sets_refs); - av_freep(&mxf->essence_containers_uls); for (i = 0; i < mxf->metadata_sets_count; i++) { switch (mxf->metadata_sets[i]->type) { case MultipleDescriptor: |