[MPlayer-cvslog] r34636 - trunk/sub/subreader.c

[reimar]

Author: reimar
Date: Sat Jan 28 15:24:59 2012
New Revision: 34636

Log:
Do not apply writing order via fribidi when libass will be doing it.

This lead to the order being flipped twice, and thus looking
as if it was not done at all.

Modified:
   trunk/sub/subreader.c

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Sat Jan 28 15:00:07 2012	(r34635)
+++ trunk/sub/subreader.c	Sat Jan 28 15:24:59 2012	(r34636)
@@ -2496,6 +2496,7 @@ void sub_free( sub_data * subd )
  * @param len length of text in txt
  * @param endpts pts at which this subtitle text should be removed again
  * @param strip_markup if strip markup is set (!= 0), markup tags like <b></b> are ignored
+ *                     and fribidi is used to process right-to-left markers
  *
  * <> and {} are interpreted as comment delimiters, "\n", "\N", '\n', '\r'
  * and '\0' are interpreted as newlines, duplicate, leading and trailing
@@ -2576,6 +2577,7 @@ void sub_add_text(subtitle *sub, const c
     free(sub->text[sub->lines]);
   }
 #ifdef CONFIG_FRIBIDI
+  if (strip_markup)
   sub = sub_fribidi(sub, sub_utf8, orig_lines);
 #endif
 }