Contribs: Fix libass \h char handling.

Conflicts:

	extras/contrib/src/Makefile

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

extras/contrib/src/Patches/libass-h-char-fix.patch

+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 ' ';