From cfa45c40dc0cfe44b699029168b62d4d3e16c288 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 22 Jun 2013 02:09:52 +0200
Subject: sub: add demux_libass wrapper, drop old hacks

demux_libass.c allows us to make subtitle format detection part of the
normal file loading process. libass has no probe function, but trying to
load the start of a file (the first 4 KB) is good enough. Hope that
libass can even handle random binary input gracefully without printing
stupid log messages, and that the libass parser doesn't accept too many
non-ASS files as input.

This doesn't handle the -subcp option correctly yet. This will be fixed
later.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4e244d8489..1fa78d676b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,8 @@ SOURCES-$(DVDREAD)              += stream/stream_dvd.c \
 SOURCES-$(FTP)                  += stream/stream_ftp.c
 SOURCES-$(HAVE_SYS_MMAN_H)      += audio/filter/af_export.c osdep/mmap_anon.c
 SOURCES-$(LADSPA)               += audio/filter/af_ladspa.c
-SOURCES-$(LIBASS)               += sub/ass_mp.c sub/sd_ass.c
+SOURCES-$(LIBASS)               += sub/ass_mp.c sub/sd_ass.c \
+                                   demux/demux_libass.c
 
 SOURCES-$(LIBBLURAY)            += stream/stream_bluray.c
 SOURCES-$(LIBBS2B)              += audio/filter/af_bs2b.c
@@ -207,7 +208,6 @@ SOURCES = talloc.c \
           demux/demux_mf.c \
           demux/demux_mkv.c \
           demux/demux_mpg.c \
-          demux/demux_sub.c \
           demux/demux_subreader.c \
           demux/demux_ts.c \
           demux/mp3_hdr.c \
-- 
cgit v1.2.3