Commit 0747ce9f authored by bcoudurier's avatar bcoudurier

shut up gcc about incompatible pointer type

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6378 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e7f09a12
...@@ -264,7 +264,7 @@ static int mxf_read_metadata_preface(MXFContext *mxf, KLVPacket *klv) ...@@ -264,7 +264,7 @@ static int mxf_read_metadata_preface(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
mxf->essence_containers_uls = av_malloc(mxf->essence_containers_uls_count * sizeof(UID)); 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 */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID)); get_buffer(pb, (uint8_t *)mxf->essence_containers_uls, mxf->essence_containers_uls_count * sizeof(UID));
break; break;
default: default:
url_fskip(pb, size); url_fskip(pb, size);
...@@ -291,7 +291,7 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, KLVPacket *klv) ...@@ -291,7 +291,7 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID)); mxf->packages_refs = av_malloc(mxf->packages_count * sizeof(UID));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, mxf->packages_refs, mxf->packages_count * sizeof(UID)); get_buffer(pb, (uint8_t *)mxf->packages_refs, mxf->packages_count * sizeof(UID));
break; break;
case 0x1902: case 0x1902:
mxf->essence_container_data_sets_count = get_be32(pb); mxf->essence_container_data_sets_count = get_be32(pb);
...@@ -299,7 +299,7 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, KLVPacket *klv) ...@@ -299,7 +299,7 @@ static int mxf_read_metadata_content_storage(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
mxf->essence_container_data_sets_refs = av_malloc(mxf->essence_container_data_sets_count * sizeof(UID)); 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 */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, mxf->essence_container_data_sets_refs, mxf->essence_container_data_sets_count * sizeof(UID)); get_buffer(pb, (uint8_t *)mxf->essence_container_data_sets_refs, mxf->essence_container_data_sets_count * sizeof(UID));
break; break;
default: default:
url_fskip(pb, size); url_fskip(pb, size);
...@@ -369,7 +369,7 @@ static int mxf_read_metadata_material_package(MXFContext *mxf, KLVPacket *klv) ...@@ -369,7 +369,7 @@ static int mxf_read_metadata_material_package(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID)); package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, package->tracks_refs, package->tracks_count * sizeof(UID)); get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break; break;
default: default:
url_fskip(pb, size); url_fskip(pb, size);
...@@ -444,7 +444,7 @@ static int mxf_read_metadata_sequence(MXFContext *mxf, KLVPacket *klv) ...@@ -444,7 +444,7 @@ static int mxf_read_metadata_sequence(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID)); sequence->structural_components_refs = av_malloc(sequence->structural_components_count * sizeof(UID));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID)); get_buffer(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID));
break; break;
default: default:
url_fskip(pb, size); url_fskip(pb, size);
...@@ -476,7 +476,7 @@ static int mxf_read_metadata_source_package(MXFContext *mxf, KLVPacket *klv) ...@@ -476,7 +476,7 @@ static int mxf_read_metadata_source_package(MXFContext *mxf, KLVPacket *klv)
return -1; return -1;
package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID)); package->tracks_refs = av_malloc(package->tracks_count * sizeof(UID));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, package->tracks_refs, package->tracks_count * sizeof(UID)); get_buffer(pb, (uint8_t *)package->tracks_refs, package->tracks_count * sizeof(UID));
break; break;
case 0x4401: case 0x4401:
/* UMID, only get last 16 bytes */ /* UMID, only get last 16 bytes */
...@@ -516,7 +516,7 @@ static int mxf_read_metadata_multiple_descriptor(MXFContext *mxf, KLVPacket *klv ...@@ -516,7 +516,7 @@ static int mxf_read_metadata_multiple_descriptor(MXFContext *mxf, KLVPacket *klv
return -1; return -1;
descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID)); descriptor->sub_descriptors_refs = av_malloc(descriptor->sub_descriptors_count * sizeof(UID));
url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */ url_fskip(pb, 4); /* useless size of objects, always 16 according to specs */
get_buffer(pb, descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID)); get_buffer(pb, (uint8_t *)descriptor->sub_descriptors_refs, descriptor->sub_descriptors_count * sizeof(UID));
break; break;
default: default:
url_fskip(pb, size); url_fskip(pb, size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment