[SCM] libav/experimental: remove useless essence container data sets for now
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:58 UTC 2013
The following commit has been merged in the experimental branch:
commit d8b3576d42f4beba8aaf1e6da60112836f8a315c
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sun Jan 14 23:32:51 2007 +0000
remove useless essence container data sets for now
Originally committed as revision 7516 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index f7a3f43..869aed9 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -133,8 +133,6 @@ typedef struct {
typedef struct MXFContext {
UID *packages_refs;
int packages_count;
- UID *essence_container_data_sets_refs;
- int essence_container_data_sets_count;
MXFMetadataSet **metadata_sets;
int metadata_sets_count;
const uint8_t *sync_key;
@@ -307,14 +305,6 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, ByteIOContext *pb,
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, (uint8_t *)mxf->packages_refs, mxf->packages_count * sizeof(UID));
break;
- case 0x1902:
- mxf->essence_container_data_sets_count = get_be32(pb);
- if (mxf->essence_container_data_sets_count >= UINT_MAX / sizeof(UID))
- return -1;
- mxf->essence_container_data_sets_refs = av_malloc(mxf->essence_container_data_sets_count * sizeof(UID));
- url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
- get_buffer(pb, (uint8_t *)mxf->essence_container_data_sets_refs, mxf->essence_container_data_sets_count * sizeof(UID));
- break;
}
return 0;
}
@@ -860,7 +850,6 @@ static int mxf_read_close(AVFormatContext *s)
int i;
av_freep(&mxf->packages_refs);
- av_freep(&mxf->essence_container_data_sets_refs);
for (i = 0; i < mxf->metadata_sets_count; i++) {
switch (mxf->metadata_sets[i]->type) {
case MultipleDescriptor:
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list