summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-08 21:55:44 +0200
committerwm4 <wm4@nowhere>2013-07-08 21:55:44 +0200
commit31f685040bd2152d541ed16cf441c6b5e7e430fd (patch)
treeb8351b2847231bbc15d883a622ac972945cce6b4 /demux
parent73c76de91edbf8a55eb725196ff54583e3428510 (diff)
parent7a71a2cc483d17bed94408d5aee6fba6893558cb (diff)
downloadmpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.bz2
mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.xz
Merge branch 'master' into remove_old_demuxers
Conflicts: DOCS/man/en/changes.rst DOCS/man/en/options.rst
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 073a7a2bb6..c21e249dca 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -71,7 +71,9 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef CONFIG_TV
&demuxer_desc_tv,
#endif
+#ifdef CONFIG_LIBASS
&demuxer_desc_libass,
+#endif
&demuxer_desc_matroska,
&demuxer_desc_lavf,
&demuxer_desc_subreader,