[SCM] libav/experimental: Rename bitstreamBuffers* as bitstream_buffers*

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:34:52 UTC 2013


The following commit has been merged in the experimental branch:
commit 6cc01c245fc700598b961230999520d95726165d
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Wed Jan 7 23:42:07 2009 +0000

    Rename bitstreamBuffers* as bitstream_buffers*
    
    Originally committed as revision 16491 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index dde02e3..2d03356 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 68d604b..af539ef 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;
 }
 
 /* @}*/

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list