summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-01-07 23:42:07 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-01-07 23:42:07 +0000
commit6cc01c245fc700598b961230999520d95726165d (patch)
treed10d9590403976391aaeae875dd394cf7c8c891a /libavcodec
parent1bb04d5a441ee1eb1f1fb6d2ebb5e0b849fc337b (diff)
Rename bitstreamBuffers* as bitstream_buffers*
Originally committed as revision 16491 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vdpau.h6
-rw-r--r--libavcodec/vdpauvideo.c20
2 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index dde02e3ece..2d03356127 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -74,9 +74,9 @@ struct vdpau_render_state {
} info;
/** Describe size/location of the compressed video data. */
- int bitstreamBuffersAllocated;
- int bitstreamBuffersUsed;
- VdpBitstreamBuffer *bitstreamBuffers;
+ int bitstream_buffers_allocated;
+ int bitstream_buffers_used;
+ VdpBitstreamBuffer *bitstream_buffers;
};
/* @}*/
diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c
index 68d604bf11..af539ef8b6 100644
--- a/libavcodec/vdpauvideo.c
+++ b/libavcodec/vdpauvideo.c
@@ -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];
assert(render);
- if (!render->bitstreamBuffersUsed)
+ if (!render->bitstream_buffers_used)
VDPAU_h264_set_reference_frames(h);
- render->bitstreamBuffers= av_fast_realloc(
- render->bitstreamBuffers,
- &render->bitstreamBuffersAllocated,
- sizeof(*render->bitstreamBuffers)*(render->bitstreamBuffersUsed + 1)
+ render->bitstream_buffers= av_fast_realloc(
+ render->bitstream_buffers,
+ &render->bitstream_buffers_allocated,
+ sizeof(*render->bitstream_buffers)*(render->bitstream_buffers_used + 1)
);
- render->bitstreamBuffers[render->bitstreamBuffersUsed].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
- render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream = buf;
- render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream_bytes = buf_size;
- render->bitstreamBuffersUsed++;
+ render->bitstream_buffers[render->bitstream_buffers_used].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
+ render->bitstream_buffers[render->bitstream_buffers_used].bitstream = buf;
+ render->bitstream_buffers[render->bitstream_buffers_used].bitstream_bytes = buf_size;
+ render->bitstream_buffers_used++;
}
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));
ff_draw_horiz_band(s, 0, s->avctx->height);
- render->bitstreamBuffersUsed = 0;
+ render->bitstream_buffers_used = 0;
}
/* @}*/