summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-10-20 22:12:55 +0000
committerphintuka <phintuka>2009-10-20 22:12:55 +0000
commitb0e31623370035f9677a3c2df4d50bb04392797e (patch)
tree472c6d96da4e51c0bac62d520e9c168fa58039f1
parentf090efce4493cb1f1ed292b697d930959c7013bb (diff)
downloadxineliboutput-b0e31623370035f9677a3c2df4d50bb04392797e.tar.gz
xineliboutput-b0e31623370035f9677a3c2df4d50bb04392797e.tar.bz2
Moved show_overlays() after hide_overlays()
-rw-r--r--xine/BluRay/decode_spuhdmv.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/xine/BluRay/decode_spuhdmv.c b/xine/BluRay/decode_spuhdmv.c
index 9b5793c6..56e66b86 100644
--- a/xine/BluRay/decode_spuhdmv.c
+++ b/xine/BluRay/decode_spuhdmv.c
@@ -761,23 +761,6 @@ static int show_overlay(spuhdmv_decoder_t *this, composition_object_t *cobj, uin
return 0;
}
-static void show_overlays(spuhdmv_decoder_t *this, presentation_segment_t *pseg)
-{
- composition_object_t *cobj = pseg->comp_objs;
- int i;
-
- for (i = 0; i < pseg->object_number; i++) {
- if (!cobj) {
- ERROR("show_overlays: composition object %d missing !\n", i);
- } else {
- show_overlay(this, cobj, pseg->palette_id_ref, i, pseg->pts, !pseg->shown);
- cobj = cobj->next;
- }
- }
-
- pseg->shown = 1;
-}
-
static void hide_overlays(spuhdmv_decoder_t *this, int64_t pts)
{
video_overlay_event_t event = {0};
@@ -803,6 +786,23 @@ static void hide_overlays(spuhdmv_decoder_t *this, int64_t pts)
}
}
+static void show_overlays(spuhdmv_decoder_t *this, presentation_segment_t *pseg)
+{
+ composition_object_t *cobj = pseg->comp_objs;
+ int i;
+
+ for (i = 0; i < pseg->object_number; i++) {
+ if (!cobj) {
+ ERROR("show_overlays: composition object %d missing !\n", i);
+ } else {
+ show_overlay(this, cobj, pseg->palette_id_ref, i, pseg->pts, !pseg->shown);
+ cobj = cobj->next;
+ }
+ }
+
+ pseg->shown = 1;
+}
+
static int decode_presentation_segment(spuhdmv_decoder_t *this)
{
presentation_segment_t *seg = segbuf_decode_presentation_segment(this->buf);