Initial libass support.

diff --git a/configure.ac b/configure.ac
index 69532b00cd8f1d4b8a522c97c261628618652790..e679d0698b03eb6aa7383bb899f7433caf371c81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3758,6 +3758,27 @@ AS_IF( [test "${enable_csri}" = "yes"], [
       ])
   ])
 
+dnl
+dnl libass subtitle rendering module
+dnl
+AC_ARG_ENABLE(libass,
+  [  --enable-libass           Subtitle support using libass (default disabled)])
+AS_IF( [test "${enable_libass}" = "yes"], [
+  PKG_CHECK_MODULES(LIBASS,
+      libass >= 0.9.5,
+      [
+        VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
+        VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
+        VLC_ADD_PLUGIN([libass])
+
+               AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+                 [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
+                  VLC_ADD_LIBS([libass],[-lfontconfig])])
+      ],[
+        AC_MSG_WARN([LIBASS library not found])
+      ])
+  ])
+
 dnl
 dnl asa demuxer
 dnl

diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 5a4c2e0fdbe6957304ee41c666e8dd2ae378cfdf..a1e4d24ba8f42f0323c280a727de771bb8accf99 100644 (file)
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -37,3 +37,4 @@ SOURCES_fluidsynth = fluidsynth.c
 SOURCES_cc = cc.c cc.h
 SOURCES_kate = kate.c
 SOURCES_schroedinger = schroedinger.c
+SOURCES_libass = libass.c