summaryrefslogtreecommitdiffstats
path: root/sub/subreader.c
diff options
context:
space:
mode:
Diffstat (limited to 'sub/subreader.c')
-rw-r--r--sub/subreader.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sub/subreader.c b/sub/subreader.c
index a1d2974af4..f694f57a7c 100644
--- a/sub/subreader.c
+++ b/sub/subreader.c
@@ -1558,7 +1558,10 @@ sub_data* sub_read_file(char *filename, float fps, struct MPOpts *opts)
if ((sub!=ERR) && sub_utf8 == 2) sub=subcp_recode(sub);
#endif
#ifdef CONFIG_FRIBIDI
- if (sub!=ERR) sub=sub_fribidi(sub,sub_utf8,0);
+ /* Libass has its own BiDi handling now, and running this before
+ * giving the subtitle to libass would only break things. */
+ if (sub != ERR && !opts->ass_enabled)
+ sub = sub_fribidi(sub, sub_utf8, 0);
#endif
if ( sub == ERR )
{