Commit c3a6f497 authored by Jakob Leben's avatar Jakob Leben

Revert "vout: avoid applying subtitle offset twice and modify behavior when subtitles overlap"

This reverts commit 4c627dc6.
parent e995a5b3
......@@ -518,10 +518,17 @@ void spu_RenderSubpictures( spu_t *p_spu,
if( p_subpic->b_subtitle )
{
area = spu_area_unscaled( area, scale );
if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 )
{
p_region->i_x = area.i_x;
p_region->i_y = area.i_y;
}
if( p_subtitle_area )
p_subtitle_area[i_subtitle_area++] = area;
}
}
if( p_subpic->b_subtitle )
p_subpic->b_absolute = true;
}
/* */
......@@ -1662,8 +1669,6 @@ static int SubpictureCmp( const void *s0, const void *s1 )
r = IntegerCmp( p_subpic0->i_channel, p_subpic1->i_channel );
if( !r )
r = IntegerCmp( p_subpic0->i_order, p_subpic1->i_order );
//NOTE We swap subtitle order so that newer subtitles push older ones higher.
if( p_subpic0->b_subtitle && p_subpic1->b_subtitle ) r = !r;
return r;
}
......
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