Commit 92b23735 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix compiler errors from previous 2 commits.

parent 97e3d780
...@@ -829,7 +829,7 @@ xvba_CreateBuffer( ...@@ -829,7 +829,7 @@ xvba_CreateBuffer(
if (!obj_buffer) if (!obj_buffer)
return VA_STATUS_ERROR_ALLOCATION_FAILED; return VA_STATUS_ERROR_ALLOCATION_FAILED;
ASSERT(size == obj->buffer_size); ASSERT(size == obj_buffer->buffer_size);
if (data) if (data)
memcpy(obj_buffer->buffer_data, data, obj_buffer->buffer_size); memcpy(obj_buffer->buffer_data, data, obj_buffer->buffer_size);
......
...@@ -215,7 +215,7 @@ int surface_add_association( ...@@ -215,7 +215,7 @@ int surface_add_association(
if (obj_surface->assocs[i]->subpicture == assoc->subpicture) { if (obj_surface->assocs[i]->subpicture == assoc->subpicture) {
/* XXX: this should not happen, but replace it in the interim */ /* XXX: this should not happen, but replace it in the interim */
ASSERT(obj_surface->assocs[i]->surface == assoc->surface); ASSERT(obj_surface->assocs[i]->surface == assoc->surface);
SubpictureAssociation *a = obj_surface->assocs[i]; SubpictureAssociationP a = obj_surface->assocs[i];
free(a); /* XXX: release previous association */ free(a); /* XXX: release previous association */
obj_surface->assocs[i] = assoc; obj_surface->assocs[i] = assoc;
return 0; return 0;
...@@ -230,7 +230,7 @@ int surface_add_association( ...@@ -230,7 +230,7 @@ int surface_add_association(
/* Append this subpicture association */ /* Append this subpicture association */
SubpictureAssociationP *assocs; SubpictureAssociationP *assocs;
assocs = realloc_buffer( assocs = realloc_buffer(
&obj_surface->assocs, (void**)&obj_surface->assocs,
&obj_surface->assocs_count_max, &obj_surface->assocs_count_max,
1 + obj_surface->assocs_count, 1 + obj_surface->assocs_count,
sizeof(obj_surface->assocs[0]) sizeof(obj_surface->assocs[0])
......
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