Commit 21efcc1d authored by cehoyos's avatar cehoyos

Rename bitstreamBuffers* as bitstream_buffers*

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16491 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cb0f7cc0
...@@ -74,9 +74,9 @@ struct vdpau_render_state { ...@@ -74,9 +74,9 @@ struct vdpau_render_state {
} info; } info;
/** Describe size/location of the compressed video data. */ /** Describe size/location of the compressed video data. */
int bitstreamBuffersAllocated; int bitstream_buffers_allocated;
int bitstreamBuffersUsed; int bitstream_buffers_used;
VdpBitstreamBuffer *bitstreamBuffers; VdpBitstreamBuffer *bitstream_buffers;
}; };
/* @}*/ /* @}*/
......
...@@ -114,19 +114,19 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si ...@@ -114,19 +114,19 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si
render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; render = (struct vdpau_render_state*)s->current_picture_ptr->data[0];
assert(render); assert(render);
if (!render->bitstreamBuffersUsed) if (!render->bitstream_buffers_used)
VDPAU_h264_set_reference_frames(h); VDPAU_h264_set_reference_frames(h);
render->bitstreamBuffers= av_fast_realloc( render->bitstream_buffers= av_fast_realloc(
render->bitstreamBuffers, render->bitstream_buffers,
&render->bitstreamBuffersAllocated, &render->bitstream_buffers_allocated,
sizeof(*render->bitstreamBuffers)*(render->bitstreamBuffersUsed + 1) sizeof(*render->bitstream_buffers)*(render->bitstream_buffers_used + 1)
); );
render->bitstreamBuffers[render->bitstreamBuffersUsed].struct_version = VDP_BITSTREAM_BUFFER_VERSION; render->bitstream_buffers[render->bitstream_buffers_used].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream = buf; render->bitstream_buffers[render->bitstream_buffers_used].bitstream = buf;
render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream_bytes = buf_size; render->bitstream_buffers[render->bitstream_buffers_used].bitstream_bytes = buf_size;
render->bitstreamBuffersUsed++; render->bitstream_buffers_used++;
} }
void ff_VDPAU_h264_picture_complete(H264Context *h) void ff_VDPAU_h264_picture_complete(H264Context *h)
...@@ -177,7 +177,7 @@ void ff_VDPAU_h264_picture_complete(H264Context *h) ...@@ -177,7 +177,7 @@ void ff_VDPAU_h264_picture_complete(H264Context *h)
memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8)); memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8));
ff_draw_horiz_band(s, 0, s->avctx->height); ff_draw_horiz_band(s, 0, s->avctx->height);
render->bitstreamBuffersUsed = 0; render->bitstream_buffers_used = 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