[vlc-devel] commit: Contribs: Fix libass \h char handling. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Tue Aug  5 01:38:00 2008 +0200| [33d67e95de5ad9d6ffef883b5a24ce88453df935] | committer: Jean-Baptiste Kempf 

Contribs: Fix libass \h char handling.

Conflicts:

	extras/contrib/src/Makefile

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=33d67e95de5ad9d6ffef883b5a24ce88453df935
---

 extras/contrib/src/Makefile                        |    1 +
 extras/contrib/src/Patches/libass-h-char-fix.patch |   13 +++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1a7a0be..b6eca8d 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2445,6 +2445,7 @@ libass-$(ASS_VERSION).tar.bz2:
 libass: libass-$(ASS_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/libass_mplayer_updates.patch
+	cd $@; patch -p0 < ../Patches/libass-h-char-fix.patch
 ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libass-cross.patch
 	cd $@; autoconf
diff --git a/extras/contrib/src/Patches/libass-h-char-fix.patch b/extras/contrib/src/Patches/libass-h-char-fix.patch
new file mode 100644
index 0000000..8c89406
--- /dev/null
+++ b/extras/contrib/src/Patches/libass-h-char-fix.patch
@@ -0,0 +1,13 @@
+Index: libass/ass_render.c
+===================================================================
+--- libass/ass_render.c	(revision 15)
++++ libass/ass_render.c	(working copy)
+@@ -1071,7 +1071,7 @@
+ 			p += 2;
+ 			*str = p;
+ 			return '\n';
+-		} else if (*(p+1) == 'n') {
++		} else if ((*(p+1) == 'n') || (*(p+1) == 'h')) {
+ 			p += 2;
+ 			*str = p;
+ 			return ' ';