summaryrefslogtreecommitdiffstats
path: root/gst/dvdspu/gstspu-vobsub-render.c
diff options
context:
space:
mode:
authorDave Robillard <dave@drobilla.net>2009-05-31 19:25:34 -0400
committerDave Robillard <dave@drobilla.net>2009-05-31 19:25:34 -0400
commitb19dd5920605c0036dacf19591a6feca7a736a50 (patch)
treed33824039c10756da4d306051165d6bbe707345a /gst/dvdspu/gstspu-vobsub-render.c
parentb75a26657febaf86c4137b4d41c068926325e316 (diff)
parent7c5ff224fcb10b82d6e591677d556143569e2844 (diff)
downloadgst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.gz
gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.bz2
gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.zip
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'gst/dvdspu/gstspu-vobsub-render.c')
-rw-r--r--gst/dvdspu/gstspu-vobsub-render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/dvdspu/gstspu-vobsub-render.c b/gst/dvdspu/gstspu-vobsub-render.c
index 07abff22..3709d82a 100644
--- a/gst/dvdspu/gstspu-vobsub-render.c
+++ b/gst/dvdspu/gstspu-vobsub-render.c
@@ -343,7 +343,7 @@ gstspu_vobsub_blend_comp_buffers (SpuState * state, guint8 * planes[3])
gstspu_blend_comp_buffers (state, planes);
}
-void
+static void
gstspu_vobsub_clear_comp_buffers (SpuState * state)
{
state->comp_left = state->vobsub.disp_rect.left;
@@ -452,7 +452,7 @@ gstspu_vobsub_render (GstDVDSpu * dvdspu, GstBuffer * buf)
|| state->vobsub.cur_Y > state->vobsub.clip_rect.bottom);
/* Reset the compositing buffer */
- gstspu_clear_comp_buffers (state);
+ gstspu_vobsub_clear_comp_buffers (state);
/* Render even line */
state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x;
gstspu_vobsub_render_line (state, planes, &state->vobsub.cur_offsets[0]);
@@ -480,7 +480,7 @@ gstspu_vobsub_render (GstDVDSpu * dvdspu, GstBuffer * buf)
/* Render a remaining lone last even line. y already has the correct value
* after the above loop exited. */
- gstspu_clear_comp_buffers (state);
+ gstspu_vobsub_clear_comp_buffers (state);
state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x;
gstspu_vobsub_render_line (state, planes, &state->vobsub.cur_offsets[0]);
gstspu_vobsub_blend_comp_buffers (state, planes);