[vlc-commits] codecs: webvtt: fix reversed start/end alignments (#22349)
Francois Cartegnie
git at videolan.org
Mon Jul 27 11:17:58 CEST 2020
vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun 19 18:11:08 2019 +0200| [ebe222b240bcec25e0dcea06a85489e9014ddb13] | committer: Francois Cartegnie
codecs: webvtt: fix reversed start/end alignments (#22349)
(cherry picked from commit 64a16872ec3d68e41206c5ea5d02ee9f1640ffe6)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ebe222b240bcec25e0dcea06a85489e9014ddb13
---
modules/codec/webvtt/subsvtt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/codec/webvtt/subsvtt.c b/modules/codec/webvtt/subsvtt.c
index e1679d5a8b..b799b23412 100644
--- a/modules/codec/webvtt/subsvtt.c
+++ b/modules/codec/webvtt/subsvtt.c
@@ -1464,12 +1464,12 @@ static int GetCueTextAlignment( const webvtt_dom_cue_t *p_cue )
return SUBPICTURE_ALIGN_LEFT;
case WEBVTT_ALIGN_RIGHT:
return SUBPICTURE_ALIGN_RIGHT;
- case WEBVTT_ALIGN_START:
- return ((p_cue->settings.vertical == WEBVTT_ALIGN_RIGHT) ?
- SUBPICTURE_ALIGN_LEFT : SUBPICTURE_ALIGN_RIGHT);
- case WEBVTT_ALIGN_END:
- return ((p_cue->settings.vertical == WEBVTT_ALIGN_RIGHT)) ?
+ case WEBVTT_ALIGN_START: /* vertical provides rl or rl base direction */
+ return (p_cue->settings.vertical == WEBVTT_ALIGN_RIGHT) ?
SUBPICTURE_ALIGN_RIGHT : SUBPICTURE_ALIGN_LEFT;
+ case WEBVTT_ALIGN_END:
+ return (p_cue->settings.vertical == WEBVTT_ALIGN_RIGHT) ?
+ SUBPICTURE_ALIGN_LEFT : SUBPICTURE_ALIGN_RIGHT;
default:
return 0;
}
More information about the vlc-commits
mailing list